1

src/main/java/com/fdkankan/ucenter/common/SceneSourceUtil.java

@@ -25,4 +25,8 @@ public class SceneSourceUtil {
         }
         return false;
     }
+
+    public static boolean isQjkk(Integer sceneSource) {
+        return sceneSource == 6;
+    }
 }

src/main/java/com/fdkankan/ucenter/mq/common/MqQueueUtil.java

@@ -10,4 +10,5 @@ public class MqQueueUtil {
     public static String laserMoveWenBaoQueue2 = "pano-migrate-scene-queue";
     public static String RECOVER_SCENE = "recover-scene";
     public static String laserDeleteScene = "laser-delete-scene";
+    public static String qjkkDeleteScene = "qjkk-delete-scene";
 }

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

@@ -920,6 +920,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public void deleteByList(List<ScenePro> proList,List<ScenePlus> plusList,Long userId,String platform) {
         HashMap<Long ,Long >cameraMap = new HashMap<>();
         List<String> laserNumList = new ArrayList<>();
+        List<String> qjkkNumList = new ArrayList<>();
 
         if(proList.size() >0){
             for (ScenePro scenePro : proList) {
@@ -953,12 +954,22 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(!lNumList.isEmpty()){
                 laserNumList.addAll(lNumList);
             }
+            List<String> lNumList2 = plusList.stream().filter(e -> SceneSourceUtil.isQjkk(e.getSceneSource())).map(ScenePlus::getNum).collect(Collectors.toList());
+            if(!lNumList2.isEmpty()){
+                qjkkNumList.addAll(lNumList2);
+            }
+
         }
         if(!laserNumList.isEmpty()){
             HashMap<String,Object> map = new HashMap<>();
             map.put("numList",laserNumList);
             rabbitMqProducer.sendByWorkQueue(MqQueueUtil.laserDeleteScene,map);
         }
+        if(!qjkkNumList.isEmpty()){
+            HashMap<String,Object> map = new HashMap<>();
+            map.put("numList",qjkkNumList);
+            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.qjkkDeleteScene,map);
+        }
 
         //恢复相机使用容量
         if(!cameraMap.isEmpty()){