From 1a058fb39c0afeb5ad3b7c412db992fa90d29e44 Mon Sep 17 00:00:00 2001 From: itcast Date: Wed, 26 Jul 2023 10:03:35 +0800 Subject: [PATCH 1/5] Changes --- .../fieldx/controller/FieldxController.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java index e8fb418..d7dfab5 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/controller/FieldxController.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import com.aliyuncs.utils.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.apache.poi.hssf.usermodel.HSSFRow; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -436,6 +437,7 @@ public class FieldxController extends JeecgController { if (StringUtils.isEmpty(String.valueOf(cell))) { break; } + ExcelInfo excelInfo = new ExcelInfo(); excelInfo.setcells(cells); Fieldx222 fieldx222 = new Fieldx222(); @@ -455,6 +457,7 @@ public class FieldxController extends JeecgController { fieldx222Service.remove(null); return Result.error("序号为" + (r - 2) + "的中文名称不能为空"); } + fieldx222.setFieldName(excelInfo.getFieldName()); Fieldx222 fieldx2221=fieldx222Service.query().eq("field_name",excelInfo.getFieldName()).one(); if(fieldx2221!=null){ message.put("isError", "true"); @@ -466,6 +469,17 @@ public class FieldxController extends JeecgController { } fieldx222.setFieldName(excelInfo.getFieldName()); + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(Fieldx::getTableId,fieldx222.getTableId()).eq(Fieldx::getFieldName,fieldx222.getFieldName()); + List list=fieldxService.list(queryWrapper); + if(list!=null&&list.size()!=0){ + message.put("isError", "true"); + message.put("status","序号为" + (r - 2) + "的字段名此表已存在不能重复"); + message.put("closeable","true"); + webSocketUtils.sendMessage(loginUser.getId(), message); + fieldx222Service.remove(null); + return Result.error("序号为" + (r - 2) + "的字段名此表已存在不能重复"); + } if (StringUtil.isBlank(excelInfo.getFieldEnName())) { message.put("isError", "true"); message.put("status","序号为" + (r - 2) + "的”英文名称”不能为空"); From 217b41a9b73b2ed9519d39ab44948cd215d228b5 Mon Sep 17 00:00:00 2001 From: lijinyu <3023846734@qq.com> Date: Wed, 26 Jul 2023 10:28:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modulex/service/impl/ModulexServiceImpl.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java index a62b731..a99f21c 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java @@ -390,6 +390,9 @@ public class ModulexServiceImpl extends ServiceImpl impl if (j == 2) { for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); + if(cell==null){ + propertyNames.add(null); + } String name = cell.getStringCellValue(); propertyNames.add(name); } @@ -707,8 +710,14 @@ public class ModulexServiceImpl extends ServiceImpl impl webSocketUtils.sendMessage(loginUser.getId(), message); return Result.error("导入失败,责任人信息查询不到"); } - String strip = org.apache.commons.lang.StringUtils.strip(list.toString(), "[]"); - modulex.setManagerUsers(strip); +// String strip = org.apache.commons.lang.StringUtils.strip(list.toString(), "[]"); + String s = ""; + for (int j = 0; j < list.size(); j++) { + s = s + list.get(j); + if (j < list.size() - 1) + s = s + ","; + } + modulex.setManagerUsers(s); } } String workLevel = modulexTemplate.getWorkLevel(); From e9cc7c6ac8d03fcc96d3e7c36b915997d35ff4c0 Mon Sep 17 00:00:00 2001 From: itcast Date: Wed, 26 Jul 2023 10:33:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/src/views/modulex/ModulexList.vue | 2 +- .../src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue index 1642c37..e1c9c7d 100644 --- a/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue +++ b/ant-design-vue-jeecg/src/views/modulex/ModulexList.vue @@ -575,7 +575,7 @@ export default { '表名（非空）: 请填写实体表的名称', '中文名称（非空）: 请填写字段名称', '英文名称（非空）: 请填写字段名称的英语名称', - '数据类型（非空）: 请填写数据类型，{char,varchar,int}这些等等，具体可以查看数据字典', + '数据类型（非空）: 请填写数据类型，大写{CHAR,VARCHAR,INT}这些等等，具体可以查看数据字典', '数据长度: 请填写该字段对应的长度', '浮点精度: 请填写浮点精度', '显示形式: 请填写该字段显示的形式', diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java index d511012..98a281e 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/fieldx/entity/Fieldx.java @@ -41,7 +41,7 @@ public class Fieldx implements Serializable { @Dict(dictTable="tablex",dicText = "table_name",dicCode = "id") private java.lang.String tableId; /**中文名称*/ - @Excel(name = "中文名称", width = 15) + @Excel(name = "中文名称", width = 15,dicCode = "field_name") @ApiModelProperty(value = "中文名称") private java.lang.String fieldName; /**英文名称*/ From 67e31657d244d1fe86d7afe7c27f5f7282a172b6 Mon Sep 17 00:00:00 2001 From: lijinyu <3023846734@qq.com> Date: Wed, 26 Jul 2023 10:49:20 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/modulex/service/impl/ModulexServiceImpl.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java index a99f21c..0245d2a 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/modulex/service/impl/ModulexServiceImpl.java @@ -428,6 +428,13 @@ public class ModulexServiceImpl extends ServiceImpl impl int annual = 0; for (int k = 0; k < physicalNumberOfCells; k++) { Cell cell = row.getCell(k); + if(cell==null){ + message.put("isError", "true"); + message.put("status","表格中有空白单元格,"+"请重新导入"); + message.put("closeable","true"); + webSocketUtils.sendMessage(loginUser.getId(), message); + return Result.error("数据匹配读取失败,"+"请重新导入"); + } String value = cell.getStringCellValue(); switch (k){ case 0: From 4fb7fe4a8cab4e5cf0ada02ae03f7cb8334d871e Mon Sep 17 00:00:00 2001 From: mqh <1571896045@qq.com> Date: Wed, 26 Jul 2023 11:09:24 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E8=A1=A8=E7=BB=93=E6=9E=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tablex/controller/TablexController.java | 151 +++++++++--------- 1 file changed, 76 insertions(+), 75 deletions(-) diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java index 7f15e51..ba44718 100644 --- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java +++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/tablex/controller/TablexController.java @@ -281,7 +281,7 @@ public class TablexController extends JeecgController { * 通过excel导入数据 * * @param file - * @return + * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result importExcel(MultipartFile file) { @@ -293,7 +293,7 @@ public class TablexController extends JeecgController { 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 { (!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 { 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 { 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 { 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 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 { 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 { //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) + "条的版本状态填写错误！"); } @@ -449,52 +449,53 @@ public class TablexController extends JeecgController { //判断版本状态 if (verisonStatus.equals("1") || verisonStatus.equals("0")) { - message.put("status", "数据校验成功"); - webSocketUtils.sendMessage(loginUser.getId(), message); + message.put("status", "数据校验成功"); + webSocketUtils.sendMessage(loginUser.getId(), message); - tablex.setModuleId(voList.get(i).getModuleId()); - tablex.setTableName(voList.get(i).getTableName()); - tablex.setTableEnName(voList.get(i).getTableEnName()); - tablex.setTableStructure(voList.get(i).getTableStructure()); - tablex.setStructuralDiagram(voList.get(i).getStructuralDiagram()); - tablex.setCreateBy(loginUser.getRealname()); - tablex.setStatus(Integer.valueOf(voList.get(i).getStatus())); - tablex.setVerisonStatus(Integer.valueOf(voList.get(i).getVerisonStatus())); + tablex.setModuleId(voList.get(i).getModuleId()); + tablex.setTableName(voList.get(i).getTableName()); + tablex.setTableEnName(voList.get(i).getTableEnName()); + tablex.setTableStructure(voList.get(i).getTableStructure()); + tablex.setStructuralDiagram(voList.get(i).getStructuralDiagram()); + 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); + 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) + "条的对应模块填写错误！"); } @@ -506,44 +507,44 @@ public class TablexController extends JeecgController { 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("文件导入成功！"); } - //导出实体标准模板 - @RequestMapping(value = "/templateExcel") - public ModelAndView wbsExcelTemplate(HttpServletRequest request, HttpServletResponse response) { - Map map = new HashMap(); - //设置导出文件名称 - SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); - Date date = new Date(System.currentTimeMillis()); - String currTime = formatter.format(date); - String fileName = currTime + "-" + "模板.xlsx"; - try { - String url = getClass().getClassLoader().getResource("static").getPath(); - // 模板存放地址 这里写的地址根本拿不到 在其他人的电脑上 - String templateUrl = wordPath + File.separator + "实体表模板.xls"; - TemplateExportParams params = new TemplateExportParams( - templateUrl); - ModelAndView mv = new ModelAndView(new JeecgTemplateExcelView()); - mv.addObject(TemplateExcelConstants.FILE_NAME, fileName); - mv.addObject(TemplateExcelConstants.PARAMS, params); - // 添加模板参数 - mv.addObject(TemplateExcelConstants.MAP_DATA, map); //data - return mv; - } catch (Exception e) { - log.error("下载模板异常--》{}", e); - } - return null; - } + //导出实体标准模板 + @RequestMapping(value = "/templateExcel") + public ModelAndView wbsExcelTemplate(HttpServletRequest request, HttpServletResponse response) { + Map map = new HashMap(); + //设置导出文件名称 + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + Date date = new Date(System.currentTimeMillis()); + String currTime = formatter.format(date); + String fileName = currTime + "-" + "模板.xlsx"; + try { + String url = getClass().getClassLoader().getResource("static").getPath(); + // 模板存放地址 这里写的地址根本拿不到 在其他人的电脑上 + String templateUrl = wordPath + File.separator + "实体表模板.xls"; + TemplateExportParams params = new TemplateExportParams( + templateUrl); + ModelAndView mv = new ModelAndView(new JeecgTemplateExcelView()); + mv.addObject(TemplateExcelConstants.FILE_NAME, fileName); + mv.addObject(TemplateExcelConstants.PARAMS, params); + // 添加模板参数 + mv.addObject(TemplateExcelConstants.MAP_DATA, map); //data + return mv; + } catch (Exception e) { + log.error("下载模板异常--》{}", e); + } + return null; + } }