KH/kh-device-admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】cgform文件夹

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