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

【fix sonar】SysDictController文件

Browse Source
This commit is contained in:
梁琦涛
2023-04-04 10:42:41 +08:00
parent a5a6a8b0f9
commit 6634660392
1 changed files with 25 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/SysDictController.java
+25 -14
View File
@@ -17,6 +17,7 @@ import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.ImportExcelUtil;
import com.jero.common.util.SqlInjectionUtil;
import com.jero.common.util.oConvertUtils;
import com.jero.modules.system.entity.SuccessAndErrorLines;
import com.jero.modules.system.entity.SysDict;
import com.jero.modules.system.entity.SysDictItem;
import com.jero.modules.system.model.SysDictTree;
@@ -496,20 +497,9 @@ public class SysDictController {
SysDict po = new SysDict();
BeanUtils.copyProperties(list.get(i), po);
po.setDelFlag(CommonConstant.DEL_FLAG_0);
try {
Integer integer = sysDictService.saveMain(po, list.get(i).getSysDictItemList());
if(integer>0){
successLines++;
}else{
errorLines++;
int lineNumber = i + 1;
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
} catch (Exception e) {
errorLines++;
int lineNumber = i + 1;
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
SuccessAndErrorLines successAndErrorLines = getSuccessAndErrorLines(list, errorMessage, successLines, errorLines, i, po);
successLines = successAndErrorLines.getSuccessLines();
errorLines = successAndErrorLines.getErrorLines();
}
return ImportExcelUtil.imporReturnRes(errorLines,successLines,errorMessage);
} catch (Exception e) {
@@ -522,6 +512,27 @@ public class SysDictController {
return Results.error("文件导入失败！");
}
private SuccessAndErrorLines getSuccessAndErrorLines(List<SysDictPage> list, List<String> errorMessage, int successLines, int errorLines, int i, SysDict po) {
SuccessAndErrorLines successAndErrorLines = new SuccessAndErrorLines();
successAndErrorLines.setSuccessLines(successLines);
successAndErrorLines.setErrorLines(errorLines);
try {
Integer integer = sysDictService.saveMain(po, list.get(i).getSysDictItemList());
if(integer>0){
successAndErrorLines.setSuccessLines(successLines + 1);
}else{
successAndErrorLines.setErrorLines(errorLines + 1);
int lineNumber = i + 1;
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
} catch (Exception e) {
successAndErrorLines.setErrorLines(errorLines + 1);
int lineNumber = i + 1;
errorMessage.add("第 " + lineNumber + " 行：字典编码已经存在，忽略导入。");
}
return successAndErrorLines;
}
private void fileClose(MultipartFile file) {
try {
file.getInputStream().close();