1

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

@@ -640,26 +640,24 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Override
     public void deleteByNum(String num) {
         Integer sceneSource = null;
-        Long cameraId = null;
-        Long space = null;
         ScenePro scenePro = this.getByNum(num);
+        Integer status = -2;
         if(scenePro!=null){
-            cameraId = scenePro.getCameraId();
             sceneSource = scenePro.getSceneSource();
-            space = scenePro.getSpace();
+            status = scenePro.getStatus();
             this.removeById(scenePro.getId());
         }
         Scene scene = sceneService.getByNum(num);
         if(scene!=null){
+            status = scene.getStatus();
             sceneService.removeById(scene.getId());
         }
         ScenePlus scenePlus = scenePlusService.getByNum(num);
         if(scenePlus!=null){
-            cameraId = scenePlus.getCameraId();
+            status = scenePlus.getSceneStatus();
             sceneSource = scenePlus.getSceneSource();
             ScenePlusExt plusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             if(plusExt != null){
-                space = plusExt.getSpace();
                 scenePlusExtService.delByPlus(scenePlus.getId());
             }
             scenePlusService.removeById(scenePlus.getId());
@@ -668,7 +666,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(sceneSource != null && (sceneSource == 4 || sceneSource == 5)){
             laserService.delete(num);
         }
-        rabbitMqProducer.sendByWorkQueue("fanout-exchange-iterrupt-calling","",num);
+        if(status == 0 ){
+            rabbitMqProducer.sendByWorkQueue("fanout-exchange-iterrupt-calling","",num);
+        }
 
 //        if(cameraId != null){
 //            cameraDetailService.addUsedSpace(cameraId,space);