数据迁移

ktg-admin/src/main/resources/application-druid.yml

@@ -10,8 +10,8 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://36.133.35.52:3306/iscs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: guoruandev
+                url: jdbc:mysql://36.133.174.236:3306/iscs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                username: root
                 password: guoruan@#$devNUM1
                 #url: jdbc:mysql://100.113.202.103:3306/iscs_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 #username: guoruandev

ktg-common/src/main/java/com/ktg/common/core/domain/entity/SysUser.java

@@ -1,5 +1,8 @@
 package com.ktg.common.core.domain.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ktg.common.annotation.Excel;
@@ -9,6 +12,7 @@ import com.ktg.common.annotation.Excels;
 import com.ktg.common.core.domain.BaseEntity;
 import com.ktg.common.xss.Xss;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -23,12 +27,14 @@ import java.util.List;
  *
  * @author ktg
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class SysUser extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
     /** 用户ID */
+    @TableId(type = IdType.AUTO)
     @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long userId;
 
@@ -63,6 +69,7 @@ public class SysUser extends BaseEntity
     private String password;
 
     /** 盐加密 */
+    @TableField(exist = false)
     private String salt;
 
     /** 帐号状态（0正常 1停用） */
@@ -85,20 +92,26 @@ public class SysUser extends BaseEntity
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
         @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
     })
+    @TableField(exist = false)
     private SysDept dept;
 
     /** 角色对象 */
+    @TableField(exist = false)
     private List<SysRole> roles;
 
     /** 角色组 */
+    @TableField(exist = false)
     private Long[] roleIds;
 
     /** 岗位组 */
+    @TableField(exist = false)
     private Long[] postIds;
 
     /** 角色ID */
+    @TableField(exist = false)
     private Long roleId;
 
+    @TableField(exist = false)
     private String roleKey;
 
     public SysUser()

ktg-quartz/src/main/java/com/ktg/quartz/task/SendEmailsTask.java

@@ -14,7 +14,6 @@ import com.ktg.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -51,11 +50,7 @@ public class SendEmailsTask
                     .map(Long::parseLong) // 将每个字符串转换为Long
                     .collect(Collectors.toList());
             List<IsMaterialsCabinet> isMaterialsCabinets = iIsMaterialsCabinetService.listByIds(cabinetIds);
-            ArrayList<SysUser> sysUsers = new ArrayList<>();
-            for (Long userId : userIds) {
-                SysUser sysUser = iSysUserService.selectUserById(userId);
-                sysUsers.add(sysUser);
-            }
+            List<SysUser> sysUsers = iSysUserService.listByIds(userIds);
             String text = isMaterialsCabinets.stream().map(IsMaterialsCabinet::getCabinetName).collect(Collectors.toList()).toString();
             for (SysUser sysUser : sysUsers) {
                 if (StringUtils.isNotBlank(sysUser.getEmail())) {