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 b1ac78dd..7a375f0c 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 @@ -2,47 +2,38 @@ package com.jero.generater.modules.online.cgform.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.sql.SQLException; -import java.util.*; -import javax.servlet.http.HttpServletRequest; - +import com.jero.codegenerate.database.DbReadTableUtil; import com.jero.codegenerate.properties.CodeConfigProperties; -import com.jero.generater.modules.online.cgform.entity.*; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; -import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; 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.*; 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; import com.jero.generater.modules.online.cgform.util.CgformUtil; import com.jero.generater.modules.online.config.exception.DBException; -import com.jero.codegenerate.database.DbReadTableUtil; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; +import org.apache.poi.ss.formula.functions.T; +import org.apache.shiro.authz.annotation.RequiresRoles; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; import org.springframework.core.io.ResourceLoader; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletRequest; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.sql.SQLException; +import java.util.*; @RestController("onlCgformHeadController") @RequestMapping({"/online/cgform/head"}) @@ -55,10 +46,12 @@ public class OnlCgformHeadController { private IOnlCgformFieldService onlCgformFieldService; @Autowired private IOnlCgformEnhanceService onlCgformEnhanceService; - private static List b = null; + + private List b = null; @Autowired ResourceLoader resourceLoader; - private static String c; + + private String c; private static final String OP_SUCCESS = "操作成功!"; private static final String EN_IS_NULL = "未找到对应实体"; @@ -108,7 +101,7 @@ public class OnlCgformHeadController { } @PostMapping({"/delete"}) - public Result delete(@RequestBody Map map) { + public Result delete(@RequestBody Map map) { String id = map.get("id"); if (id == null || "".equals(id.trim())) { return Result.error(PARAM_ERROR); @@ -123,7 +116,7 @@ public class OnlCgformHeadController { } @PostMapping({"/removeRecord"}) - public Result removeRecord(@RequestBody Map map) { + public Result removeRecord(@RequestBody Map map) { String id = map.get("id"); if (id == null || "".equals(id.trim())) { return Result.error(PARAM_ERROR); @@ -164,7 +157,7 @@ public class OnlCgformHeadController { } @GetMapping({"/queryByTableNames"}) - public Result queryByTableNames(@RequestParam(name = "tableNames", required = true) String var1) { + public Result> queryByTableNames(@RequestParam(name = "tableNames", required = true) String var1) { LambdaQueryWrapper var2 = new LambdaQueryWrapper<>(); String[] var3 = var1.split(","); var2.in(OnlCgformHead::getTableName, Arrays.asList(var3)); @@ -173,7 +166,7 @@ public class OnlCgformHeadController { } @PostMapping({"/addEnhanceJs/{code}"}) - public Result addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { + public Result addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { try { var2.setCgformHeadId(var1); this.onlCgformHeadService.saveEnhance(var2); @@ -185,7 +178,7 @@ public class OnlCgformHeadController { } @GetMapping({"/enhanceJs/{code}"}) - public Result getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) { + public Result getEnhanceJs(@PathVariable("code") String var1, HttpServletRequest var2) { try { String var3 = var2.getParameter("type"); OnlCgformEnhanceJs var4 = this.onlCgformHeadService.queryEnhance(var1, var3); @@ -197,7 +190,7 @@ public class OnlCgformHeadController { } @PostMapping({"/enhanceJs/{code}"}) - public Result editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { + public Result editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { try { var2.setCgformHeadId(var1); this.onlCgformHeadService.editEnhance(var2); @@ -209,7 +202,7 @@ public class OnlCgformHeadController { } @GetMapping({"/enhanceButton/{formId}"}) - public Result getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) { + public Result> getEnhanceButton(@PathVariable("formId") String var1, HttpServletRequest var2) { try { List var3 = this.onlCgformHeadService.queryButtonList(var1); return var3 != null && !var3.isEmpty() ? Result.OK(var3) : Result.error("查询为空"); @@ -220,14 +213,14 @@ public class OnlCgformHeadController { } @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); return Result.OK(var3); } @RequiresRoles({"admin"}) @PostMapping({"/addEnhanceSql/{formId}"}) - public Result addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { + public Result addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { try { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { @@ -244,7 +237,7 @@ public class OnlCgformHeadController { @RequiresRoles({"admin"}) @PostMapping({"/enhanceSql/{formId}"}) - public Result editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { + public Result editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { try { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { @@ -260,7 +253,7 @@ public class OnlCgformHeadController { } @PostMapping({"/enhanceSql"}) - public Result deletenhanceSql(@RequestBody Map map) { + public Result deletenhanceSql(@RequestBody Map map) { String var1 = map.get("id"); if (StringUtils.isBlank(var1)) { return Result.error(PARAM_ERROR); @@ -275,7 +268,7 @@ public class OnlCgformHeadController { } @PostMapping({"/deletebatchEnhanceSql"}) - public Result deletebatchEnhanceSql(@RequestBody Map map) { + public Result deletebatchEnhanceSql(@RequestBody Map map) { String var1 = map.get("ids"); if (StringUtils.isBlank(var1)) { return Result.error(PARAM_ERROR); @@ -291,13 +284,13 @@ public class OnlCgformHeadController { } @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); return Result.OK(var3); } @PostMapping({"/addEnhanceJava/{formId}"}) - public Result addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) { + public Result addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) { try { if (!CgformUtil.a(var2)) { return Result.error("类实例化失败，请检查!"); @@ -317,7 +310,7 @@ public class OnlCgformHeadController { } @PostMapping({"/enhanceJava/{formId}"}) - public Result c(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) { + public Result c(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) { try { if (!CgformUtil.a(var2)) { return Result.error("类实例化失败，请检查!"); @@ -337,7 +330,7 @@ public class OnlCgformHeadController { } @PostMapping({"/enhanceJava"}) - public Result g(@RequestBody Map map) { + public Result g(@RequestBody Map map) { String var1 = map.get("id"); if (StringUtils.isBlank(var1)) { return Result.error(PARAM_ERROR); @@ -352,7 +345,7 @@ public class OnlCgformHeadController { } @PostMapping({"/deleteBatchEnhanceJava"}) - public Result h(@RequestBody Map map) { + public Result h(@RequestBody Map map) { String var1 = map.get("ids"); if (StringUtils.isBlank(var1)) { return Result.error(PARAM_ERROR); @@ -368,7 +361,7 @@ public class OnlCgformHeadController { } @GetMapping({"/queryTables"}) - public Result a(@RequestParam(name = "tableName", required = false) String var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) { + public Result>> a(@RequestParam(name = "tableName", required = false) String var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) { String var5 = JwtUtil.getUserNameByToken(var4); if (!"admin".equals(var5)) { return Result.error("noadminauth"); @@ -388,11 +381,11 @@ public class OnlCgformHeadController { List var7 = this.onlCgformHeadService.queryOnlinetables(); this.b(); var6.removeAll(var7); - ArrayList var8 = new ArrayList<>(); + ArrayList> var8 = new ArrayList<>(); for (String var10 : var6) { if (!this.l(var10)) { - HashMap var11 = new HashMap<>(); + HashMap var11 = new HashMap<>(); var11.put("id", var10); var8.add(var11); } @@ -404,7 +397,7 @@ public class OnlCgformHeadController { @PostMapping({"/transTables/{tbnames}"}) @RequiresRoles({"admin"}) - public Result d(@PathVariable("tbnames") String var1, HttpServletRequest var2) { + public Result d(@PathVariable("tbnames") String var1, HttpServletRequest var2) { String var3 = JwtUtil.getUserNameByToken(var2); if (!"admin".equals(var3)) { return Result.error("noadminauth"); @@ -439,7 +432,7 @@ public class OnlCgformHeadController { * @date 2021/4/6 11:20 */ @GetMapping({"/rootFile"}) - public Result rootFile() { + public Result rootFile() { JSONArray jsonArray = new JSONArray(); File[] files = File.listRoots(); int var4 = files.length; @@ -471,7 +464,7 @@ public class OnlCgformHeadController { * @date 2021/4/6 11:20 */ @GetMapping({"/fileTree"}) - public Result fileTree(@RequestParam(name = "parentPath", required = true) String parentPath) { + public Result fileTree(@RequestParam(name = "parentPath", required = true) String parentPath) { JSONArray jsonArray = new JSONArray(); File file = new File(parentPath); File[] files = file.listFiles(); @@ -497,44 +490,14 @@ public class OnlCgformHeadController { } @GetMapping({"/tableInfo"}) - public Result tableInfo(@RequestParam(name = "code", required = true) String code) { + public Result> tableInfo(@RequestParam(name = "code", required = true) String code) { OnlCgformHead onlCgformHead = this.onlCgformHeadService.getById(code); 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<>(); - String[] subTableArray = subTableStr.split(","); - int length = subTableArray.length; - - for (int i = 0; i < length; ++i) { - String subTable = subTableArray[i]; - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable); - OnlCgformHead onlCgformHead1 = this.onlCgformHeadService.getOne(lambdaQueryWrapper); - list.add(onlCgformHead1); - } - - 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); - } - } + getTableType(onlCgformHead, map); Integer tableType = onlCgformHead.getTableType(); if ("Y".equals(onlCgformHead.getIsTree())) { @@ -548,8 +511,42 @@ public class OnlCgformHeadController { } } + private void getTableType(OnlCgformHead onlCgformHead, HashMap map) { + if (onlCgformHead.getTableType() == 2) { + String subTableStr = onlCgformHead.getSubTableStr(); + if (oConvertUtils.isNotEmpty(subTableStr)) { + ArrayList list = new ArrayList<>(); + String[] subTableArray = subTableStr.split(","); + int length = subTableArray.length; + + for (int i = 0; i < length; ++i) { + String subTable = subTableArray[i]; + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable); + OnlCgformHead onlCgformHead1 = this.onlCgformHeadService.getOne(lambdaQueryWrapper); + list.add(onlCgformHead1); + } + + 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); + } + } + } + @PostMapping({"/copyOnline"}) - public Result k(@RequestParam(name = "code", required = true) String var1) { + public Result k(@RequestParam(name = "code", required = true) String var1) { try { OnlCgformHead var2 = this.onlCgformHeadService.getById(var1); if (var2 == null) { @@ -565,7 +562,7 @@ public class OnlCgformHeadController { } private boolean l(String var1) { - Iterator var2 = b.iterator(); + Iterator var2 = b.iterator(); String var3; do { @@ -573,7 +570,7 @@ public class OnlCgformHeadController { return false; } - var3 = (String) var2.next(); + var3 = var2.next(); } while (!var1.startsWith(var3) && !var1.startsWith(var3.toUpperCase())); return true;