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 18f8285b..8823115e 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 @@ -2,6 +2,7 @@ package com.jero.generater.modules.online.cgform.controller; import cn.hutool.core.io.FileUtil; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,17 +12,9 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.Map.Entry; import java.util.stream.Collectors; import javax.servlet.ServletOutputStream; @@ -29,8 +22,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; +import com.jero.common.exception.JeroBootException; import com.jero.generater.modules.online.auth.service.IOnlAuthPageService; import lombok.extern.slf4j.Slf4j; +import org.apache.poi.ss.formula.functions.T; import org.apache.poi.ss.usermodel.Workbook; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; @@ -73,6 +68,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.support.incrementer.OracleSequenceMaxValueIncrementer; import org.springframework.jdbc.support.incrementer.PostgreSQLSequenceMaxValueIncrementer; +import org.springframework.util.StringUtils; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.ModelAttribute; @@ -108,14 +104,18 @@ public class OnlCgformApiController { @Value("${jero.uploadType}") private String uploadType; - public OnlCgformApiController() { - } + private static final String EN_IS_NULL = "实体不存在"; + private static final String ONLINE_CHECK_EX = "Online表单查询异常："; + private static final String ON_LCG_FORM_API_CONTROLLER_CHECK_EX = "OnlCgformApiController.formEdit()发生异常："; + private static final String MAIN_TABLE = "$mainTable$"; + + private static final String CHECK_ERROR = "查询失败，"; @PostMapping({"/addAll"}) - public Result a(@RequestBody OnlCgformModel var1) { + public Result a(@RequestBody OnlCgformModel var1) { try { String var2 = var1.getHead().getTableName(); - return DbTableUtil.a(var2) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1); + return Boolean.TRUE.equals(DbTableUtil.a(var2)) ? Result.error("数据库表[" + var2 + "]已存在,请从数据库导入表单") : this.onlCgformHeadService.addAll(var1); } catch (Exception var3) { log.error("OnlCgformApiController.addAll()发生异常：" + var3.getMessage(), var3); return Result.error("操作失败"); @@ -123,7 +123,7 @@ public class OnlCgformApiController { } @PutMapping({"/editAll"}) - public Result b(@RequestBody OnlCgformModel var1) { + public Result b(@RequestBody OnlCgformModel var1) { try { return this.onlCgformHeadService.editAll(var1); } catch (Exception var3) { @@ -140,10 +140,10 @@ public class OnlCgformApiController { @OnlineAuth("getColumns") @GetMapping({"/getColumns/{code}"}) public Result a(@PathVariable("code") String var1) { - Result var2 = new Result(); - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + Result var2 = new Result<>(); + OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { - return Result.error("实体不存在"); + return Result.error(EN_IS_NULL); } else { OnlComplexModel var4 = this.onlineService.queryOnlineConfig(var3); var4.setIsDesForm(var3.getIsDesForm()); @@ -163,15 +163,15 @@ public class OnlCgformApiController { @OnlineAuth("getData") @GetMapping({"/getData/{code}"}) public Result> a(@PathVariable("code") String var1, HttpServletRequest var2) { - Result var3 = new Result(); - OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + Result var3 = new Result<>(); + OnlCgformHead var4 = this.onlCgformHeadService.getById(var1); if (var4 == null) { - return Result.error("实体不存在"); + return Result.error(EN_IS_NULL); } else { try { String var5 = var4.getTableName(); Map var6 = CgformUtil.a(var2); - Map var7 = this.onlCgformFieldService.queryAutolistPage(var5, var1, var6, (List)null); + Map var7 = this.onlCgformFieldService.queryAutolistPage(var5, var1, var6, null); this.a(var4, var7); var3.setResult(var7); } catch (Exception var8) { @@ -191,48 +191,48 @@ public class OnlCgformApiController { ) @OnlineAuth("getFormItem") @GetMapping({"/getFormItem/{code}"}) - public Result b(@PathVariable("code") String var1, HttpServletRequest var2) { - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + public Result b(@PathVariable("code") String var1, HttpServletRequest var2) { + OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { Result.error("表不存在"); } - Result var4 = new Result(); + Result var4 = new Result<>(); OnlCgformEnhanceJs var5 = this.onlCgformHeadService.queryEnhanceJs(var1, "form"); JSONObject var6 = this.onlineService.queryOnlineFormObj(var3, var5); - var6.put("formTemplate", var3.getFormTemplate()); - if (var3.getTableType() == 2) { + if(!Objects.isNull(var3)){ + var6.put("formTemplate", var3.getFormTemplate()); + } + + if (var3 != null && var3.getTableType() == 2) { 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; for(int var12 = 0; var12 < var11; ++var12) { String var13 = var10[var12]; - OnlCgformHead var14 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var13)); + OnlCgformHead var14 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var13)); if (var14 != null) { var9.add(var14); } } - if (var9.size() > 0) { - Collections.sort(var9, new Comparator() { - @Override - public int compare(OnlCgformHead var1, OnlCgformHead var2) { - Integer var3 = var1.getTabOrderNum(); - if (var3 == null) { - var3 = 0; - } - - Integer var4 = var2.getTabOrderNum(); - if (var4 == null) { - var4 = 0; - } - - return var3.compareTo(var4); + if (!var9.isEmpty()) { + Collections.sort(var9, (Comparator) (var122, var21) -> { + Integer var31 = var122.getTabOrderNum(); + if (var31 == null) { + var31 = 0; } + + Integer var41 = var21.getTabOrderNum(); + if (var41 == null) { + var41 = 0; + } + + return var31.compareTo(var41); }); Iterator var16 = var9.iterator(); @@ -243,10 +243,10 @@ public class OnlCgformApiController { JSONObject var19 = new JSONObject(); List var20 = this.onlAuthPageService.queryFormDisabledCode(var17.getId()); if (1 == var17.getRelationType()) { - var19 = CgformUtil.a(var18, var20, (TreeSelectColumn)null); + var19 = CgformUtil.a(var18, var20, null); } else { var19.put("columns", CgformUtil.a(var18, var20)); - List var15 = this.onlAuthPageService.queryListHideButton((String)null, var17.getId()); + List var15 = this.onlAuthPageService.queryListHideButton(null, var17.getId()); var19.put("hideButtons", var15); } @@ -267,7 +267,9 @@ public class OnlCgformApiController { } var4.setResult(var6); - var4.setOnlTable(var3.getTableName()); + if(!Objects.isNull(var3)){ + var4.setOnlTable(var3.getTableName()); + } return var4; } @@ -277,17 +279,19 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @GetMapping({"/getFormItemBytbname/{table}"}) - public Result a(@PathVariable("table") String var1, @RequestParam(name = "taskId",required = false) String var2) { + public Result a(@PathVariable("table") String var1, @RequestParam(name = "taskId",required = false) String var2) { Result var3 = new Result(); - LambdaQueryWrapper var4 = new LambdaQueryWrapper(); + LambdaQueryWrapper var4 = new LambdaQueryWrapper<>(); var4.eq(OnlCgformHead::getTableName, var1); - OnlCgformHead var5 = (OnlCgformHead)this.onlCgformHeadService.getOne(var4); + OnlCgformHead var5 = this.onlCgformHeadService.getOne(var4); if (var5 == null) { Result.error("表不存在"); } JSONObject var6 = new JSONObject(); - var5.setTaskId(var2); + if(!Objects.isNull(var5)){ + var5.setTaskId(var2); + } var6.put("schema", this.onlCgformHeadService.queryFormItem(var5)); var6.put("head", var5); var3.setResult(var6); @@ -297,7 +301,7 @@ public class OnlCgformApiController { @OnlineAuth("getEnhanceJs") @GetMapping({"/getEnhanceJs/{code}"}) - public Result c(@PathVariable("code") String var1, HttpServletRequest var2) { + public Result c(@PathVariable("code") String var1, HttpServletRequest var2) { String var3 = ""; OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhanceJs(var1, "form"); if (var4 != null && oConvertUtils.isNotEmpty(var4.getCgJs())) { @@ -312,34 +316,34 @@ public class OnlCgformApiController { value = "online表单数据查询" ) @GetMapping({"/form/{code}/{id}"}) - public Result b(@PathVariable("code") String var1, @PathVariable("id") String var2) { + public Result b(@PathVariable("code") String var1, @PathVariable("id") String var2) { try { Map var3 = this.onlCgformHeadService.queryManyFormData(var1, var2); return Result.OK(CgformUtil.b(var3)); } catch (Exception var4) { - log.error("Online表单查询异常：" + var4.getMessage(), var4); - return Result.error("查询失败，" + var4.getMessage()); + log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); + return Result.error(CHECK_ERROR + var4.getMessage()); } } @GetMapping({"/subform/{table}/{mainId}"}) - public Result c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { + public Result c(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { try { Map var3 = this.onlCgformHeadService.querySubFormData(var1, var2); return Result.OK(CgformUtil.b(var3)); } catch (Exception var4) { - log.error("Online表单查询异常：" + var4.getMessage(), var4); - return Result.error("查询失败，" + var4.getMessage()); + log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); + return Result.error(CHECK_ERROR + var4.getMessage()); } } @GetMapping({"/subform/list/{table}/{mainId}"}) - public Result d(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { + public Result d(@PathVariable("table") String var1, @PathVariable("mainId") String var2) { try { return Result.OK(this.onlCgformHeadService.queryManySubFormData(var1, var2)); } catch (Exception var4) { - log.error("Online表单查询异常：" + var4.getMessage(), var4); - return Result.error("查询失败，" + var4.getMessage()); + log.error(ONLINE_CHECK_EX + var4.getMessage(), var4); + return Result.error(CHECK_ERROR + var4.getMessage()); } } @@ -349,13 +353,13 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @GetMapping({"/form/table_name/{tableName}/{dataId}"}) - public Result e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) { + public Result e(@PathVariable("tableName") String var1, @PathVariable("dataId") String var2) { try { - LambdaQueryWrapper var3 = new LambdaQueryWrapper(); + LambdaQueryWrapper var3 = new LambdaQueryWrapper<>(); var3.eq(OnlCgformHead::getTableName, var1); - OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getOne(var3); + OnlCgformHead var4 = this.onlCgformHeadService.getOne(var3); if (var4 == null) { - throw new Exception("OnlCgform tableName: " + var1 + " 不存在！"); + throw new JeroBootException("OnlCgform tableName: " + var1 + " 不存在！"); } else { Result var5 = this.b(var4.getId(), var2); var5.setOnlTable(var1); @@ -363,7 +367,7 @@ public class OnlCgformApiController { } } catch (Exception var6) { log.error("Online表单查询异常，" + var6.getMessage(), var6); - return Result.error("查询失败，" + var6.getMessage()); + return Result.error(CHECK_ERROR + var6.getMessage()); } } @@ -401,14 +405,14 @@ public class OnlCgformApiController { ) @OnlineAuth("form") @PutMapping({"/form/{code}"}) - public Result a(@PathVariable("code") String var1, @RequestBody JSONObject var2) { + public Result a(@PathVariable("code") String var1, @RequestBody JSONObject var2) { try { String var3 = this.onlCgformHeadService.editManyFormData(var1, var2); Result var4 = Result.OK("操作成功!"); var4.setOnlTable(var3); return var4; } catch (Exception var5) { - log.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5); + log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var5.getMessage(), var5); return Result.error("修改失败，" + CgformUtil.a(var5)); } } @@ -420,10 +424,10 @@ public class OnlCgformApiController { ) @OnlineAuth("form") @DeleteMapping({"/form/{code}/{id}"}) - public Result f(@PathVariable("code") String var1, @PathVariable("id") String var2) { - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + public Result f(@PathVariable("code") String var1, @PathVariable("id") String var2) { + OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { - return Result.error("实体不存在"); + return Result.error(EN_IS_NULL); } else { try { String var4 = ""; @@ -432,7 +436,7 @@ public class OnlCgformApiController { var4 = this.onlCgformFieldService.queryTreePids(var3, var2); } - if (var2.indexOf(",") > 0) { + if (var2.indexOf(",") >= 0) { String var5; if (var3.getTableType() == 2) { this.onlCgformFieldService.deleteAutoListMainAndSub(var3, var2); @@ -461,7 +465,7 @@ public class OnlCgformApiController { this.onlCgformFieldService.deleteAutoList("design_form_data", "online_form_data_id", var2); } } catch (Exception var12) { - log.error("OnlCgformApiController.formEdit()发生异常：" + var12.getMessage(), var12); + log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var12.getMessage(), var12); return Result.error("删除失败"); } @@ -477,20 +481,20 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @DeleteMapping({"/formByCode/{code}/{id}"}) - public Result g(@PathVariable("code") String var1, @PathVariable("id") String var2) { - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var1)); + public Result g(@PathVariable("code") String var1, @PathVariable("id") String var2) { + OnlCgformHead var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var1)); if (var3 == null) { - return Result.error("实体不存在"); + return Result.error(EN_IS_NULL); } else { try { - if (var2.indexOf(",") > 0) { + if (var2.indexOf(",") >= 0) { String var4 = var3.getTableName(); this.onlCgformFieldService.deleteAutoListById(var4, var2); } else { this.onlCgformHeadService.deleteOneTableInfo(var3.getId(), var2); } } catch (Exception var5) { - log.error("OnlCgformApiController.formEdit()发生异常：" + var5.getMessage(), var5); + log.error(ON_LCG_FORM_API_CONTROLLER_CHECK_EX + var5.getMessage(), var5); return Result.error("删除失败"); } @@ -502,7 +506,7 @@ public class OnlCgformApiController { @OnlineAuth("getQueryInfo") @GetMapping({"/getQueryInfo/{code}"}) - public Result b(@PathVariable("code") String var1) { + public Result b(@PathVariable("code") String var1) { try { List var2 = this.onlCgformFieldService.getAutoListQueryInfo(var1); return Result.OK(var2); @@ -513,7 +517,7 @@ public class OnlCgformApiController { } @PostMapping({"/doDbSynch/{code}/{synMethod}"}) - public Result h(@PathVariable("code") String var1, @PathVariable("synMethod") String var2) { + public Result h(@PathVariable("code") String var1, @PathVariable("synMethod") String var2) { try { long var3 = System.currentTimeMillis(); this.onlCgformHeadService.doDbSynch(var1, var2); @@ -530,39 +534,36 @@ public class OnlCgformApiController { @PermissionData @GetMapping({"/exportXls/{code}"}) public void a(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) { - OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + OnlCgformHead var4 = this.onlCgformHeadService.getById(var1); if (var4 != null) { String var5 = var4.getTableTxt(); String var6 = var2.getParameter("paramsStr"); - Object var7 = new HashMap(); - Object var8 = null; + Object var7 = new HashMap<>(); if (oConvertUtils.isNotEmpty(var6)) { - var7 = (Map)JSONObject.parseObject(var6, Map.class); + var7 = JSON.parseObject(var6, Map.class); } ((Map)var7).put("pageSize", -521); Map var9 = this.onlCgformFieldService.queryAutolistPage(var4.getTableName(), var4.getId(), (Map)var7, (List)null); List fieldList = (List)var9.get("fieldList"); List> records = (List)var9.get("records"); - List var12 = new ArrayList(); + List var12 = new ArrayList<>(); String var13 = ((Map)var7).get("selections") == null ? null : ((Map)var7).get("selections").toString(); - if (oConvertUtils.isNotEmpty(var13)) { - final List var14 = Arrays.asList(var13.split(",")); - var12 = records.stream().filter((var1x) -> { - return var14.contains(var1x.get("id")); - }).collect(Collectors.toList()); + if (var13 != null && !StringUtils.isEmpty(var13)) { + final List var14 = Arrays.asList(var13.split(",")); + var12 = records.stream().filter(var1x -> var14.contains(var1x.get("id"))).collect(Collectors.toList()); } else { if (records == null) { - records = new ArrayList(); + records = new ArrayList<>(); } var12.addAll(records); } - ConvertUtil.a(1, (List)var12, fieldList); + ConvertUtil.a(1,var12, fieldList); try { - this.onlCgformHeadService.executeEnhanceExport(var4, (List)var12); + this.onlCgformHeadService.executeEnhanceExport(var4, var12); } catch (BusinessException var31) { log.error("导出java增强处理出错", var31.getMessage()); } @@ -577,12 +578,12 @@ public class OnlCgformApiController { for(int var19 = 0; var19 < var18; ++var19) { String var20 = var17[var19]; - this.a(var20, (Map)var7, (List)var12, var14); + this.a(var20, (Map)var7, var12, var14); } } } - Workbook var33 = ExcelExportUtil.exportExcel(new ExportParams((String)null, var5), var14, (Collection)var12); + Workbook var33 = ExcelExportUtil.exportExcel(new ExportParams(null, var5), var14, var12); ServletOutputStream var34 = null; try { @@ -592,7 +593,7 @@ public class OnlCgformApiController { if ("MSIE".equalsIgnoreCase(var35.substring(0, 4))) { var3.setHeader("content-disposition", "attachment;filename=" + URLEncoder.encode(var36, "UTF-8") + ".xls"); } else { - String var37 = new String(var36.getBytes("UTF-8"), "ISO8859-1"); + String var37 = new String(var36.getBytes(StandardCharsets.UTF_8), StandardCharsets.ISO_8859_1); var3.setHeader("content-disposition", "attachment;filename=" + var37 + ".xls"); } @@ -617,13 +618,13 @@ public class OnlCgformApiController { @OnlineAuth("importXls") @PostMapping({"/importXls/{code}"}) - public Result b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) { + public Result b(@PathVariable("code") String var1, HttpServletRequest var2, HttpServletResponse var3) { long var4 = System.currentTimeMillis(); Result var6 = new Result(); String var7 = ""; try { - OnlCgformHead var8 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + OnlCgformHead var8 = this.onlCgformHeadService.getById(var1); if (var8 == null) { return Result.error("数据库不存在该表记录"); } @@ -639,11 +640,11 @@ public class OnlCgformApiController { for(int var15 = 0; var15 < var14; ++var15) { String var16 = var13[var15]; - OnlCgformHead var17 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var16)); + OnlCgformHead var17 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var16)); if (var17 != null) { - List var18 = this.onlCgformFieldService.list((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformField::getCgformHeadId, var17.getId())); + List var18 = this.onlCgformFieldService.list(new LambdaQueryWrapper().eq(OnlCgformField::getCgformHeadId, var17.getId())); List var19 = CgformUtil.b(var18, var17.getTableTxt()); - if (var19.size() > 0) { + if (!var19.isEmpty()) { var12.addAll(var19); } } @@ -653,12 +654,12 @@ public class OnlCgformApiController { JSONObject var47 = null; String var48 = var2.getParameter("foreignKeys"); if (oConvertUtils.isNotEmpty(var48)) { - var47 = JSONObject.parseObject(var48); + var47 = JSON.parseObject(var48); } MultipartHttpServletRequest var49 = (MultipartHttpServletRequest)var2; Map var50 = var49.getFileMap(); - DataSource var51 = (DataSource)SpringContextUtils.getApplicationContext().getBean(DataSource.class); + DataSource var51 = SpringContextUtils.getApplicationContext().getBean(DataSource.class); String var52 = DbTableUtil.a(var51); Iterator var53 = var50.entrySet().iterator(); @@ -686,12 +687,12 @@ public class OnlCgformApiController { while(var31.hasNext()) { var32 = (String)var31.next(); if (var32.indexOf("$subTable$") == -1) { - if (var32.indexOf("$mainTable$") != -1 && oConvertUtils.isNotEmpty(var27.get(var32).toString())) { + if (var32.indexOf(MAIN_TABLE) != -1 && oConvertUtils.isNotEmpty(var27.get(var32).toString())) { var28 = true; var24 = this.a(var8, var51, var52); } - var30.put(var32.replace("$mainTable$", ""), var27.get(var32)); + var30.put(var32.replace(MAIN_TABLE, ""), var27.get(var32)); } } @@ -706,13 +707,13 @@ public class OnlCgformApiController { while(var31.hasNext()) { var32 = (String)var31.next(); - System.out.println(var32 + "=" + var47.getString(var32)); + log.info(var32 + "=" + var47.getString(var32)); var30.put(var32, var47.getString(var32)); } } } - if (var25 == null || var25.size() == 0) { + if (var25.isEmpty()) { var6.setSuccess(false); var6.setMessage("导入失败，匹配的数据条数为零!"); return var6; @@ -725,9 +726,9 @@ public class OnlCgformApiController { for(int var56 = 0; var56 < var55; ++var56) { String var57 = var54[var56]; - OnlCgformHead var58 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var57)); + OnlCgformHead var58 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var57)); if (var58 != null) { - LambdaQueryWrapper var59 = new LambdaQueryWrapper(); + LambdaQueryWrapper var59 = new LambdaQueryWrapper<>(); var59.eq(OnlCgformField::getCgformHeadId, var58.getId()); List var60 = this.onlCgformFieldService.list(var59); ArrayList var33 = new ArrayList(); @@ -747,7 +748,7 @@ public class OnlCgformApiController { boolean var43 = var8.getTableName().equals(var41) && oConvertUtils.isNotEmpty(var42); String var44 = var34 + "_" + var40.getDbFieldTxt(); if (var43) { - var38.put(var40.getDbFieldName(), var36.get("$mainTable$" + var42)); + var38.put(var40.getDbFieldName(), var36.get(MAIN_TABLE + var42)); } Object var45 = var36.get("$subTable$" + var44); @@ -763,7 +764,7 @@ public class OnlCgformApiController { } } - if (var33.size() > 0) { + if (!var33.isEmpty()) { this.onlCgformSqlService.saveBatchOnlineTable(var58, var60, var33); } } @@ -792,7 +793,7 @@ public class OnlCgformApiController { } @PostMapping({"/doButton"}) - public Result a(@RequestBody JSONObject var1) { + public Result a(@RequestBody JSONObject var1) { String var2 = var1.getString("formId"); String var3 = var1.getString("dataId"); String var4 = var1.getString("buttonCode"); @@ -909,20 +910,21 @@ public class OnlCgformApiController { ArrayList var3 = new ArrayList(); for(int var4 = 0; var4 < var1.size(); ++var4) { - if ((null == var2 || !var2.equals(((OnlCgformField)var1.get(var4)).getDbFieldName())) && ((OnlCgformField)var1.get(var4)).getIsShowList() == 1) { - String var5 = ((OnlCgformField)var1.get(var4)).getDbFieldName(); - ExcelExportEntity var6 = new ExcelExportEntity(((OnlCgformField)var1.get(var4)).getDbFieldTxt(), var5); - if ("image".equals(((OnlCgformField)var1.get(var4)).getFieldShowType())) { + if ((null == var2 || !var2.equals(var1.get(var4).getDbFieldName())) && var1.get(var4).getIsShowList() == 1) { + String var5 = var1.get(var4).getDbFieldName(); + ExcelExportEntity var6 = new ExcelExportEntity(var1.get(var4).getDbFieldTxt(), var5); + if ("image".equals(var1.get(var4).getFieldShowType())) { var6.setType(2); var6.setExportImageType(3); var6.setImageBasePath(this.upLoadPath); var6.setHeight(50.0D); var6.setWidth(60.0D); } else { - int var7 = ((OnlCgformField)var1.get(var4)).getDbLength() == 0 ? 12 : (((OnlCgformField)var1.get(var4)).getDbLength() > 30 ? 30 : ((OnlCgformField)var1.get(var4)).getDbLength()); - if (((OnlCgformField)var1.get(var4)).getFieldShowType().equals("date")) { + int s = var1.get(var4).getDbLength() > 30 ? 30 : (var1.get(var4)).getDbLength(); + int var7 = var1.get(var4).getDbLength() == 0 ? 12 : s; + if (var1.get(var4).getFieldShowType().equals("date")) { var6.setFormat("yyyy-MM-dd"); - } else if (((OnlCgformField)var1.get(var4)).getFieldShowType().equals("datetime")) { + } else if (var1.get(var4).getFieldShowType().equals("datetime")) { var6.setFormat("yyyy-MM-dd HH:mm:ss"); } @@ -930,7 +932,7 @@ public class OnlCgformApiController { var7 = 10; } - var6.setWidth((double)var7); + var6.setWidth(var7); } var3.add(var6); @@ -941,17 +943,15 @@ public class OnlCgformApiController { } private void a(String var1, Map var2, List> var3, List var4) { - OnlCgformHead var5 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var1)); - LambdaQueryWrapper var6 = new LambdaQueryWrapper(); + OnlCgformHead var5 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var1)); + LambdaQueryWrapper var6 = new LambdaQueryWrapper<>(); var6.eq(OnlCgformField::getCgformHeadId, var5.getId()); var6.orderByAsc(OnlCgformField::getOrderNum); - List var7 = this.onlCgformFieldService.list(var6); + List var7 = this.onlCgformFieldService.list(var6); String var8 = ""; String var9 = ""; - Iterator var10 = var7.iterator(); - while(var10.hasNext()) { - OnlCgformField var11 = (OnlCgformField)var10.next(); + for (OnlCgformField var11 : var7) { if (oConvertUtils.isNotEmpty(var11.getMainField())) { var8 = var11.getMainField(); var9 = var11.getDbFieldName(); @@ -964,30 +964,30 @@ public class OnlCgformApiController { var4.add(var14); for(int var15 = 0; var15 < var3.size(); ++var15) { - var2.put(var9, ((Map)var3.get(var15)).get(var8)); + var2.put(var9, (var3.get(var15)).get(var8)); String var12 = CgformUtil.a(var5.getTableName(), var7, var2); log.info("-----------动态列表查询子表sql》》" + var12); List var13 = this.onlCgformHeadService.queryListData(var12); ConvertUtil.a(1, var13, var7); - ((Map)var3.get(var15)).put(var1, CgformUtil.d(var13)); + (var3.get(var15)).put(var1, CgformUtil.d(var13)); } } @GetMapping({"/checkOnlyTable"}) - public Result i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) { + public Result i(@RequestParam("tbname") String var1, @RequestParam("id") String var2) { OnlCgformHead var3; if (oConvertUtils.isEmpty(var2)) { - if (DbTableUtil.a(var1)) { + if (Boolean.TRUE.equals(DbTableUtil.a(var1))) { return Result.OK(-1); } - var3 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var1)); + var3 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var1)); if (oConvertUtils.isNotEmpty(var3)) { return Result.OK(-1); } } else { - var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var2); + var3 = this.onlCgformHeadService.getById(var2); if (!var1.equals(var3.getTableName()) && DbTableUtil.a(var1)) { return Result.OK(-1); } @@ -999,12 +999,12 @@ public class OnlCgformApiController { * 生成代码 * @date 2021/4/6 11:41 * @param jsonObject 参数 - * @return com.jero.common.api.vo.Result + * @return com.jero.common.api.vo.Result */ @PostMapping({"/codeGenerate"}) - public Result codeGenerate(@RequestBody JSONObject jsonObject) { - OnlGenerateModel onlGenerateModel = (OnlGenerateModel)JSONObject.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class); - List list = null; + public Result codeGenerate(@RequestBody JSONObject jsonObject) { + OnlGenerateModel onlGenerateModel = JSON.parseObject(jsonObject.toJSONString(), OnlGenerateModel.class); + List list; try { if ("1".equals(onlGenerateModel.getJformType())) { @@ -1022,66 +1022,43 @@ public class OnlCgformApiController { @GetMapping({"/downGenerateCode"}) public void a(@RequestParam("fileList") List var1, HttpServletRequest var2, HttpServletResponse var3) { - List var4 = (List)var1.stream().filter((var0) -> { - return var0.indexOf("src/main/java") == -1 && var0.indexOf("src%5Cmain%5Cjava") == -1; - }).collect(Collectors.toList()); - if (var1 != null && (var4 == null || var4.size() <= 0)) { + List var4 = var1.stream().filter((var0) -> !var0.contains("src/main/java") && !var0.contains("src%5Cmain%5Cjava")).collect(Collectors.toList()); + if (var4.isEmpty()) { String var5 = "生成代码_" + System.currentTimeMillis() + ".zip"; final String var6 = "/opt/temp/codegenerate/" + var5; File var7 = GenerateCodeFileToZip.a(var1, var6); - if (var7.exists()) { + if (!Objects.isNull(var7) && var7.exists()) { var3.setContentType("application/force-download"); var3.addHeader("Content-Disposition", "attachment;fileName=" + var5); byte[] var8 = new byte[1024]; - FileInputStream var9 = null; - BufferedInputStream var10 = null; - - try { - var9 = new FileInputStream(var7); - var10 = new BufferedInputStream(var9); - ServletOutputStream var11 = var3.getOutputStream(); + try (FileInputStream var9 = new FileInputStream(var7); + BufferedInputStream var10 = new BufferedInputStream(var9); + ServletOutputStream var11 = var3.getOutputStream();){ for(int var12 = var10.read(var8); var12 != -1; var12 = var10.read(var8)) { var11.write(var8, 0, var12); } } catch (Exception var25) { var25.printStackTrace(); } finally { - if (var10 != null) { - try { - var10.close(); - } catch (IOException var24) { - var24.printStackTrace(); - } - } - - if (var9 != null) { - try { - var9.close(); - } catch (IOException var23) { - var23.printStackTrace(); - } - } - class NamelessClass_1 extends Thread { NamelessClass_1() { } + @Override public void run() { try { Thread.sleep(10000L); FileUtil.del(var6); } catch (InterruptedException var2) { var2.printStackTrace(); + Thread.currentThread().interrupt(); } - } } - (new NamelessClass_1()).start(); } } - } else { log.error(" fileList 不合法！！！", var1); } @@ -1095,23 +1072,17 @@ public class OnlCgformApiController { @GetMapping({"/getTreeData/{code}"}) @PermissionData public Result> d(@PathVariable("code") String var1, HttpServletRequest var2) { - Result var3 = new Result(); - OnlCgformHead var4 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + Result var3 = new Result<>(); + OnlCgformHead var4 = this.onlCgformHeadService.getById(var1); if (var4 == null) { - var3.error("实体不存在"); - return var3; + return Result.error(EN_IS_NULL); } else { try { String var5 = var4.getTableName(); String var6 = var4.getTreeIdField(); String var7 = var4.getTreeParentIdField(); - ArrayList var8 = Lists.newArrayList(new String[]{var6, var7}); + ArrayList var8 = Lists.newArrayList(var6, var7); Map var9 = CgformUtil.a(var2); - String var10 = null; - if (var9.get(var6) != null) { - var10 = var9.get(var6).toString(); - } - if (var9.get("hasQuery") != null && "false".equals(var9.get("hasQuery")) && var9.get(var7) == null) { var9.put(var7, "0"); } else { @@ -1119,13 +1090,13 @@ public class OnlCgformApiController { var9.put(var7, var9.get(var7)); } - var9.put(var6, (Object)null); + var9.put(var6, null); Map var11 = this.onlCgformFieldService.queryAutoTreeNoPage(var5, var1, var9, var8, var7); this.a(var4, var11); var3.setResult(var11); } catch (Exception var12) { log.error(var12.getMessage(), var12); - var3.error("数据库查询失败" + var12.getMessage()); + return Result.error("数据库查询失败" + var12.getMessage()); } var3.setOnlTable(var4.getTableName()); @@ -1139,9 +1110,8 @@ public class OnlCgformApiController { } @PostMapping({"/crazyForm/{name}"}) - public Result b(@PathVariable("name") String var1, @RequestBody JSONObject var2) { - Result var3 = new Result(); - + public Result b(@PathVariable("name") String var1, @RequestBody JSONObject var2) { + Result var3 = new Result<>(); try { String var4 = CgformUtil.a(); var2.put("id", var4); @@ -1156,7 +1126,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"); @@ -1178,31 +1148,30 @@ public class OnlCgformApiController { ) @GetMapping({"/getErpColumns/{code}"}) public Result> c(@PathVariable("code") String var1) { - Result var2 = new Result(); - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + Result var2 = new Result<>(); + OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { - var2.error("实体不存在"); - return var2; + return Result.error(EN_IS_NULL); } else { - HashMap var4 = new HashMap(); + HashMap var4 = new HashMap<>(); OnlComplexModel var5 = this.onlineService.queryOnlineConfig(var3); var4.put("main", var5); 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; for(int var10 = 0; var10 < var9; ++var10) { String var11 = var8[var10]; - OnlCgformHead var12 = (OnlCgformHead)this.onlCgformHeadService.getOne((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var11)); + OnlCgformHead var12 = this.onlCgformHeadService.getOne(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var11)); if (var12 != null) { var7.add(this.onlineService.queryOnlineConfig(var12)); } } - if (var7.size() > 0) { + if (!var7.isEmpty()) { var4.put("subList", var7); } } @@ -1221,13 +1190,13 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @GetMapping({"/getErpFormItem/{code}"}) - public Result e(@PathVariable("code") String var1, HttpServletRequest var2) { - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + public Result e(@PathVariable("code") String var1, HttpServletRequest var2) { + OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { - Result.error("表不存在"); + return Result.error("表不存在"); } - Result var4 = new Result(); + Result var4 = new Result<>(); JSONObject var5 = this.onlineService.queryOnlineFormObj(var3); var4.setResult(var5); var4.setOnlTable(var3.getTableName()); @@ -1236,8 +1205,8 @@ public class OnlCgformApiController { @GetMapping({"/querySelectOptions"}) public Result> a(@ModelAttribute LinkDown var1) { - Result var2 = new Result(); - List var3 = this.onlCgformFieldService.queryDataListByLinkDown(var1); + Result var2 = new Result<>(); + List var3 = this.onlCgformFieldService.queryDataListByLinkDown(var1); var2.setResult(var3); var2.setSuccess(true); return var2;