lyhzzz 2 سال پیش
والد
کامیت
bd598dccdd

+ 5 - 0
src/main/java/com/fdkankan/manage/service/ISceneCopyLogService.java

@@ -3,6 +3,9 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.SceneCopyLog;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -16,4 +19,6 @@ public interface ISceneCopyLogService extends IService<SceneCopyLog> {
     Long getCountBySceneNum(String num);
 
     void saveByNum(String oldNum, String newNum, Long userId);
+
+    HashMap<String, SceneCopyLog> getByNewNumList(List<String> numList);
 }

+ 13 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneCopyLogServiceImpl.java

@@ -7,6 +7,9 @@ import com.fdkankan.manage.service.ISceneCopyLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
@@ -33,4 +36,14 @@ public class SceneCopyLogServiceImpl extends ServiceImpl<ISceneCopyLogMapper, Sc
         sceneCopyLog.setCopyUserId(userId);
         this.save(sceneCopyLog);
     }
+
+    @Override
+    public HashMap<String, SceneCopyLog> getByNewNumList(List<String> numList) {
+        LambdaQueryWrapper<SceneCopyLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(SceneCopyLog::getNewNum,numList);
+        List<SceneCopyLog> list = this.list(wrapper);
+        HashMap<String,SceneCopyLog> map = new HashMap<>();
+        list.forEach(entity -> map.put(entity.getNewNum(),entity));
+        return map;
+    }
 }

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

@@ -218,8 +218,21 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
            return sceneService.pageList(param);
         }
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
+        List<SceneVo> records = page.getRecords();
+        HashMap<String,SceneCopyLog> map = null;
+        if(records.size() >0){
+            List<String> numList = records.parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+            map = copyLogService.getByNewNumList(numList);
+        }
         for (SceneVo record : page.getRecords()) {
             record.setStatusString(SceneStatusUtil.getStatusString(record));
+            if(map !=null ){
+                SceneCopyLog sceneCopyLog = map.get(record.getNum());
+                if(sceneCopyLog != null){
+                    record.setCopyTime(sceneCopyLog.getCreateTime());
+                    record.setIsCopy(true);
+                }
+            }
         }
         return PageInfo.PageInfo(page);
     }

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

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