1

src/main/java/com/fdkankan/ucenter/constant/CameraTypelEnum.java

@@ -64,13 +64,5 @@ public enum CameraTypelEnum {
         return null;
     }
 
-    public static Boolean isLaserSceneSource(Integer sceneScouece) {
-        for (CameraTypelEnum value : CameraTypelEnum.values()) {
-            if(value.sceneSource.contains(sceneScouece) && value.isLaser){
-                return true;
-            }
-        }
-        return false;
-    }
 
 }

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

@@ -1404,7 +1404,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         Page<SceneVo> page = scenePlusService.domeSceneList(new Page<>(param.getPageNum(),param.getPageSize()),param);
         if(param.getIsObj() == 0){  //点云列表
 
-            Set<Integer> laserSceneSource = page.getRecords().stream().map(SceneVo::getSceneSource).filter(CameraTypelEnum::isLaserSceneSource).collect(Collectors.toSet());
+            Set<Integer> laserSceneSource = page.getRecords().stream().map(SceneVo::getSceneSource).filter(SceneSourceUtil::isLaser).collect(Collectors.toSet());
             HashMap<String,JSONObject> laserMap = new HashMap<>();
             for (Integer sceneSource : laserSceneSource) {
                 List<String> numList = page.getRecords().stream().filter(e -> Objects.equals(e.getSceneSource(), sceneSource)).map(SceneVo::getNum).collect(Collectors.toList());