KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】SysUserController文件

Browse Source
This commit is contained in:
梁琦涛
2023-04-04 10:44:06 +08:00
parent 050079efb0
commit f9e55098e7
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java
+22 -14
View File
@@ -21,10 +21,7 @@ import com.jero.common.system.util.JwtUtil;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.*; import com.jero.common.util.*;
import com.jero.modules.base.service.BaseCommonService; import com.jero.modules.base.service.BaseCommonService;
import com.jero.modules.system.entity.SysDepart; import com.jero.modules.system.entity.*;
import com.jero.modules.system.entity.SysUser;
import com.jero.modules.system.entity.SysUserDepart;
import com.jero.modules.system.entity.SysUserRole;
import com.jero.modules.system.model.DepartIdModel; import com.jero.modules.system.model.DepartIdModel;
import com.jero.modules.system.model.SysUserSysDepartModel; import com.jero.modules.system.model.SysUserSysDepartModel;
import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysDepartService;
@@ -558,16 +555,9 @@ public class SysUserController {
sysUserExcel.setSalt(salt); sysUserExcel.setSalt(salt);
String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt); String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
sysUserExcel.setPassword(passwordEncode); sysUserExcel.setPassword(passwordEncode);
try { SuccessAndErrorLines successAndErrorLines = getSuccessAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel);
sysUserService.save(sysUserExcel); successLines = successAndErrorLines.getSuccessLines();
successLines++; errorLines = successAndErrorLines.getErrorLines();
} catch (Exception e) {
errorLines++;
String message = e.getMessage().toLowerCase();
int lineNumber = i + 1;
// 通过索引名判断出错信息
setErrorMessage(errorMessage, e, message, lineNumber);
}
// 批量将部门和用户信息建立关联关系 TODO 错误需修改 // 批量将部门和用户信息建立关联关系 TODO 错误需修改
String departIds = sysUserExcel.getDepartIds(); String departIds = sysUserExcel.getDepartIds();
saveUser(sysUserExcel, departIds); saveUser(sysUserExcel, departIds);
@@ -587,6 +577,24 @@ public class SysUserController {
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage); return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
} }
@NotNull
private SuccessAndErrorLines getSuccessAndErrorLines(List<String> errorMessage, int successLines, int errorLines, int i, SysUser sysUserExcel) {
SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines();
successAndErrorLines.setSuccessLines(successLines);
successAndErrorLines.setErrorLines(errorLines);
try {
sysUserService.save(sysUserExcel);
successAndErrorLines.setSuccessLines(successLines + 1);
} catch (Exception e) {
successAndErrorLines.setErrorLines(errorLines + 1);
String message = e.getMessage().toLowerCase();
int lineNumber = i + 1;
// 通过索引名判断出错信息
setErrorMessage(errorMessage, e, message, lineNumber);
}
return successAndErrorLines;
}
private void saveUser(SysUser sysUserExcel, String departIds) { private void saveUser(SysUser sysUserExcel, String departIds) {
if (StringUtils.isNotBlank(departIds)) { if (StringUtils.isNotBlank(departIds)) {
String userId = sysUserExcel.getId(); String userId = sysUserExcel.getId();