1

src/main/java/com/fdkankan/manage_jp/controller/ProjectController.java

@@ -4,7 +4,9 @@ package com.fdkankan.manage_jp.controller;
 import com.fdkankan.manage_jp.common.Result;
 import com.fdkankan.manage_jp.entity.Project;
 import com.fdkankan.manage_jp.service.IProjectService;
+import com.fdkankan.manage_jp.service.ISceneProService;
 import com.fdkankan.manage_jp.vo.request.ProjectParam;
+import com.fdkankan.manage_jp.vo.request.SceneParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -26,7 +28,8 @@ public class ProjectController extends BaseController{
 
     @Autowired
     IProjectService projectService;
-
+    @Autowired
+    ISceneProService sceneProService;
 
     @PostMapping("/list")
     public Result list(@RequestBody ProjectParam param){
@@ -50,5 +53,9 @@ public class ProjectController extends BaseController{
     }
 
 
+    @PostMapping("addScene")
+    public Result addScene(){
+        return Result.success();
+    }
 }
 

src/main/java/com/fdkankan/manage_jp/entity/Project.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -62,5 +64,15 @@ public class Project implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
+    @TableField("lat")
+    private String lat;
+
+    @TableField("lon")
+    private String lon;
+
+    @TableField("alt")
+    private String alt;
 
+    @TableField(exist = false)
+    private List<String> numList;
 }

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

@@ -253,6 +253,14 @@ 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();
         newParam.setPageNum(1);

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

@@ -152,16 +152,19 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             cooNumList =  tmContractorNumService.getNumList(sceneNumList);
         }
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
-        if(param.getType() == 2 ){
+
+        if(param.getType() == null){
+            ssSceneMap = laserService.list(sceneNumList);
+        }else  if(param.getType() == 2 ){
             ssSceneMap = laserService.list(sceneNumList,4);
-        }
-        if(param.getType() == 5){
+        }else  if(param.getType() == 5){
             ssSceneMap = laserService.list(sceneNumList,5);
         }
+
         HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
 
         for (SceneVo record : page.getRecords()) {
-            if(param.getType() == 2 || param.getType() == 5){
+            if(param.getType() == null || param.getType() == 2 || param.getType() == 5){
                 JSONObject ssObj = ssSceneMap.get(record.getNum());
                 if(ssObj!=null){
                     record.setSceneName(ssObj.getString("title"));

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

@@ -15,7 +15,7 @@ public class SceneParam extends RequestBase {
 
     private Long userId;
 
-    private Integer type = 0;
+    private Integer type ;
     private List<String> snCodes;
     private String snCode;
     private String userName;