From ca6acff6f38bacc21d8cfd8eab80c8c7d31e6e0d Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 30 Aug 2021 13:50:27 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=A2=9E=E5=8A=A0roleIds=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=20fix=20=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=97=B6=E5=9B=9E=E6=98=BE=E5=A4=9A=E4=B8=AA=E8=A7=92?= =?UTF-8?q?=E8=89=B2=EF=BC=8C=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysUserController.java | 27 ++++++++++++++++--- .../jero/modules/system/entity/SysUser.java | 8 +++++- .../system/mapper/xml/SysUserMapper.xml | 4 ++- 3 files changed, 34 insertions(+), 5 deletions(-) diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index a7c944ce..e85c559e 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -14,6 +14,7 @@ import com.jero.modules.system.vo.SysUserVo; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import com.jero.common.api.vo.Result; @@ -92,6 +93,9 @@ public class SysUserController { @Value("${jero.path.upload}") private String upLoadPath; + @Value("${defaultPassword}") + private String defaultPassword; + @Resource private BaseCommonService baseCommonService; @@ -548,6 +552,23 @@ public class SysUserController { return mv; } + /** + * 导出excel模板 + */ + @RequiresPermissions("defect:download:template") + @ApiOperation(value="用户-导出excel模板", notes="用户-导出excel模板") + @GetMapping(value = "/exportTemplate") + public ModelAndView exportTemplate() { + // AutoPoi 导出Excel + ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); + //此处设置的filename无效 ,前端会重更新设置一下 + mv.addObject(NormalExcelConstants.FILE_NAME, "用户导入模板文件"); + mv.addObject(NormalExcelConstants.CLASS, SysUser.class); + mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("用户导入模板文件", "用户导入模板文件")); + mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList()); + return mv; + } + /** * 通过excel导入数据 * @@ -567,7 +588,7 @@ public class SysUserController { for (Map.Entry entity : fileMap.entrySet()) { MultipartFile file = entity.getValue();// 获取上传文件对象 ImportParams params = new ImportParams(); - params.setTitleRows(2); + params.setTitleRows(1); params.setHeadRows(1); params.setNeedSave(true); try { @@ -575,8 +596,8 @@ public class SysUserController { for (int i = 0; i < listSysUsers.size(); i++) { SysUser sysUserExcel = listSysUsers.get(i); if (StringUtils.isBlank(sysUserExcel.getPassword())) { - // 密码默认为 “123456” - sysUserExcel.setPassword("123456"); + // 存入默认密码 + sysUserExcel.setPassword(defaultPassword); } // 密码加密加盐 String salt = oConvertUtils.randomGen(8); diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java index 3dbe88c0..588a1936 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java @@ -169,7 +169,6 @@ public class SysUser implements Serializable { /** * 身份（0 普通成员 1 上级） */ - @Excel(name="（1普通成员 2上级）",width = 15) private Integer userIdentity; /** @@ -179,6 +178,13 @@ public class SysUser implements Serializable { @Dict(dictTable ="sys_depart",dicText = "depart_name",dicCode = "id") private String departIds; + /** + * 角色类型 + */ + @Excel(name="角色类型",width = 15,dictTable ="sys_role",dicText = "role_name",dicCode = "id") + @Dict(dictTable ="sys_role",dicText = "role_name",dicCode = "id") + private String roleIds; + /** * 多租户id配置，编辑用户的时候设置 */ diff --git a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml index 355b8363..13e9d8f4 100644 --- a/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml +++ b/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysUserMapper.xml @@ -164,7 +164,9 @@