zhc077
/
projectManagement
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhc077:aa548e6e1e9654ec6e0430d7c84d0dc1dbd33845
Branches Tags
zhc077:dev
zhc077:dev_2307
zhc077:dev_4newlayout
zhc077:master
..
compare: zhc077:67e31657d244d1fe86d7afe7c27f5f7282a172b6
Branches Tags
zhc077:dev
zhc077:dev_2307
zhc077:dev_4newlayout
zhc077:master

No commits in common. 'aa548e6e1e9654ec6e0430d7c84d0dc1dbd33845' and '67e31657d244d1fe86d7afe7c27f5f7282a172b6' have entirely different histories.
aa548e6e1e ... 67e31657d2

1 changed files with 75 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats
  1. 75
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java

75
jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java
Unescape View File

@ -293,7 +293,7 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
message.put("uploaded", "0");
message.put("status", "判断文件结构");
message.put("isError", "false");
message.put("closeable", "false");
message.put("closeable","false");
webSocketUtils.sendMessage(loginUser.getId(), message);
try {
@ -303,8 +303,8 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
(!originalFilename.endsWith("xls") &&
!originalFilename.endsWith("xlsx"))) {
message.put("isError", "true");
message.put("status", "文件格式不正确");
message.put("closeable", "true");
message.put("status","文件格式不正确");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("文件格式不正确");
}
@ -320,16 +320,16 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
list = ExcelImportUtil.importExcel(file.getInputStream(), TablexVo.class, params);
} catch (Exception e) {
message.put("isError", "true");
message.put("status", "文件读取失败");
message.put("closeable", "true");
message.put("status","文件读取失败");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("文件读取失败");
}
//判断文件中是否存在数据
if (list == null || list.size() == 0) {
message.put("isError", "true");
message.put("status", "Excel数据为空");
message.put("closeable", "true");
message.put("status","Excel数据为空");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("Excel数据为空");
}
@ -363,8 +363,8 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
if (voList.size() == 0) {
message.put("isError", "true");
message.put("status", "导入失败，数据为空");
message.put("closeable", "true");
message.put("status","导入失败，数据为空");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，数据为空");
}
@ -382,20 +382,20 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
String moduleId = voList.get(i).getModuleId();
if (moduleId == null || moduleId.equals("")) {
message.put("isError", "true");
message.put("status", "导入失败，对应模块填写不能为空");
message.put("closeable", "true");
message.put("status","导入失败，对应模块填写不能为空");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("对应模块填写不能为空");
}
//判断实体是否已存在
LambdaQueryWrapper<Tablex> query = new LambdaQueryWrapper<>();
query.eq(Tablex::getModuleId, voList.get(i).getModuleId());
query.eq(Tablex::getModuleId,voList.get(i).getModuleId());
Tablex tablex1 = tablexService.getOne(query);
if (tablex1 != null) {
if (tablex1 != null){
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的实体已存在");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的实体已存在");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的实体已存在");
}
@ -405,8 +405,8 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
Modulex modulex = modulexService.getOne(queryWrapper);
if (modulex == null) {
message.put("isError", "true");
message.put("status", "导入失败，对应模块填写错误");
message.put("closeable", "true");
message.put("status","导入失败，对应模块填写错误");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("对应模块填写错误");
}
@ -421,19 +421,19 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
//int verisonStatusInt = verisonStatus.equals("当前") ? 1 : verisonStatus.equals("历史") ? 0 : 3;
//判断版本号
if (voList.get(i).getVerison() == null || voList.get(i).getVerison().equals("")) {
if(voList.get(i).getVerison() == null || voList.get(i).getVerison().equals("")){
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的版本号填写不能为空！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的版本号填写不能为空！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的版本号填写不能为空！");
}
//判断版本号是否为正整数且长度不能大于5
if (!voList.get(i).getVerison().matches("^[0-9]*[1-9][0-9]*$") || voList.get(i).getVerison().length() > 5) {
if (!voList.get(i).getVerison().matches("^[0-9]*[1-9][0-9]*$") || voList.get(i).getVerison().length() > 5){
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的版本状态填写错误！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的版本状态填写错误！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的版本状态填写错误！");
}
@ -460,42 +460,41 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
tablex.setCreateBy(loginUser.getRealname());
tablex.setStatus(Integer.valueOf(voList.get(i).getStatus()));
tablex.setVerisonStatus(Integer.valueOf(voList.get(i).getVerisonStatus()));
tablex.setTableStructure("CREATE TABLE '" + voList.get(i).getTableEnName() + "' ();");
tablexList.add(tablex);
} else {
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的版本状态填写错误！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的版本状态填写错误！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的版本状态填写错误！");
}
} else {
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的实体状态填写错误！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的实体状态填写错误！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的实体状态填写错误！");
}
} else {
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的英文名称填写错误！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的英文名称填写错误！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的英文名称填写错误！");
}
} else {
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的中文名称填写错误！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的中文名称填写错误！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的中文名称填写错误！");
}
} else {
message.put("isError", "true");
message.put("status", "导入失败，第" + (i + 1) + "条的对应模块填写错误！");
message.put("closeable", "true");
message.put("status","导入失败，第" + (i + 1) + "条的对应模块填写错误！");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
return Result.error("导入失败，第" + (i + 1) + "条的对应模块填写错误！");
}
@ -507,15 +506,15 @@ public class TablexController extends JeecgController<Tablex, ITablexService> {
tablexService.saveSingleBatch(tablexList, loginUser, message);
message.put("status", "上传成功");
message.put("closeable", "true");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
} catch (Exception e) {
message.put("isError", "true");
message.put("status", "文件导入失败");
message.put("closeable", "true");
message.put("status","文件导入失败");
message.put("closeable","true");
webSocketUtils.sendMessage(loginUser.getId(), message);
log.error(e.getMessage(), e);
log.error(e.getMessage(),e);
return Result.error("文件导入失败");
}
return Result.ok("文件导入成功！");

Write Preview
Loading…
Cancel
Save