项目场景为空，列表返回为空

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

@@ -255,13 +255,6 @@ public class LaserService {
         rabbitMqProducer.sendByWorkQueue(cloudPointBuild, params);
     }
 
-    public HashMap<String, JSONObject> list(List<String> sceneNumList) {
-        LaserSceneParam newParam = new LaserSceneParam();
-        newParam.setPageNum(1);
-        newParam.setPageSize(sceneNumList.size());
-        newParam.setSceneCodes(sceneNumList);
-        return this.list(newParam);
-    }
 
     public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer sceneSource) {
         LaserSceneParam newParam = new LaserSceneParam();

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

@@ -166,7 +166,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
 
         if(param.getType() == null){
-            ssSceneMap = laserService.list(sceneNumList);
+            ssSceneMap = laserService.list(sceneNumList,4);
+            ssSceneMap.putAll(laserService.list(sceneNumList,5));
         }else  if(param.getType() == 2 ){
             ssSceneMap = laserService.list(sceneNumList,4);
         }else  if(param.getType() == 5){

src/main/java/com/fdkankan/manage_jp/task/TaskService.java

@@ -39,13 +39,16 @@ public class TaskService {
         }
 
         List<ProjectSceneGps> pluslist = new ArrayList<>();
-        List<ProjectSceneGps> laserList = new ArrayList<>();
+        List<ProjectSceneGps> laserssList = new ArrayList<>();
+        List<ProjectSceneGps> lasersgList = new ArrayList<>();
         for (SceneGpsDb sceneGpsDb : numList) {
             ProjectSceneGps sceneGps = projectSceneGpsService.addGps(sceneGpsDb);
             if(sceneGps != null){
                 log.info("num:{}gps:{}",sceneGpsDb.getNum(),sceneGps);
-                if(sceneGps.getSceneSource() == 4 || sceneGps.getSceneSource() == 5){
-                    laserList.add(sceneGps);
+                if(sceneGps.getSceneSource() == 4 ) {
+                    laserssList.add(sceneGps);
+                }if( sceneGps.getSceneSource() == 5){
+                    lasersgList.add(sceneGps);
                 }else {
                     pluslist.add(sceneGps);
                 }
@@ -56,17 +59,29 @@ public class TaskService {
             sceneMapShowList.addAll( pluslist.stream().map(ProjectSceneGps::getNum).collect(Collectors.toList()));
             projectSceneGpsService.saveBatch(pluslist);
         }
-        if(!laserList.isEmpty()){
-            List<String> numList1 = laserList.stream().map(ProjectSceneGps::getNum).collect(Collectors.toList());
-            HashMap<String, JSONObject> ssSceneMap = laserService.list(numList1);
-            for (ProjectSceneGps sceneGps : laserList) {
+        if(!laserssList.isEmpty()){
+            List<String> numList1 = laserssList.stream().map(ProjectSceneGps::getNum).collect(Collectors.toList());
+            HashMap<String, JSONObject> ssSceneMap = laserService.list(numList1,4);
+            for (ProjectSceneGps sceneGps : laserssList) {
                 JSONObject ssObj = ssSceneMap.get(sceneGps.getNum());
                 if(ssObj!=null){
                     sceneGps.setWebSite(ssObj.getString("webSite"));
                 }
             }
             sceneMapShowList.addAll( numList1);
-            projectSceneGpsService.saveBatch(laserList);
+            projectSceneGpsService.saveBatch(laserssList);
+        }
+        if(!lasersgList.isEmpty()){
+            List<String> numList1 = lasersgList.stream().map(ProjectSceneGps::getNum).collect(Collectors.toList());
+            HashMap<String, JSONObject> ssSceneMap = laserService.list(numList1,5);
+            for (ProjectSceneGps sceneGps : lasersgList) {
+                JSONObject ssObj = ssSceneMap.get(sceneGps.getNum());
+                if(ssObj!=null){
+                    sceneGps.setWebSite(ssObj.getString("webSite"));
+                }
+            }
+            sceneMapShowList.addAll( numList1);
+            projectSceneGpsService.saveBatch(lasersgList);
         }
         sceneProService.openMapShow(sceneMapShowList);