lyhzzz %!s(int64=2) %!d(string=hai) anos
pai
achega
e33dc78d05

+ 5 - 1
src/main/java/com/fdkankan/manage_jp/service/impl/CameraServiceImpl.java

@@ -135,6 +135,10 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         if(camera == null){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
+        if(cameraDetail == null){
+            throw new BusinessException(ResultCode.PARAM_ERROR);
+        }
         LambdaUpdateWrapper<Camera> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(Camera::getId,camera.getId());
         wrapper.set(Camera::getActivatedTime,null);
@@ -143,7 +147,7 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         cameraDetailService.unbind(camera.getId());
         sceneProService.unbind(camera.getId());
         scenePlusService.unbind(camera.getId());
-        if(camera.getSnCode().contains("SS")){
+        if(cameraDetail.getType() == 10){
             laserService.toBind(Arrays.asList(camera.getSnCode()),false,null);
         }
     }