场景列表添加复制时间

src/main/java/com/fdkankan/agent/entity/SceneCopyLog.java

@@ -0,0 +1,51 @@
+package com.fdkankan.agent.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-30
+ */
+@Getter
+@Setter
+@TableName("t_scene_copy_log")
+public class SceneCopyLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("old_num")
+    private String oldNum;
+
+    @TableField("new_num")
+    private String newNum;
+
+    @TableField("copy_user_id")
+    private Integer copyUserId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private String createTime;
+
+    @TableField("update_time")
+    private String updateTime;
+
+
+}

src/main/java/com/fdkankan/agent/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"agent", getTables(new String[]{
-                "t_scene",
+                "t_scene_copy_log",
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -46,8 +46,8 @@ public class AutoGenerate {
 
 
     public static void  generate(String path,String moduleName,  List<String> tables){
-        FastAutoGenerator.create("jdbc:mysql://rm-wz90w10465iiwwv098o.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod",
-                "root","D2719bd0cae1a005")
+        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
+                "root","4Dage@4Dage#@168")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/fdkankan/agent/mapper/ISceneCopyLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.agent.mapper;
+
+import com.fdkankan.agent.entity.SceneCopyLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-30
+ */
+@Mapper
+public interface ISceneCopyLogMapper extends BaseMapper<SceneCopyLog> {
+
+}

src/main/java/com/fdkankan/agent/service/ISceneCopyLogService.java

@@ -0,0 +1,20 @@
+package com.fdkankan.agent.service;
+
+import com.fdkankan.agent.entity.SceneCopyLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-30
+ */
+public interface ISceneCopyLogService extends IService<SceneCopyLog> {
+
+    HashMap<String, SceneCopyLog> getByNewNumList(List<String> numList);
+}

src/main/java/com/fdkankan/agent/service/impl/SceneCopyLogServiceImpl.java

@@ -0,0 +1,33 @@
+package com.fdkankan.agent.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.agent.entity.SceneCopyLog;
+import com.fdkankan.agent.mapper.ISceneCopyLogMapper;
+import com.fdkankan.agent.service.ISceneCopyLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-11-30
+ */
+@Service
+public class SceneCopyLogServiceImpl extends ServiceImpl<ISceneCopyLogMapper, SceneCopyLog> implements ISceneCopyLogService {
+
+    @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;
+    }
+}

src/main/java/com/fdkankan/agent/service/impl/SceneProServiceImpl.java

@@ -67,6 +67,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     IFolderSceneService folderSceneService;
     @Autowired
     ISceneService sceneService;
+    @Autowired
+    ISceneCopyLogService sceneCopyLogService;
 
 
     @Override
@@ -78,9 +80,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);
-//        for (SceneVo record : page.getRecords()) {
-//            record.setStatusString(SceneStatusUtil.getStatusString(record));
-//        }
+        HashMap<String,SceneCopyLog> map = null;
+        if(page.getRecords().size() >0){
+            List<String> numList = page.getRecords().parallelStream().map(SceneVo::getNum).collect(Collectors.toList());
+            map = sceneCopyLogService.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);
     }
 

src/main/resources/mapper/agent/SceneCopyLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.agent.mapper.ISceneCopyLogMapper">
+
+</mapper>