1

src/main/java/com/fdkankan/manage/service/impl/CameraVersionServiceImpl.java

@@ -83,10 +83,17 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         }
         log.info("upload url: {}" + url);
         // 添加对象信息
-        List<CameraVersion> cameraVersions = this.getByVersion(version);
+        switch (type){
+            case 1: type = 1;break;
+            case 2: type = 9;break;
+            case 3: type = 10;break;
+            default: throw new BusinessException(-1,"相机类型错误");
+        }
+        List<CameraVersion> cameraVersions = this.getByVersion(version,type);
         if(cameraVersions != null && cameraVersions.size() >0){
             throw new BusinessException(ResultCode.VISION_EXIST.code(),ResultCode.VISION_EXIST.message());
         }
+
         CameraVersion versionEntity = new CameraVersion();
         versionEntity.setName(fileName);
         versionEntity.setFileUrl(url);
@@ -101,16 +108,24 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         FileUtils.deleteFile(filePath);
     }
 
-    private List<CameraVersion> getByVersion(String version) {
+    private List<CameraVersion> getByVersion(String version,Integer type) {
         LambdaQueryWrapper<CameraVersion> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CameraVersion::getVersion,version);
+        wrapper.eq(CameraVersion::getType,type);
         return this.list(wrapper);
     }
 
     @Override
     public PageInfo pageList(CameraVersionParam param) {
+        Integer type = param.getType();
+        switch (type){
+            case 1: type = 1;break;
+            case 2: type = 9;break;
+            case 3: type = 10;break;
+            default: throw new BusinessException(-1,"相机类型错误");
+        }
         LambdaQueryWrapper<CameraVersion> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(CameraVersion::getType,param.getType());
+        queryWrapper.eq(CameraVersion::getType,type);
         if (StringUtils.isNotBlank(param.getVersion())) {
             queryWrapper.and(wrapper -> wrapper
                     .like(CameraVersion::getName,param.getVersion())