From f5fe42a6d4994d6ecdb354a9fe77c2cbd56a2020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Tue, 14 Mar 2023 17:57:10 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91cgform=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformApiController.java | 100 ++++++++---------- .../controller/OnlCgformButtonController.java | 8 +- .../controller/OnlCgformFieldController.java | 3 +- .../controller/OnlCgformHeadController.java | 96 +++++++---------- .../impl/OnlCgformFieldServiceImpl.java | 21 ++-- 5 files changed, 100 insertions(+), 128 deletions(-) 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 8823115e..25404894 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 @@ -170,8 +170,8 @@ public class OnlCgformApiController { } else { try { String var5 = var4.getTableName(); - Map var6 = CgformUtil.a(var2); - Map var7 = this.onlCgformFieldService.queryAutolistPage(var5, var1, var6, null); + Map var6 = CgformUtil.a(var2); + Map var7 = this.onlCgformFieldService.queryAutolistPage(var5, var1, var6, null); this.a(var4, var7); var3.setResult(var7); } catch (Exception var8) { @@ -208,7 +208,7 @@ public class OnlCgformApiController { JSONObject var7 = var6.getJSONObject("schema"); String var8 = var3.getSubTableStr(); if (oConvertUtils.isNotEmpty(var8)) { - ArrayList var9 = new ArrayList<>(); + ArrayList var9 = new ArrayList<>(); String[] var10 = var8.split(","); int var11 = var10.length; @@ -221,7 +221,7 @@ public class OnlCgformApiController { } if (!var9.isEmpty()) { - Collections.sort(var9, (Comparator) (var122, var21) -> { + Collections.sort(var9, (var122, var21) -> { Integer var31 = var122.getTabOrderNum(); if (var31 == null) { var31 = 0; @@ -234,19 +234,17 @@ public class OnlCgformApiController { return var31.compareTo(var41); }); - Iterator var16 = var9.iterator(); - while(var16.hasNext()) { - OnlCgformHead var17 = (OnlCgformHead)var16.next(); - List var18 = this.onlCgformFieldService.queryAvailableFields(var17.getId(), var17.getTableName(), (String)null, false); + for (OnlCgformHead var17 : var9) { + List var18 = this.onlCgformFieldService.queryAvailableFields(var17.getId(), var17.getTableName(), (String) null, false); EnhanceJsUtil.b(var5, var17.getTableName(), var18); JSONObject var19 = new JSONObject(); - List var20 = this.onlAuthPageService.queryFormDisabledCode(var17.getId()); + List var20 = this.onlAuthPageService.queryFormDisabledCode(var17.getId()); if (1 == var17.getRelationType()) { var19 = CgformUtil.a(var18, var20, null); } else { var19.put("columns", CgformUtil.a(var18, var20)); - List var15 = this.onlAuthPageService.queryListHideButton(null, var17.getId()); + List var15 = this.onlAuthPageService.queryListHideButton(null, var17.getId()); var19.put("hideButtons", var15); } @@ -280,7 +278,7 @@ public class OnlCgformApiController { ) @GetMapping({"/getFormItemBytbname/{table}"}) public Result a(@PathVariable("table") String var1, @RequestParam(name = "taskId",required = false) String var2) { - Result var3 = new Result(); + Result var3 = new Result<>(); LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformHead::getTableName, var1); OnlCgformHead var5 = this.onlCgformHeadService.getOne(var4); @@ -318,7 +316,7 @@ public class OnlCgformApiController { @GetMapping({"/form/{code}/{id}"}) public Result b(@PathVariable("code") String var1, @PathVariable("id") String var2) { try { - Map var3 = this.onlCgformHeadService.queryManyFormData(var1, var2); + Map var3 = this.onlCgformHeadService.queryManyFormData(var1, var2); return Result.OK(CgformUtil.b(var3)); } catch (Exception var4) { log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); @@ -329,7 +327,7 @@ public class OnlCgformApiController { @GetMapping({"/subform/{table}/{mainId}"}) public Result c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { try { - Map var3 = this.onlCgformHeadService.querySubFormData(var1, var2); + Map var3 = this.onlCgformHeadService.querySubFormData(var1, var2); return Result.OK(CgformUtil.b(var3)); } catch (Exception var4) { log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); @@ -379,7 +377,7 @@ public class OnlCgformApiController { @OnlineAuth("form") @PostMapping({"/form/{code}"}) public Result a(@PathVariable("code") String var1, @RequestBody JSONObject var2, HttpServletRequest var3) { - Result var4 = new Result(); + Result var4 = new Result<>(); try { String var5 = CgformUtil.a(); @@ -487,7 +485,7 @@ public class OnlCgformApiController { return Result.error(EN_IS_NULL); } else { try { - if (var2.indexOf(",") >= 0) { + if (var2.contains(",")) { String var4 = var3.getTableName(); this.onlCgformFieldService.deleteAutoListById(var4, var2); } else { @@ -508,7 +506,7 @@ public class OnlCgformApiController { @GetMapping({"/getQueryInfo/{code}"}) public Result b(@PathVariable("code") String var1) { try { - List var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1); + List> var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1); return Result.OK(var2); } catch (Exception var3) { log.error("OnlCgformApiController.getQueryInfo()发生异常：" + var3.getMessage(), var3); @@ -568,7 +566,7 @@ public class OnlCgformApiController { log.error("导出java增强处理出错", var31.getMessage()); } - List var14 = this.a(fieldList, "id"); + List var14 = this.a(fieldList, "id"); if (var4.getTableType() == 2 && oConvertUtils.isEmpty(((Map)var7).get("exportSingleOnly"))) { String var15 = var4.getSubTableStr(); if (oConvertUtils.isNotEmpty(var15)) { @@ -620,7 +618,7 @@ public class OnlCgformApiController { @PostMapping({"/importXls/{code}"}) public Result b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) { long var4 = System.currentTimeMillis(); - Result var6 = new Result(); + Result var6 = new Result<>(); String var7 = ""; try { @@ -629,11 +627,11 @@ public class OnlCgformApiController { return Result.error("数据库不存在该表记录"); } - LambdaQueryWrapper var9 = new LambdaQueryWrapper(); + LambdaQueryWrapper var9 = new LambdaQueryWrapper<>(); var9.eq(OnlCgformField::getCgformHeadId, var1); - List var10 = this.onlCgformFieldService.list(var9); + List var10 = this.onlCgformFieldService.list(var9); String var11 = var2.getParameter("isSingleTableImport"); - List var12 = CgformUtil.e(var10); + List var12 = CgformUtil.e(var10); if (oConvertUtils.isEmpty(var11) && var8.getTableType() == 2 && oConvertUtils.isNotEmpty(var8.getSubTableStr())) { String[] var13 = var8.getSubTableStr().split(","); int var14 = var13.length; @@ -642,8 +640,8 @@ public class OnlCgformApiController { String var16 = var13[var15]; OnlCgformHead var17 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var16)); if (var17 != null) { - List var18 = this.onlCgformFieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var17.getId())); - List var19 = CgformUtil.b(var18, var17.getTableTxt()); + List var18 = this.onlCgformFieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var17.getId())); + List var19 = CgformUtil.b(var18, var17.getTableTxt()); if (!var19.isEmpty()) { var12.addAll(var19); } @@ -658,7 +656,7 @@ public class OnlCgformApiController { } MultipartHttpServletRequest var49 = (MultipartHttpServletRequest)var2; - Map var50 = var49.getFileMap(); + Map var50 = var49.getFileMap(); DataSource var51 = SpringContextUtils.getApplicationContext().getBean(DataSource.class); String var52 = DbTableUtil.a(var51); Iterator var53 = var50.entrySet().iterator(); @@ -673,21 +671,21 @@ public class OnlCgformApiController { List var23 = ExcelImportUtil.importExcel(var21.getInputStream(), Map.class, var22); if (var23 != null) { Object var24 = ""; - ArrayList var25 = new ArrayList(); + ArrayList var25 = new ArrayList<>(); Map var27; for(Iterator var26 = var23.iterator(); var26.hasNext(); var27.put("$mainTable$id", var24)) { var27 = (Map)var26.next(); boolean var28 = false; Set var29 = var27.keySet(); - HashMap var30 = new HashMap(); + HashMap var30 = new HashMap<>(); Iterator var31 = var29.iterator(); String var32; while(var31.hasNext()) { var32 = (String)var31.next(); - if (var32.indexOf("$subTable$") == -1) { - if (var32.indexOf(MAIN_TABLE) != -1 && oConvertUtils.isNotEmpty(var27.get(var32).toString())) { + if (!var32.contains("$subTable$")) { + if (var32.contains(MAIN_TABLE) && oConvertUtils.isNotEmpty(var27.get(var32).toString())) { var28 = true; var24 = this.a(var8, var51, var52); } @@ -730,19 +728,17 @@ public class OnlCgformApiController { if (var58 != null) { LambdaQueryWrapper var59 = new LambdaQueryWrapper<>(); var59.eq(OnlCgformField::getCgformHeadId, var58.getId()); - List var60 = this.onlCgformFieldService.list(var59); - ArrayList var33 = new ArrayList(); + List var60 = this.onlCgformFieldService.list(var59); + ArrayList var33 = new ArrayList<>(); String var34 = var58.getTableTxt(); - Iterator var35 = var23.iterator(); - while(var35.hasNext()) { - Map var36 = (Map)var35.next(); + for (Object value : var23) { + Map var36 = (Map) value; boolean var37 = false; - HashMap var38 = new HashMap(); - Iterator var39 = var60.iterator(); + HashMap var38 = new HashMap<>(); - while(var39.hasNext()) { - OnlCgformField var40 = (OnlCgformField)var39.next(); + for (Object o : var60) { + OnlCgformField var40 = (OnlCgformField) o; String var41 = var40.getMainTable(); String var42 = var40.getMainField(); boolean var43 = var8.getTableName().equals(var41) && oConvertUtils.isNotEmpty(var42); @@ -809,7 +805,7 @@ public class OnlCgformApiController { return Result.OK("执行成功!"); } - public Object a(OnlCgformHead var1, DataSource var2, String var3) throws SQLException, DBException { + public Object a(OnlCgformHead var1, DataSource var2, String var3){ Object var4 = null; String var5 = var1.getIdType(); String var6 = var1.getIdSequence(); @@ -888,17 +884,15 @@ public class OnlCgformApiController { } while("popup".equals(var4.getFieldShowType())); String var9 = String.valueOf(var1.get(var4.getDbFieldName())); - List var8; + List var8; if (oConvertUtils.isEmpty(var5)) { var8 = this.sysBaseAPI.queryDictItemsByCode(var6); } else { var8 = this.sysBaseAPI.queryTableDictItemsByCode(var5, var7, var6); } - Iterator var10 = var8.iterator(); - - while(var10.hasNext()) { - DictModel var11 = (DictModel)var10.next(); + for (Object o : var8) { + DictModel var11 = (DictModel) o; if (var9.equals(var11.getText())) { var1.put(var4.getDbFieldName(), var11.getValue()); } @@ -907,7 +901,7 @@ public class OnlCgformApiController { } private List a(List var1, String var2) { - ArrayList var3 = new ArrayList(); + ArrayList var3 = new ArrayList<>(); for(int var4 = 0; var4 < var1.size(); ++var4) { if ((null == var2 || !var2.equals(var1.get(var4).getDbFieldName())) && var1.get(var4).getIsShowList() == 1) { @@ -1072,7 +1066,7 @@ public class OnlCgformApiController { @GetMapping({"/getTreeData/{code}"}) @PermissionData public Result> d(@PathVariable("code") String var1, HttpServletRequest var2) { - Result var3 = new Result<>(); + Result> var3 = new Result<>(); OnlCgformHead var4 = this.onlCgformHeadService.getById(var1); if (var4 == null) { return Result.error(EN_IS_NULL); @@ -1081,8 +1075,8 @@ public class OnlCgformApiController { String var5 = var4.getTableName(); String var6 = var4.getTreeIdField(); String var7 = var4.getTreeParentIdField(); - ArrayList var8 = Lists.newArrayList(var6, var7); - Map var9 = CgformUtil.a(var2); + ArrayList var8 = Lists.newArrayList(var6, var7); + Map var9 = CgformUtil.a(var2); if (var9.get("hasQuery") != null && "false".equals(var9.get("hasQuery")) && var9.get(var7) == null) { var9.put(var7, "0"); } else { @@ -1091,7 +1085,7 @@ public class OnlCgformApiController { } var9.put(var6, null); - Map var11 = this.onlCgformFieldService.queryAutoTreeNoPage(var5, var1, var9, var8, var7); + Map var11 = this.onlCgformFieldService.queryAutoTreeNoPage(var5, var1, var9, var8, var7); this.a(var4, var11); var3.setResult(var11); } catch (Exception var12) { @@ -1126,7 +1120,7 @@ public class OnlCgformApiController { } @PutMapping({"/crazyForm/{name}"}) - public Result c(@PathVariable("name") String var1, @RequestBody JSONObject var2) { + public Result c(@PathVariable("name") String var1, @RequestBody JSONObject var2) { try { var2.remove("create_by"); var2.remove("create_time"); @@ -1148,7 +1142,7 @@ public class OnlCgformApiController { ) @GetMapping({"/getErpColumns/{code}"}) public Result> c(@PathVariable("code") String var1) { - Result var2 = new Result<>(); + Result> var2 = new Result<>(); OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { return Result.error(EN_IS_NULL); @@ -1159,7 +1153,7 @@ public class OnlCgformApiController { if ("erp".equals(var3.getThemeTemplate()) && var3.getTableType() == 2) { String var6 = var3.getSubTableStr(); if (oConvertUtils.isNotEmpty(var6)) { - ArrayList var7 = new ArrayList<>(); + ArrayList var7 = new ArrayList<>(); String[] var8 = var6.split(","); int var9 = var8.length; @@ -1190,7 +1184,7 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @GetMapping({"/getErpFormItem/{code}"}) - public Result e(@PathVariable("code") String var1, HttpServletRequest var2) { + public Result e(@PathVariable("code") String var1, HttpServletRequest var2) { OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { return Result.error("表不存在"); @@ -1205,7 +1199,7 @@ public class OnlCgformApiController { @GetMapping({"/querySelectOptions"}) public Result> a(@ModelAttribute LinkDown var1) { - Result var2 = new Result<>(); + Result> var2 = new Result<>(); List var3 = this.onlCgformFieldService.queryDataListByLinkDown(var1); var2.setResult(var3); var2.setSuccess(true); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java index 6e4a652e..202f83ce 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java @@ -39,11 +39,11 @@ public class OnlCgformButtonController { @GetMapping({"/list/{code}"}) public Result> list(OnlCgformButton var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4, @PathVariable("code") String var5) { - Result var6 = new Result(); + Result var6 = new Result<>(); var1.setCgformHeadId(var5); - QueryWrapper var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); - Page var8 = new Page(var2, var3); - IPage var9 = this.onlCgformButtonService.page(var8, var7); + QueryWrapper var7 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); + Page var8 = new Page<>(var2, var3); + IPage var9 = this.onlCgformButtonService.page(var8, var7); var6.setSuccess(true); var6.setResult(var9); return var6; diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java index e5f7bcd6..de710f82 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformFieldController.java @@ -14,6 +14,7 @@ import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -37,7 +38,7 @@ public class OnlCgformFieldController { private static final String EN_IS_NULL = "未找到对应实体"; @GetMapping({"/listByHeadCode"}) - public Result a(@RequestParam("headCode") String var1) { + public Result a(@RequestParam("headCode") String var1) { LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); var2.eq(OnlCgformHead::getTableName, var1); OnlCgformHead var3 = this.onlCgformHeadService.getOne(var2); 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 9c69d2ef..c5c33b6b 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 @@ -11,16 +11,11 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Properties; +import java.util.*; import javax.servlet.http.HttpServletRequest; +import com.jero.codegenerate.properties.CodeConfigProperties; +import com.jero.generater.modules.online.cgform.entity.*; import lombok.extern.slf4j.Slf4j; import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; @@ -28,10 +23,6 @@ import com.jero.common.constant.enums.CgformEnum; import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.util.JwtUtil; import com.jero.common.util.oConvertUtils; -import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJava; -import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceJs; -import com.jero.generater.modules.online.cgform.entity.OnlCgformEnhanceSql; -import com.jero.generater.modules.online.cgform.entity.OnlCgformHead; import com.jero.generater.modules.online.cgform.service.IOnlCgformEnhanceService; import com.jero.generater.modules.online.cgform.service.IOnlCgformFieldService; import com.jero.generater.modules.online.cgform.service.IOnlCgformHeadService; @@ -76,10 +67,10 @@ public class OnlCgformHeadController { @GetMapping({"/list"}) public Result> a(OnlCgformHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { - Result var5 = new Result(); - QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); - Page var7 = new Page(var2, var3); - IPage var8 = this.onlCgformHeadService.page(var7, var6); + Result> var5 = new Result<>(); + QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); + Page var7 = new Page<>(var2, var3); + IPage var8 = this.onlCgformHeadService.page(var7, var6); if (var1.getCopyType() != null && var1.getCopyType() == 0) { this.onlCgformHeadService.initCopyState(var8.getRecords()); } @@ -118,9 +109,7 @@ public class OnlCgformHeadController { public Result delete(@RequestParam(name = "id",required = true) String id) { try { this.onlCgformHeadService.deleteRecordAndTable(id); - } catch (DBException e) { - return Result.error("删除失败" + e.getMessage()); - } catch (SQLException e) { + } catch (DBException | SQLException e) { return Result.error("删除失败" + e.getMessage()); } @@ -131,9 +120,7 @@ public class OnlCgformHeadController { public Result removeRecord(@RequestParam(name = "id",required = true) String id) { try { this.onlCgformHeadService.deleteRecord(id); - } catch (DBException e) { - return Result.error("移除失败" + e.getMessage()); - } catch (SQLException e) { + } catch (DBException | SQLException e) { return Result.error("移除失败" + e.getMessage()); } @@ -163,10 +150,10 @@ public class OnlCgformHeadController { @GetMapping({"/queryByTableNames"}) public Result queryByTableNames(@RequestParam(name = "tableNames",required = true) String var1) { - LambdaQueryWrapper var2 = new LambdaQueryWrapper(); + LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); String[] var3 = var1.split(","); var2.in(OnlCgformHead::getTableName, Arrays.asList(var3)); - List var4 = this.onlCgformHeadService.list(var2); + List var4 = this.onlCgformHeadService.list(var2); return var4 == null ? Result.error(EN_IS_NULL) : Result.OK(var4); } @@ -209,7 +196,7 @@ public class OnlCgformHeadController { @GetMapping({"/enhanceButton/{formId}"}) public Result getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) { try { - List var3 = this.onlCgformHeadService.queryButtonList(var1); + List var3 = this.onlCgformHeadService.queryButtonList(var1); return var3 != null && !var3.isEmpty() ? Result.OK(var3) : Result.error("查询为空"); } catch (Exception var4) { log.error(var4.getMessage(), var4); @@ -219,7 +206,7 @@ public class OnlCgformHeadController { @GetMapping({"/enhanceSql/{formId}"}) public Result getEnhanceSql(@PathVariable("formId") String var1, HttpServletRequest var2) { - List var3 = this.onlCgformEnhanceService.queryEnhanceSqlList(var1); + List var3 = this.onlCgformEnhanceService.queryEnhanceSqlList(var1); return Result.OK(var3); } @@ -271,7 +258,7 @@ public class OnlCgformHeadController { @DeleteMapping({"/deletebatchEnhanceSql"}) public Result deletebatchEnhanceSql(@RequestParam(name = "ids",required = true) String var1) { try { - List var2 = Arrays.asList(var1.split(",")); + List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2); return Result.OK("删除成功"); } catch (Exception var3) { @@ -282,7 +269,7 @@ public class OnlCgformHeadController { @GetMapping({"/enhanceJava/{formId}"}) public Result getEnhanceJava(@PathVariable("formId") String formId, OnlCgformEnhanceJava var2) { - List var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(formId); + List var3 = this.onlCgformEnhanceService.queryEnhanceJavaList(formId); return Result.OK(var3); } @@ -340,7 +327,7 @@ public class OnlCgformHeadController { @DeleteMapping({"/deleteBatchEnhanceJava"}) public Result h(@RequestParam(name = "ids",required = true) String var1) { try { - List var2 = Arrays.asList(var1.split(",")); + List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2); return Result.OK("删除成功"); } catch (Exception var3) { @@ -355,9 +342,9 @@ public class OnlCgformHeadController { if (!"admin".equals(var5)) { return Result.error("noadminauth"); } else { - new ArrayList(); + new ArrayList<>(); - List var6; + List var6; try { var6 = DbReadTableUtil.listTableName(); } catch (SQLException var12) { @@ -367,16 +354,14 @@ public class OnlCgformHeadController { CgformUtil.b(var6); var6 = CgformUtil.f(var6); - List var7 = this.onlCgformHeadService.queryOnlinetables(); + List var7 = this.onlCgformHeadService.queryOnlinetables(); this.b(); var6.removeAll(var7); - ArrayList var8 = new ArrayList(); - Iterator var9 = var6.iterator(); + ArrayList var8 = new ArrayList<>(); - while(var9.hasNext()) { - String var10 = (String)var9.next(); + for (String var10 : var6) { if (!this.l(var10)) { - HashMap var11 = new HashMap(); + HashMap var11 = new HashMap<>(); var11.put("id", var10); var8.add(var11); } @@ -461,7 +446,7 @@ public class OnlCgformHeadController { File file1 = files[i]; if (file1.isDirectory() && oConvertUtils.isNotEmpty(file1.getPath())) { JSONObject jsonObject = new JSONObject(); - System.out.println(file1.getPath()); + log.info(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); @@ -482,38 +467,35 @@ public class OnlCgformHeadController { if (onlCgformHead == null) { return Result.error(EN_IS_NULL); } else { - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); map.put("main", onlCgformHead); if (onlCgformHead.getTableType() == 2) { String subTableStr = onlCgformHead.getSubTableStr(); if (oConvertUtils.isNotEmpty(subTableStr)) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); String[] subTableArray = subTableStr.split(","); int length = subTableArray.length; for(int i = 0; i < length; ++i) { String subTable = subTableArray[i]; - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable); OnlCgformHead onlCgformHead1 = this.onlCgformHeadService.getOne(lambdaQueryWrapper); list.add(onlCgformHead1); } - Collections.sort(list, new Comparator() { - @Override - public int compare(OnlCgformHead onlCgformHead1, OnlCgformHead onlCgformHead2) { - Integer tabOrderNum = onlCgformHead1.getTabOrderNum(); - if (tabOrderNum == null) { - tabOrderNum = 0; - } - - Integer tabOrderNum1 = onlCgformHead2.getTabOrderNum(); - if (tabOrderNum1 == null) { - tabOrderNum1 = 0; - } - - return tabOrderNum.compareTo(tabOrderNum1); + Collections.sort(list, (onlCgformHead1, onlCgformHead2) -> { + Integer tabOrderNum = onlCgformHead1.getTabOrderNum(); + if (tabOrderNum == null) { + tabOrderNum = 0; } + + Integer tabOrderNum1 = onlCgformHead2.getTabOrderNum(); + if (tabOrderNum1 == null) { + tabOrderNum1 = 0; + } + + return tabOrderNum.compareTo(tabOrderNum1); }); map.put("sub", list); } @@ -524,9 +506,9 @@ public class OnlCgformHeadController { tableType = 3; } - List jspModelList = CgformEnum.getJspModelList(tableType); + List> jspModelList = CgformEnum.getJspModelList(tableType); map.put("jspModeList", jspModelList); - map.put("projectPath", com.jero.codegenerate.properties.CodeConfigProperties.getProjectPath()); + map.put("projectPath", CodeConfigProperties.getProjectPath()); return Result.OK(map); } } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java index 79e91252..56f7b891 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/service/impl/OnlCgformFieldServiceImpl.java @@ -296,10 +296,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var11 = new LambdaQueryWrapper<>(); var11.eq(OnlCgformField::getCgformHeadId, code); List var12 = this.list(var11); - Iterator var13 = var12.iterator(); - while(var13.hasNext()) { - OnlCgformField var14 = (OnlCgformField)var13.next(); + for (OnlCgformField var14 : var12) { if (pidField.equals(var14.getDbFieldName()) && oConvertUtils.isEmpty(json.get(pidField))) { var14.setIsShowForm(1); json.put(pidField, "0"); @@ -396,17 +394,16 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl var34 = this.onlCgformFieldMapper.queryFormData(var33); new ArrayList<>(); - Iterator var20 = var9.iterator(); - while(var20.hasNext()) { - Map var21 = (Map)var20.next(); - Object var22 = var34.get(((String)var21.get(var8)).toLowerCase()); + for (HashMap stringStringHashMap : var9) { + Map var21 = (Map) stringStringHashMap; + Object var22 = var34.get(((String) var21.get(var8)).toLowerCase()); if (var22 == null) { - var22 = var34.get(((String)var21.get(var8)).toUpperCase()); + var22 = var34.get(((String) var21.get(var8)).toUpperCase()); } if (var22 != null) { - String var23 = (String)var21.get(var7) + String.valueOf(var22) + ","; + String var23 = (String) var21.get(var7) + String.valueOf(var22) + ","; var21.put(var7, var23); } } @@ -461,7 +458,7 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl(); var8.put("label", var7.getDbFieldTxt()); var8.put("field", var7.getDbFieldName()); var8.put("mode", var7.getQueryMode()); @@ -643,10 +640,8 @@ public class OnlCgformFieldServiceImpl extends ServiceImpl a(List var1) { ArrayList var2 = new ArrayList<>(); if (var1 != null && !var1.isEmpty() && var1.get(0) != null) { - Iterator var3 = var1.iterator(); - while(var3.hasNext()) { - String var4 = (String)var3.next(); + for (String var4 : var1) { if (!oConvertUtils.isEmpty(var4)) { String var5 = var4.substring(var4.lastIndexOf(":") + 1); if (!oConvertUtils.isEmpty(var5)) {