深时点云场景信息

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

@@ -15,12 +15,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage_jp.util.SceneSourceUtils;
 import com.fdkankan.manage_jp.vo.request.ColdStorageParam;
 import com.fdkankan.manage_jp.vo.request.SceneParam;
+import com.fdkankan.manage_jp.vo.response.SceneVo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.BatchUpdateException;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -67,8 +69,25 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             if(param.getType() == 4){
                 wrapper.eq(TmColdStorage::getIsObj,1);
             }
+
         }
         Page<TmColdStorage> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
+        if(param.getType() != null && param.getType() == 2){  //深时归档信息
+            HashMap<String,SceneVo> voMap = new HashMap<>();
+            SceneParam sceneParam = new SceneParam();
+            sceneParam.setStatus(3);
+            PageInfo pageInfo = laserService.pageList(sceneParam);
+            List<SceneVo> list = (List<SceneVo>) pageInfo.getList();
+            list.stream().forEach(e -> voMap.put(e.getNum(),e));
+            for (TmColdStorage record : page.getRecords()) {
+                SceneVo sceneVo = voMap.get(record.getSceneNum());
+                if(sceneVo!= null){
+                    record.setSceneName(sceneVo.getSceneName());
+                    record.setSceneWebsite(sceneVo.getWebSite());
+                    record.setSceneThumb(sceneVo.getThumb());
+                }
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 

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

@@ -24,4 +24,5 @@ public class SceneParam extends RequestBase {
     private String num;
     private List<String> numList;
     private List<String> cooperateSceneCodes;
+    private Integer status;
 }