rtkCamera唯一判断

src/main/java/com/fdkankan/manage/aop/VisitLogInterceptor.java

@@ -111,9 +111,9 @@ public class VisitLogInterceptor {
 				}
 			}
 		}
-		if("GET".equals(method)){
-			return result;
-		}
+//		if("GET".equals(method)){
+//			return result;
+//		}
 		//写入mongodb
 		OperLog operLog = new OperLog();
 		operLog.setUserId(userId);

src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -93,6 +93,7 @@ public enum ResultCode  {
 
     CAN_NOT_DEL_MODELING_SCENE(50073, "计算中的场景无法删除"),
     RTK_SN_EXIST(50074, "板卡SN码已存在"),
+    CAMERA_SN_EXIST(50075, "相机SN码已存在"),
 
 
     ;

src/main/java/com/fdkankan/manage/controller/RtkInfoController.java

@@ -47,16 +47,23 @@ public class RtkInfoController {
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         RtkInfo dbRtkInfo = rtkInfoService.getByRtkSnCode(rtkInfo.getRtkSnCode());
+        RtkInfo dbRtkInfo2 = rtkInfoService.getByCameraSnCode(rtkInfo.getCameraSnCode());
         if(rtkInfo.getId() == null){
             rtkInfo.setCreateUserId(Long.valueOf((String)StpUtil.getLoginId()));
             if(dbRtkInfo != null){
                 throw new BusinessException(ResultCode.RTK_SN_EXIST);
             }
+            if(dbRtkInfo2 != null){
+                throw new BusinessException(ResultCode.CAMERA_SN_EXIST);
+            }
         }else {
             rtkInfo.setUpdateUserId(Long.valueOf((String)StpUtil.getLoginId()));
             if( dbRtkInfo != null && !Objects.equals(dbRtkInfo.getId(), rtkInfo.getId()) ){
                 throw new BusinessException(ResultCode.RTK_SN_EXIST);
             }
+            if( dbRtkInfo2 != null && !Objects.equals(dbRtkInfo2.getId(), rtkInfo.getId()) ){
+                throw new BusinessException(ResultCode.CAMERA_SN_EXIST);
+            }
         }
         if(rtkInfo.getRtkType() == 0){
             rtkInfo.setIpAddr(null);

src/main/java/com/fdkankan/manage/service/IRtkInfoService.java

@@ -21,4 +21,6 @@ public interface IRtkInfoService extends IService<RtkInfo> {
     void saveOrEdit(RtkInfo rtkInfo);
 
     void del(RtkInfo rtkInfo);
+
+    RtkInfo getByCameraSnCode(String cameraSnCode);
 }

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

@@ -91,4 +91,11 @@ public class RtkInfoServiceImpl extends ServiceImpl<IRtkInfoMapper, RtkInfo> imp
         }
         this.removeById(rtkInfo.getId());
     }
+
+    @Override
+    public RtkInfo getByCameraSnCode(String cameraSnCode) {
+        LambdaQueryWrapper<RtkInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(RtkInfo::getCameraSnCode,cameraSnCode);
+        return this.getOne(wrapper);
+    }
 }

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

@@ -827,6 +827,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         HashMap<String,Object> paramMap = new HashMap<>();
         paramMap.put("num",num);
+        paramMap.put("from","manage");
         try {
             JSONObject jsonObject = fdKKClient.rebuildScene(paramMap);
             Integer code = jsonObject.getInteger("code");