用户导入调整

common/src/main/java/com/ximai/common/core/dto/SysUserExcelImport.java

@@ -14,6 +14,8 @@ import com.ximai.common.core.domain.entity.SysDept;
 import com.ximai.common.core.domain.entity.SysRole;
 import com.ximai.common.utils.excel.I18nField;
 import com.ximai.common.utils.excel.converter.LocalDateTimeConverter;
+import com.ximai.common.utils.excel.converter.StaticDataMappingConverter;
+import com.ximai.common.utils.excel.converter.StaticDataMappingFormat;
 import com.ximai.common.xss.Xss;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -33,14 +35,7 @@ import java.util.Set;
  */
 @Data
 @ApiModel("用户导入")
-public class SysUserExcelImport extends BaseExcelImport {
-
-    /**
-     * 部门ID
-     */
-    @ExcelProperty("部门编号")
-    @I18nField("user.jcaptcha.error2")
-    private Long deptId;
+public class SysUserExcelImport {
 
     /**
      * 用户账号
@@ -55,7 +50,6 @@ public class SysUserExcelImport extends BaseExcelImport {
     @ExcelProperty("用户名称")
     @I18nField("user.nickName")
     private String nickName;
-
     /**
      * 用户邮箱
      */
@@ -73,32 +67,10 @@ public class SysUserExcelImport extends BaseExcelImport {
     /**
      * 用户性别
      */
-    @ExcelProperty("用户性别")
+    @ExcelProperty(value = "用户性别", converter = StaticDataMappingConverter.class)
+    @StaticDataMappingFormat(value = {"1","2"},excelValue = {"男","女"})
     private String sex;
 
-    /**
-     * 帐号状态（0正常 1停用）
-     */
-    @ExcelProperty("帐号状态")
-    private String status;
-
-    /**
-     * 删除标志（0代表存在 2代表删除）
-     */
-    private String delFlag;
-
-    /**
-     * 最后登录IP
-     */
-    @ExcelProperty("最后登录IP")
-    private String loginIp;
-
-    /**
-     * 最后登录时间
-     */
-    @ExcelProperty(value = "最后登录时间",  converter = LocalDateTimeConverter.class)
-    private Date loginDate;
-
     @ApiModelProperty("国际化语言")
     private String locale;
 }

system/src/main/java/com/ximai/system/service/impl/SysUserServiceImpl.java

@@ -532,10 +532,10 @@ public class SysUserServiceImpl implements ISysUserService {
 
     @Override
     public void importUser(InputStream in, Boolean isUpdateSupport) {
-        ExcelReader.read(in, SysUserExcelImport.class, this::importUser);
+        ExcelReader.read(in, SysUserExcelImport.class, this::importUserImpl, isUpdateSupport);
     }
 
-    private void importUser(SysUserExcelImport userExcelImport){
+    private void importUserImpl(SysUserExcelImport userExcelImport, Boolean isUpdateSupport){
         SysUser user = BeanUtil.copyProperties(userExcelImport, SysUser.class);
         String password = configService.selectConfigByKey("sys.user.initPassword");
         // 验证是否存在这个用户
@@ -544,9 +544,11 @@ public class SysUserServiceImpl implements ISysUserService {
             BeanValidators.validateWithException(validator, user);
             user.setPassword(SecurityUtils.encryptPassword(password));
             user.setCreateBy(SecurityUtils.getUsername());
+            user.setStatus("0");
             this.insertUser(user);
-        } else if (userExcelImport.getUpdateSupport()) {
+        } else if (isUpdateSupport) {
             BeanValidators.validateWithException(validator, user);
+            user.setUserId(u.getUserId());
             user.setUpdateBy(SecurityUtils.getUsername());
             this.updateUser(user);
         }