Procházet zdrojové kódy

app云端场景列表,深光展示bug

lyhzzz před 1 rokem
rodič
revize
d7fc1fc073

+ 1 - 0
src/main/java/com/fdkankan/manage_jp/httpClient/param/LaserSceneParam.java

@@ -12,5 +12,6 @@ public class LaserSceneParam {
 
     private List<String>  sceneCodes;
     private Integer status;
+    private Integer sceneSource;
 
 }

+ 4 - 2
src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

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

+ 7 - 1
src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -81,7 +81,13 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
         Page<TmColdStorage> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         if(param.getType() != null && (param.getType() == 2 || param.getType() == 5)){  //深时归档信息
             List<String> numList = page.getRecords().stream().map(TmColdStorage::getSceneNum).collect(Collectors.toList());
-            HashMap<String, JSONObject> ssObj = laserService.list(numList,3);
+            HashMap<String, JSONObject> ssObj = new HashMap<>();
+            if(param.getType() == 2){
+                laserService.list(numList,3,4);
+            }
+            if(param.getType() == 5){
+                laserService.list(numList,3,5);
+            }
             for (TmColdStorage record : page.getRecords()) {
                 JSONObject sceneVo = ssObj.get(record.getSceneNum());
                 if(sceneVo!= null){