From 561bd3c6cac8676800c322a3356d4ff04a1eb012 Mon Sep 17 00:00:00 2001 From: mzc5649 <13027087095@163.com> Date: Tue, 6 Apr 2021 13:40:17 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90update=E3=80=91=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E4=B8=8E=E9=87=8D=E5=91=BD=E5=90=8D=E5=8F=98?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../database/util/CodeStringUtils.java | 25 ++- .../controller/OnlCgformApiController.java | 11 +- .../controller/OnlCgformHeadController.java | 157 +++++++++--------- 3 files changed, 110 insertions(+), 83 deletions(-) diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java index 64b7be11..80c15f7f 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater-core/src/main/java/com/jero/codegenerate/database/util/CodeStringUtils.java @@ -6,7 +6,13 @@ import org.apache.commons.lang.StringUtils; public class CodeStringUtils { public CodeStringUtils() { } - // Comma：逗号 + + /** + * Comma：逗号 将字符串数组转换为逗号间隔字符串 + * @date 2021/4/6 13:37 + * @param stringArray 字符串数组 + * @return java.lang.String + */ public static String joinComma(String[] stringArray) { StringBuffer sb = new StringBuffer(); String[] array = stringArray; @@ -24,7 +30,11 @@ public class CodeStringUtils { return sb.toString().substring(1); } - + /** + * 首字母大写字符串 + * @param word 字符串 + * @return java.lang.String + */ public static String convertFirstWordToLower(String word) { if (StringUtils.isNotBlank(word)) { word = word.substring(0, 1).toLowerCase() + word.substring(1); @@ -32,9 +42,14 @@ public class CodeStringUtils { return word; } - - public static Integer checkIntegerAndGet(Integer var0) { - return var0 == null ? 0 : var0; + /** + * 判断并获取整型 + * @date 2021/4/6 13:39 + * @param integer 整型数 + * @return java.lang.Integer + */ + public static Integer checkIntegerAndGet(Integer integer) { + return integer == null ? 0 : integer; } /** * 是否查询字段数组包含数据库名 diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java index 523360ea..f75b4268 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformApiController.java @@ -997,10 +997,15 @@ public class OnlCgformApiController { return Result.OK(1); } - + /** + * 生成代码 + * @date 2021/4/6 11:41 + * @param jsonObject 参数 + * @return com.jero.common.api.vo.Result + */ @PostMapping({"/codeGenerate"}) - public Result b(@RequestBody JSONObject var1) { - OnlGenerateModel var2 = (OnlGenerateModel)JSONObject.parseObject(var1.toJSONString(), OnlGenerateModel.class); + public Result codeGenerate(@RequestBody JSONObject jsonObject) { + OnlGenerateModel var2 = (OnlGenerateModel)JSONObject.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class); List var3 = null; try { diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java index d6a5aed8..e93cd5c4 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformHeadController.java @@ -422,113 +422,120 @@ public class OnlCgformHeadController { return Result.OK("同步完成!"); } } - + /** + * 获取磁盘根目录 + * @date 2021/4/6 11:20 + * @param + * @return com.jero.common.api.vo.Result + */ @GetMapping({"/rootFile"}) - public Result a() { - JSONArray var1 = new JSONArray(); - File[] var2 = File.listRoots(); - File[] var3 = var2; - int var4 = var2.length; + public Result rootFile() { + JSONArray jsonArray = new JSONArray(); + File[] files = File.listRoots(); + int var4 = files.length; - for(int var5 = 0; var5 < var4; ++var5) { - File var6 = var3[var5]; - JSONObject var7 = new JSONObject(); - if (var6.isDirectory()) { - var7.put("key", var6.getAbsolutePath()); - var7.put("title", var6.getPath()); - var7.put("opened", false); - JSONObject var8 = new JSONObject(); - var8.put("icon", "custom"); - var7.put("scopedSlots", var8); - var7.put("isLeaf", var6.listFiles() == null || var6.listFiles().length == 0); + for(int i = 0; i < var4; ++i) { + File file = files[i]; + JSONObject jsonObject = new JSONObject(); + if (file.isDirectory()) { + jsonObject.put("key", file.getAbsolutePath()); + jsonObject.put("title", file.getPath()); + jsonObject.put("opened", false); + JSONObject jsonObject1 = new JSONObject(); + jsonObject1.put("icon", "custom"); + jsonObject.put("scopedSlots", jsonObject1); + jsonObject.put("isLeaf", file.listFiles() == null || file.listFiles().length == 0); } - var1.add(var7); + jsonArray.add(jsonObject); } - return Result.OK(var1); + return Result.OK(jsonArray); } - + /** + * 获取磁盘文件树 + * @date 2021/4/6 11:20 + * @param parentPath + * @return com.jero.common.api.vo.Result + */ @GetMapping({"/fileTree"}) - public Result i(@RequestParam(name = "parentPath",required = true) String var1) { - JSONArray var2 = new JSONArray(); - File var3 = new File(var1); - File[] var4 = var3.listFiles(); - File[] var5 = var4; - int var6 = var4.length; + public Result fileTree(@RequestParam(name = "parentPath",required = true) String parentPath) { + JSONArray jsonArray = new JSONArray(); + File file = new File(parentPath); + File[] files = file.listFiles(); + int length = files.length; - for(int var7 = 0; var7 < var6; ++var7) { - File var8 = var5[var7]; - if (var8.isDirectory() && oConvertUtils.isNotEmpty(var8.getPath())) { - JSONObject var9 = new JSONObject(); - System.out.println(var8.getPath()); - var9.put("key", var8.getAbsolutePath()); - var9.put("title", var8.getPath().substring(var8.getPath().lastIndexOf(File.separator) + 1)); - var9.put("isLeaf", var8.listFiles() == null || var8.listFiles().length == 0); - var9.put("opened", false); - JSONObject var10 = new JSONObject(); - var10.put("icon", "custom"); - var9.put("scopedSlots", var10); - var2.add(var9); + for(int i = 0; i < length; ++i) { + File file1 = files[i]; + if (file1.isDirectory() && oConvertUtils.isNotEmpty(file1.getPath())) { + JSONObject jsonObject = new JSONObject(); + System.out.println(file1.getPath()); + jsonObject.put("key", file1.getAbsolutePath()); + jsonObject.put("title", file1.getPath().substring(file1.getPath().lastIndexOf(File.separator) + 1)); + jsonObject.put("isLeaf", file1.listFiles() == null || file1.listFiles().length == 0); + jsonObject.put("opened", false); + JSONObject jsonObject1 = new JSONObject(); + jsonObject1.put("icon", "custom"); + jsonObject.put("scopedSlots", jsonObject1); + jsonArray.add(jsonObject); } } - return Result.OK(var2); + return Result.OK(jsonArray); } @GetMapping({"/tableInfo"}) - public Result j(@RequestParam(name = "code",required = true) String var1) { - OnlCgformHead var2 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); - if (var2 == null) { + public Result tableInfo(@RequestParam(name = "code",required = true) String code) { + OnlCgformHead onlCgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(code); + if (onlCgformHead == null) { return Result.error("未找到对应实体"); } else { - HashMap var3 = new HashMap(); - var3.put("main", var2); - if (var2.getTableType() == 2) { - String var4 = var2.getSubTableStr(); - if (oConvertUtils.isNotEmpty(var4)) { - ArrayList var5 = new ArrayList(); - String[] var6 = var4.split(","); - String[] var7 = var6; - int var8 = var6.length; + HashMap map = new HashMap(); + map.put("main", onlCgformHead); + if (onlCgformHead.getTableType() == 2) { + String subTableStr = onlCgformHead.getSubTableStr(); + if (oConvertUtils.isNotEmpty(subTableStr)) { + ArrayList list = new ArrayList(); + String[] subTableArray = subTableStr.split(","); + int length = subTableArray.length; - for(int var9 = 0; var9 < var8; ++var9) { - String var10 = var7[var9]; - LambdaQueryWrapper var11 = new LambdaQueryWrapper(); - var11.eq(OnlCgformHead::getTableName, var10); - OnlCgformHead var12 = (OnlCgformHead)this.onlCgformHeadService.getOne(var11); - var5.add(var12); + for(int i = 0; i < length; ++i) { + String subTable = subTableArray[i]; + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable); + OnlCgformHead onlCgformHead1 = (OnlCgformHead)this.onlCgformHeadService.getOne(lambdaQueryWrapper); + list.add(onlCgformHead1); } - Collections.sort(var5, new Comparator() { + Collections.sort(list, new Comparator() { @Override - public int compare(OnlCgformHead var1, OnlCgformHead var2) { - Integer var3 = var1.getTabOrderNum(); - if (var3 == null) { - var3 = 0; + public int compare(OnlCgformHead onlCgformHead1, OnlCgformHead onlCgformHead2) { + Integer tabOrderNum = onlCgformHead1.getTabOrderNum(); + if (tabOrderNum == null) { + tabOrderNum = 0; } - Integer var4 = var2.getTabOrderNum(); - if (var4 == null) { - var4 = 0; + Integer tabOrderNum1 = onlCgformHead2.getTabOrderNum(); + if (tabOrderNum1 == null) { + tabOrderNum1 = 0; } - return var3.compareTo(var4); + return tabOrderNum.compareTo(tabOrderNum1); } }); - var3.put("sub", var5); + map.put("sub", list); } } - Integer var13 = var2.getTableType(); - if ("Y".equals(var2.getIsTree())) { - var13 = 3; + Integer tableType = onlCgformHead.getTableType(); + if ("Y".equals(onlCgformHead.getIsTree())) { + tableType = 3; } - List var14 = CgformEnum.getJspModelList(var13); - var3.put("jspModeList", var14); - var3.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.getProjectPath()); - return Result.OK(var3); + List jspModelList = CgformEnum.getJspModelList(tableType); + map.put("jspModeList", jspModelList); + map.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.getProjectPath()); + return Result.OK(map); } }