1

src/main/java/com/fdkankan/ucenter/service/impl/SceneCommonService.java

@@ -281,23 +281,23 @@ public class SceneCommonService {
         if(scenePro != null){
             space = scenePro.getSpace();
         }
-        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
-        CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
-
-        Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail,cameraType);
-        if(!checkSpace && (location == null || location != 7)){
-            sceneProService.lockOrUnLockScenes(new ArrayList<>(), Arrays.asList(newNum),-2,cameraType.getIsLaser(),null);
+        if(cameraId != null){
+            CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+            CameraType cameraType = cameraTypeService.getByCameraType(cameraDetail.getType());
+            Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail,cameraType);
+            if(!checkSpace && (location == null || location != 7)){
+                sceneProService.lockOrUnLockScenes(new ArrayList<>(), Arrays.asList(newNum),-2,cameraType.getIsLaser(),null);
+            }
+            cameraDetailService.addUsedSpace(cameraDetail,space);
         }
-        cameraDetailService.addUsedSpace(cameraDetail,space);
-
 
-        if(cameraType.getIsLaser() == 1 && scenePlus != null){
+        if(scenePlus != null){
             LambdaUpdateWrapper<ScenePlus> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(ScenePlus::getId,scenePlus.getId());
             wrapper.set(ScenePlus::getSceneStatus,-2);
             scenePlusService.update(wrapper);
         }
-        if(cameraType.getIsLaser() == 1 && scenePro != null){
+        if(scenePro != null){
             LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(ScenePro::getId,scenePro.getId());
             wrapper.set(ScenePro::getStatus,-2);