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] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E5=AE=9E?= =?UTF-8?q?=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; + } }