1

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

@@ -256,12 +256,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             List<Long> cameraIds = records.parallelStream().map(SceneVo::getCameraId).collect(Collectors.toList());
             cameraMap = cameraService.getByIds(cameraIds);
 
-            if(param.getType() == 2 && laserMap.isEmpty()){
+            if(param.getType() == 2){
                 laserMap = laserService.list(sceneNumList,4);
             }
-            if(param.getType() == 6 && laserMap.isEmpty()){
+            if(param.getType() == 6 ){
                 laserMap = laserService.list(sceneNumList,5);
             }
+            if(param.getType() == 57 ){
+                laserMap = laserService.list(sceneNumList,57);
+            }
 
             List<String> modelingNumList = page.getRecords().stream().filter(e -> e.getStatus() == 0).map(SceneVo::getNum).collect(Collectors.toList());
             if(!modelingNumList.isEmpty()){
@@ -269,7 +272,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
         }
         for (SceneVo record : page.getRecords()) {
-            if(param.getType() == 2 || param.getType() == 6){
+            if(param.getIsLaser()){
                 JSONObject ssObj = laserMap.get(record.getNum());
                 if(ssObj!=null){
                     record.setSceneName(ssObj.getString("title"));

src/main/java/com/fdkankan/manage/util/NumTypeUtils.java

@@ -13,6 +13,7 @@ public class NumTypeUtils {
                 return false;
             case 2:
             case 6:
+            case 57:
                 return true;
         }
         return false;

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

@@ -113,6 +113,12 @@
         <if test="param.type !=null and param.type == 7">
             and s.scene_source = 5 and is_obj = 1
         </if>
+        <if test="param.type !=null and param.type == 57">
+            and s.scene_source = 57
+        </if>
+        <if test="param.type !=null and param.type == 58">
+            and s.scene_source = 57 and is_obj = 1
+        </if>
         <if test="param.num !=null and param.num !='' ">
             and s.num like concat ('%',#{param.num},'%')
         </if>