1

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -416,6 +416,15 @@ public class LaserService {
         return this.list(newParam);
     }
 
+    public HashMap<String, JSONObject> list(String sceneName,Integer sceneSource) {
+        LaserSceneParam newParam = new LaserSceneParam();
+        newParam.setPageNum(1);
+        newParam.setPageSize(9999);
+        newParam.setTitle(sceneName);
+        newParam.setSceneSource(sceneSource);
+        return this.list(newParam);
+    }
+
     public HashMap<String, JSONObject> list(LaserSceneParam newParam) {
         HashMap<String, JSONObject> map = new HashMap<>();
         try {

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

@@ -231,7 +231,18 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
         if((param.getCameraIds() != null && param.getCameraIds().size()<=0) || (param.getUserIds() != null && param.getUserIds().size()<=0)){
-            param.setNum("empty");
+            return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+        }
+        HashMap<String, JSONObject> laserMap = new HashMap<>();
+        if(param.getType() == 2 && StringUtils.isNotBlank(param.getSceneName())){
+            laserMap = laserService.list(param.getSceneName(), 4);
+        }
+        if(param.getType() == 6 && StringUtils.isNotBlank(param.getSceneName())){
+            laserMap = laserService.list(param.getSceneName(), 5);
+        }
+        if(!laserMap.isEmpty()){
+            Set<String> keySet = laserMap.keySet();
+            param.setNumList(new ArrayList<>(keySet));
         }
 
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -61,6 +61,13 @@
             </foreach>
         </if>
 
+        <if test="param.numList !=null and param.numList.size >0">
+            and s.num in
+            <foreach item="num" collection="param.numList" open="(" separator="," close=")">
+                #{num}
+            </foreach>
+        </if>
+
         <if test="param.type !=null and param.type == 0">
             and s.scene_source in (1,2,12,13,14)
         </if>