فهرست منبع

场景归档过

lyhzzz 1 سال پیش
والد
کامیت
20a5a850b0

+ 6 - 0
src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -39,6 +39,8 @@ public class LaserController extends BaseController{
     ITmContractorService tmContractorService;
     @Autowired
     ITmContractorNumService tmContractorNumService;
+    @Autowired
+    ITmColdStorageService tmColdStorageService;
 
     @GetMapping("/checkEditPermission")
     public Result checkEditPermission(@RequestParam(required = false)String sceneNum){
@@ -47,6 +49,10 @@ public class LaserController extends BaseController{
         if(user == null){
             return Result.success(false);
         }
+        List<String> coldLogNumList = tmColdStorageService.getNumListColdLog(sceneNum);
+        if(coldLogNumList.contains(sceneNum)){
+            return Result.success(false);
+        }
         Set<Long> roleIds = userRoleService.getByUser(user);
         if(roleIds.contains(5L)){
             return Result.success(true);

+ 10 - 5
src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -3,6 +3,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage_jp.httpClient.param.LaserSceneMoveParam;
+import com.fdkankan.manage_jp.service.*;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 
 import com.alibaba.fastjson.JSONArray;
@@ -20,10 +21,6 @@ import com.fdkankan.manage_jp.httpClient.param.SSDownSceneParam;
 import com.fdkankan.manage_jp.httpClient.param.SSToBind;
 import com.fdkankan.manage_jp.httpClient.vo.FdkkResponse;
 import com.fdkankan.manage_jp.httpClient.vo.SSDownSceneVo;
-import com.fdkankan.manage_jp.service.ICameraDetailService;
-import com.fdkankan.manage_jp.service.ICameraService;
-import com.fdkankan.manage_jp.service.ICompanyService;
-import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.SceneParam;
 import com.fdkankan.manage_jp.vo.response.SceneVo;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +51,8 @@ public class LaserService {
     ICameraService cameraService;
     @Autowired
     ICompanyService companyService;
+    @Autowired
+    ITmColdStorageService tmColdStorageService;
 
 
     public PageInfo pageList(SceneParam param) {
@@ -96,13 +95,19 @@ public class LaserService {
                 }
                 sceneVoList.add(vo);
             }
-
+            List<String> sceneNumList = sceneVoList.stream().map(SceneVo::getNum).collect(Collectors.toList());
+            HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
             for (SceneVo sceneVo : sceneVoList) {
                 Company company = companyService.getByChildName(sceneVo.getChildName());
                 if(company != null){
                     sceneVo.setCompanyName(company.getCompanyName());
                 }
+                if(coldMap.get(sceneVo.getNum())!=null){
+                    sceneVo.setColdStorage(coldMap.get(sceneVo.getNum()));
+                }
             }
+
+
             Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
             voPage.setRecords(sceneVoList);
             voPage.setTotal(total);

+ 6 - 0
src/main/java/com/fdkankan/manage_jp/mapper/ITmColdStorageMapper.java

@@ -3,6 +3,9 @@ package com.fdkankan.manage_jp.mapper;
 import com.fdkankan.manage_jp.entity.TmColdStorage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ITmColdStorageMapper extends BaseMapper<TmColdStorage> {
 
+    List<TmColdStorage> getNumColdLog(@Param("sceneNum") String sceneNum);
+
+    List<TmColdStorage> getNumColdLogs(@Param("sceneNums")List<String> numList);
 }

+ 9 - 0
src/main/java/com/fdkankan/manage_jp/service/ITmColdStorageService.java

@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage_jp.vo.request.ColdStorageParam;
 import com.fdkankan.manage_jp.vo.request.SceneParam;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -20,4 +23,10 @@ public interface ITmColdStorageService extends IService<TmColdStorage> {
     void coldStorage(SceneParam param);
 
     void restore(SceneParam param);
+
+    List<TmColdStorage> getNumColdLog(String sceneNum);
+
+    List<String> getNumListColdLog(String sceneNum);
+
+    HashMap<String, Boolean> getByNumList(List<String> numList);
 }

+ 8 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -76,6 +76,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     ITmContractorNumService tmContractorNumService;
     @Autowired
     IUserRoleService userRoleService;
+    @Autowired
+    ITmColdStorageService tmColdStorageService;
 
     @Override
     public Long getCountByUserIds(List<Long> userIds) {
@@ -121,6 +123,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        List<String> sceneNumList = page.getRecords().stream().map(SceneVo::getNum).collect(Collectors.toList());
+        HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
+
         for (SceneVo record : page.getRecords()) {
             Company company = companyService.getByCameraId(record.getCameraId());
             if(company != null){
@@ -134,6 +139,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 record.setIsMain(false);
                 record.setIsDel(false);
             }
+            if(coldMap.get(record.getNum())!=null){
+                record.setColdStorage(coldMap.get(record.getNum()));
+            }
         }
         return PageInfo.PageInfo(page);
     }

+ 22 - 0
src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.sql.BatchUpdateException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -208,4 +209,25 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
         wrapper.eq(TmColdStorage::getSceneNum,num);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<TmColdStorage> getNumColdLog(String sceneNum) {
+        return this.getBaseMapper().getNumColdLog(sceneNum);
+    }
+
+    @Override
+    public List<String> getNumListColdLog(String sceneNum) {
+        List<TmColdStorage> numColdLog = this.getBaseMapper().getNumColdLog(sceneNum);
+        return numColdLog.stream().map(TmColdStorage::getSceneNum).collect(Collectors.toList());
+    }
+
+    @Override
+    public HashMap<String, Boolean> getByNumList(List<String> numList) {
+        HashMap<String,Boolean> map = new HashMap<>();
+        if(numList != null && !numList.isEmpty() ){
+            List<TmColdStorage> coldStorages = this.getBaseMapper().getNumColdLogs(numList);
+            coldStorages.forEach(e -> map.put(e.getSceneNum(),true));
+        }
+        return map;
+    }
 }

+ 3 - 0
src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -37,4 +37,7 @@ public class SceneVo {
     private Boolean isMain = true;
     private Boolean isDel = true;
 
+    private Boolean coldStorage = false;
+
+
 }

+ 9 - 0
src/main/resources/mapper/manage_jp/TmColdStorageMapper.xml

@@ -2,4 +2,13 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.manage_jp.mapper.ITmColdStorageMapper">
 
+    <select id="getNumColdLog" resultType="com.fdkankan.manage_jp.entity.TmColdStorage">
+        select  * from tm_cold_storage where scene_num = #{sceneNum}
+    </select>
+    <select id="getNumColdLogs" resultType="com.fdkankan.manage_jp.entity.TmColdStorage">
+        select  * from tm_cold_storage where scene_num in
+                                       <foreach collection="sceneNums" item="sceneNum" open="("  separator="," close=")">
+                                           #{sceneNum}
+                                       </foreach>
+    </select>
 </mapper>