用户导入修改

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

@@ -25,19 +25,16 @@ public class SysUser extends BaseEntity {
     /**
      * 主键ID
      */
-    @Excel(name = "用户序号", cellType = ColumnType.NUMERIC, prompt = "用户编号")
     private Long id;
 
     /**
      * 用户ID
      */
-    @Excel(name = "用户ID")
     private String userId;
 
     /**
      * 部门ID
      */
-    @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
     /**
@@ -67,7 +64,7 @@ public class SysUser extends BaseEntity {
     /**
      * 用户性别
      */
-    @Excel(name = "用户性别")
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
     private Integer sex;
 
     /**
@@ -83,7 +80,7 @@ public class SysUser extends BaseEntity {
     /**
      * 帐号状态（0正常 1停用）
      */
-    @Excel(name = "帐号状态")
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private Integer status;
 
     /**
@@ -94,22 +91,18 @@ public class SysUser extends BaseEntity {
     /**
      * 最后登录IP
      */
-    @Excel(name = "最后登录IP", type = Type.EXPORT)
     private String loginIp;
 
     /**
      * 最后登录时间
      */
-    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
     /**
      * 部门对象
      */
     @Excels({
-            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
-            @Excel(name = "部门负责人", targetAttr = "leader", type = Type.EXPORT)
-    })
+            @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT)})
     @TableField(exist = false)
     private SysDept dept;
 
@@ -140,7 +133,6 @@ public class SysUser extends BaseEntity {
     private Integer dataPermission;
 
     /** 部门名称 */
-    @Excel(name = "部门名称")
     @TableField(exist = false)
     private String deptName;
 

base-common/src/main/java/com/ozs/common/core/domain/entity/SysUsers.java

@@ -0,0 +1,67 @@
+package com.ozs.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ozs.common.annotation.Excel;
+import com.ozs.common.annotation.Excel.Type;
+import com.ozs.common.annotation.Excels;
+import com.ozs.common.core.domain.BaseEntity;
+import com.ozs.common.xss.Xss;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 用户对象 sys_user
+ *
+ * @author hx
+ */
+@Data
+public class SysUsers implements Serializable {
+    private static final long serialVersionUID = 1L;
+    
+    /**
+     * 用户账号
+     */
+    @Excel(name = "登录名称")
+    private String userName;
+
+    /**
+     * 用户昵称
+     */
+    @Excel(name = "用户名称")
+    private String nickName;
+
+    /**
+     * 用户邮箱
+     */
+    @Excel(name = "用户邮箱")
+    private String email;
+
+    /**
+     * 手机号码
+     */
+    @Excel(name = "手机号码")
+    private String phoneNum;
+
+    /**
+     * 用户性别
+     */
+    @Excel(name = "用户性别", readConverterExp = "0=男,1=女,2=未知")
+    private Integer sex;
+    /**
+     * 帐号状态（0正常 1停用）
+     */
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
+    private Integer status;
+    
+    /** 部门名称 */
+    @Excel(name = "部门名称")
+    private String deptName;
+}

base-system/src/main/java/com/ozs/system/service/ISysUserService.java

@@ -4,6 +4,7 @@ import java.util.List;
 
 import com.ozs.common.core.domain.entity.SysUser;
 import com.ozs.common.core.domain.entity.SysUserUpdate;
+import com.ozs.common.core.domain.entity.SysUsers;
 import icu.mhb.mybatisplus.plugln.base.service.JoinIService;
 
 /**
@@ -235,7 +236,7 @@ public interface ISysUserService extends JoinIService<SysUser> {
      * @param operName        操作用户
      * @return 结果
      */
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
+    public String importUser(List<SysUsers> userList, Boolean isUpdateSupport, String operName);
 
 
     /**

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -5,11 +5,15 @@ import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
 
+import com.ozs.common.core.domain.entity.SysDept;
 import com.ozs.common.core.domain.entity.SysUserUpdate;
+import com.ozs.common.core.domain.entity.SysUsers;
 import com.ozs.common.utils.uuid.IdUtils;
+import com.ozs.system.mapper.SysDeptMapper;
 import icu.mhb.mybatisplus.plugln.base.service.impl.JoinServiceImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -63,6 +67,8 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
 
     @Autowired
     protected Validator validator;
+    @Autowired
+    private SysDeptMapper deptMapper;
 
     /**
      * 根据条件分页查询用户列表
@@ -510,7 +516,7 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+    public String importUser(List<SysUsers> userList, Boolean isUpdateSupport, String operName) {
         if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
@@ -519,23 +525,31 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList) {
+        for (SysUsers user : userList) {
             try {
                 // 验证是否存在这个用户
+                SysUser sysUser = new SysUser();
+                BeanUtils.copyProperties(user, sysUser);
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, user);
-                    user.setPassword(SecurityUtils.encryptPassword(password));
-                    user.setCreateBy(operName);
-                    this.insertUser(user);
+                    sysUser.setPassword(SecurityUtils.encryptPassword(password));
+                    sysUser.setCreateBy(operName);
+                    sysUser.setUpdateBy(operName);
+                    sysUser.setUserId(IdUtils.fastSimpleUUID());
+                    SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
+                    sysUser.setDeptId(sysDept.getDeptId());
+                    this.insertUser(sysUser);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
                 } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
-                    checkUserAllowed(user);
-                    checkUserDataScope(user.getId());
-                    user.setUpdateBy(operName);
-                    this.updateUser(user);
+                    checkUserAllowed(sysUser);
+                    checkUserDataScope(sysUser.getId());
+                    sysUser.setUpdateBy(operName);
+                    SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
+                    sysUser.setDeptId(sysDept.getDeptId());
+                    this.updateUser(sysUser);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
                 } else {

base-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -163,6 +163,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="password != null and password != ''">password,</if>
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
+		    <if test="updateBy != null and updateBy != ''">update_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
  		)values(
@@ -178,6 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="password != null and password != ''">#{password},</if>
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
+		    <if test="updateBy != null and updateBy != ''">#{updateBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			sysdate()
  		)