copyScene -mq

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

@@ -25,10 +25,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -172,16 +169,27 @@ public class ProjectSceneGpsServiceImpl extends ServiceImpl<IProjectSceneGpsMapp
             param.setNumList(numList);
 
         }
-        if(param.getType() == 1 && !param.getNeedPage()){
+        if(param.getType() == 1  ){
             if(roleIds.contains(5L)) {      //平台管理员
                 param.setUserId(null);
                 param.setCompanyId(null);
             }
             List<String> numList = tmContractorNumService.getNumListByCompanyId(param.getCompanyId());
             param.setCooperateSceneCodes(numList);
-        }
-        if(param.getNeedPage()){
-            return PageInfo.PageInfo(this.getBaseMapper().listGps(new Page<>(param.getPageNum(),param.getPageSize()) ,param));
+
+            if(param.getProjectId() != null){
+                Project project = projectService.getById(param.getProjectId());
+                if(project == null){
+                    return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+                }
+                List<ProjectNum> projectNumList = projectNumService.getByProjectId(Arrays.asList(param.getProjectId()));
+                if(projectNumList== null || projectNumList.isEmpty()){
+                    return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
+                }
+                List<String> projectNums = projectNumList.stream().map(ProjectNum::getNum).collect(Collectors.toList());
+                param.setNumList(projectNums);
+            }
+
         }
         Page<SceneGpsDbVp> sceneGpsDbVpPage = this.getBaseMapper().listGps(new Page<>(1, Integer.MAX_VALUE), param);
         List<SceneGpsDbVp> sceneGpsDbVps  = sceneGpsDbVpPage.getRecords();
@@ -200,10 +208,12 @@ public class ProjectSceneGpsServiceImpl extends ServiceImpl<IProjectSceneGpsMapp
                 BeanUtils.copyProperties(projectMap.get(projectId),vo);
                 List<String> list = projectNumMap.get(projectId);
                 List<SceneGpsDbVp> listScene = new ArrayList<>();
-                for (String num : list) {
-                    SceneGpsDbVp sceneGpsDbVp = scenMap.get(num);
-                    if(sceneGpsDbVp != null){
-                        listScene.add(sceneGpsDbVp);
+                if(list != null){
+                    for (String num : list) {
+                        SceneGpsDbVp sceneGpsDbVp = scenMap.get(num);
+                        if(sceneGpsDbVp != null){
+                            listScene.add(sceneGpsDbVp);
+                        }
                     }
                 }
                 vo.setSceneList(listScene);

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

@@ -146,14 +146,6 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
             return PageInfo.PageInfoEmpty(param.getPageNum(),param.getPageSize());
         }
         List<String> numList = projectNumList.stream().map(ProjectNum::getNum).collect(Collectors.toList());
-        SceneGpsParam gpsParam = new SceneGpsParam();
-        gpsParam.setProjectId(param.getProjectId());
-        gpsParam.setNumList(numList);
-        gpsParam.setNeedPage(true);
-        gpsParam.setPageNum(param.getPageNum());
-        gpsParam.setPageSize(param.getPageSize());
-        gpsParam.setType(1);
-        gpsParam.setUserId(param.getUserId());
-        return projectSceneGpsService.allSceneGps(gpsParam);
+        return numList;
     }
 }

src/main/java/com/fdkankan/manage_jp/vo/request/SceneGpsParam.java

@@ -18,7 +18,6 @@ public class SceneGpsParam {
     private List<String> numList;
     private List<String> cooperateSceneCodes;
 
-    private Boolean needPage = false;
     private Integer pageNum;
     private Integer pageSize;