Browse Source

场景列表解冻按钮判断

lyhzzz 2 years ago
parent
commit
a98e1c5b13

+ 15 - 0
src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -61,6 +61,8 @@ public class LaserService {
     ISceneProService sceneProService;
     @Autowired
     RedisUtil redisUtil;
+    @Autowired
+    ISceneColdStorageService sceneColdStorageService;
 
 
     public PageInfo pageList(SceneParam param) {
@@ -109,6 +111,19 @@ public class LaserService {
                 sceneVoList.add(vo);
             }
 
+            HashMap<String,SceneColdStorage> coldStorageMap = null;
+            if(sceneVoList.size() >0){
+                List<String> numList = sceneVoList.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+                coldStorageMap = sceneColdStorageService.getByNumList(numList);
+            }
+            for (SceneVo sceneVo : sceneVoList) {
+                if(coldStorageMap != null){
+                    SceneColdStorage sceneColdStorage = coldStorageMap.get(sceneVo.getNum());
+                    if(sceneColdStorage != null){
+                        sceneVo.setIsColdStorage(true);
+                    }
+                }
+            }
             Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
             voPage.setRecords(sceneVoList);
             voPage.setTotal(total);

+ 6 - 0
src/main/java/com/fdkankan/manage/service/ISceneColdStorageService.java

@@ -2,6 +2,10 @@ package com.fdkankan.manage.service;
 
 import com.fdkankan.manage.entity.SceneColdStorage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.entity.SceneCopyLog;
+
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * <p>
@@ -16,4 +20,6 @@ public interface ISceneColdStorageService extends IService<SceneColdStorage> {
     SceneColdStorage getByNum(String num);
 
     void updateStatus(String num, Integer i);
+
+    HashMap<String, SceneColdStorage> getByNumList(List<String> numList);
 }

+ 17 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneColdStorageServiceImpl.java

@@ -3,11 +3,15 @@ package com.fdkankan.manage.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.manage.entity.SceneColdStorage;
+import com.fdkankan.manage.entity.SceneCopyLog;
 import com.fdkankan.manage.mapper.ISceneColdStorageMapper;
 import com.fdkankan.manage.service.ISceneColdStorageService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  * 场景封存状态表 服务实现类
@@ -34,4 +38,17 @@ public class SceneColdStorageServiceImpl extends ServiceImpl<ISceneColdStorageMa
         wrapper.set(SceneColdStorage::getState,state);
         this.update(wrapper);
     }
+
+    @Override
+    public HashMap<String, SceneColdStorage> getByNumList(List<String> numList) {
+        HashMap<String, SceneColdStorage> map = new HashMap<>();
+        if(numList.size() >0){
+            LambdaQueryWrapper<SceneColdStorage> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(SceneColdStorage::getNum,numList);
+            wrapper.eq(SceneColdStorage::getState,1);
+            List<SceneColdStorage> list = this.list(wrapper);
+            list.forEach(entity -> map.put(entity.getNum(),entity));
+        }
+        return map;
+    }
 }

+ 11 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -222,6 +222,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
             map = copyLogService.getByNewNumList(numList);
         }
+        HashMap<String,SceneColdStorage> coldStorageMap = null;
+        if(records.size() >0){
+            List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+            coldStorageMap = sceneColdStorageService.getByNumList(numList);
+        }
         for (SceneVo record : page.getRecords()) {
             record.setStatusString(SceneStatusUtil.getStatusString(record));
             if(map !=null ){
@@ -231,6 +236,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                     record.setIsCopy(true);
                 }
             }
+            if(coldStorageMap != null){
+                SceneColdStorage sceneColdStorage = coldStorageMap.get(record.getNum());
+                if(sceneColdStorage != null){
+                    record.setIsColdStorage(true);
+                }
+            }
             if(record.getStatus() == -1){  //计算失败
                 SceneBuildProcessLog sceneBuildProcessLog = sceneBuildProcessLogService.getByNum(record.getNum());
                 if(sceneBuildProcessLog != null){

+ 1 - 0
src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -11,6 +11,7 @@ public class SceneVo {
     private String snCode;          //相机sn码
     private String sceneSize;       //场景大小
     private Boolean isCopy = false;          //是否复制
+    private Boolean IsColdStorage = false;          //是否复制
     private String copyTime;        //复制时间
     private String userName;        //绑定账号
     private Integer viewCount;      //浏览量