From 5238616e92d6239d3a800450c8ccc5c602bdf6f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Mon, 13 Mar 2023 14:51:46 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91OnlCgformHeadContr?= =?UTF-8?q?oller=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/OnlCgformHeadController.java | 120 +++++++++--------- 1 file changed, 62 insertions(+), 58 deletions(-) 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 b3796d1e..9c69d2ef 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 @@ -67,14 +67,18 @@ public class OnlCgformHeadController { ResourceLoader resourceLoader; private static String c; - public OnlCgformHeadController() { - } + private static final String OP_SUCCESS = "操作成功!"; + private static final String EN_IS_NULL = "未找到对应实体"; + private static final String SAVE_ERROR = "保存失败!"; + private static final String DEL_ERROR = "删除失败!"; + + @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((long)var2, (long)var3); + 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()); @@ -89,7 +93,7 @@ public class OnlCgformHeadController { public Result add(@RequestBody OnlCgformHead var1) { try { this.onlCgformHeadService.save(var1); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } catch (Exception var4) { log.error(var4.getMessage(), var4); return Result.error("操作失败"); @@ -98,20 +102,20 @@ public class OnlCgformHeadController { @PutMapping({"/edit"}) public Result edit(@RequestBody OnlCgformHead var1) { - OnlCgformHead var3 = (OnlCgformHead)this.onlCgformHeadService.getById(var1.getId()); + OnlCgformHead var3 = this.onlCgformHeadService.getById(var1.getId()); if (var3 == null) { - return Result.error("未找到对应实体"); + return Result.error(EN_IS_NULL); } else { boolean var4 = this.onlCgformHeadService.updateById(var1); if (var4) { - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } } return Result.OK(); } @DeleteMapping({"/delete"}) - public Result delete(@RequestParam(name = "id",required = true) String id) { + public Result delete(@RequestParam(name = "id",required = true) String id) { try { this.onlCgformHeadService.deleteRecordAndTable(id); } catch (DBException e) { @@ -124,7 +128,7 @@ public class OnlCgformHeadController { } @DeleteMapping({"/removeRecord"}) - public Result removeRecord(@RequestParam(name = "id",required = true) String id) { + public Result removeRecord(@RequestParam(name = "id",required = true) String id) { try { this.onlCgformHeadService.deleteRecord(id); } catch (DBException e) { @@ -148,9 +152,9 @@ public class OnlCgformHeadController { @GetMapping({"/queryById"}) public Result queryById(@RequestParam(name = "id",required = true) String id) { - OnlCgformHead cgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(id); + OnlCgformHead cgformHead = this.onlCgformHeadService.getById(id); if (cgformHead == null) { - return Result.error("未找到对应实体"); + return Result.error(EN_IS_NULL); } else { return Result.OK(cgformHead); } @@ -158,28 +162,28 @@ 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)); List var4 = this.onlCgformHeadService.list(var2); - return var4 == null ? Result.error("未找到对应实体") : Result.OK(var4); + return var4 == null ? Result.error(EN_IS_NULL) : Result.OK(var4); } @PostMapping({"/enhanceJs/{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); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error("保存失败!"); + return Result.error(SAVE_ERROR); } } @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); @@ -191,22 +195,22 @@ public class OnlCgformHeadController { } @PutMapping({"/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); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error("保存失败!"); + return Result.error(SAVE_ERROR); } } @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.size() != 0 ? Result.OK(var3) : Result.error("查询为空"); + return var3 != null && !var3.isEmpty() ? Result.OK(var3) : Result.error("查询为空"); } catch (Exception var4) { log.error(var4.getMessage(), var4); return Result.error("查询失败!"); @@ -214,76 +218,76 @@ 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({"/enhanceSql/{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)) { this.onlCgformEnhanceService.saveEnhanceSql(var2); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } else { return Result.error("保存失败,该按钮已存在增强配置!"); } } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error("保存失败!"); + return Result.error(SAVE_ERROR); } } @RequiresRoles({"admin"}) @PutMapping({"/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)) { this.onlCgformEnhanceService.updateEnhanceSql(var2); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } else { return Result.error("保存失败,该按钮已存在增强配置!"); } } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error("保存失败!"); + return Result.error(SAVE_ERROR); } } @DeleteMapping({"/enhanceSql"}) - public Result deletenhanceSql(@RequestParam(name = "id",required = true) String var1) { + public Result deletenhanceSql(@RequestParam(name = "id",required = true) String var1) { try { this.onlCgformEnhanceService.deleteEnhanceSql(var1); return Result.OK("删除成功"); } catch (Exception var3) { log.error(var3.getMessage(), var3); - return Result.error("删除失败!"); + return Result.error(DEL_ERROR); } } @DeleteMapping({"/deletebatchEnhanceSql"}) - public Result deletebatchEnhanceSql(@RequestParam(name = "ids",required = true) String var1) { + public Result deletebatchEnhanceSql(@RequestParam(name = "ids",required = true) String var1) { try { List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2); return Result.OK("删除成功"); } catch (Exception var3) { log.error(var3.getMessage(), var3); - return Result.error("删除失败!"); + return Result.error(DEL_ERROR); } } @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({"/enhanceJava/{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("类实例化失败，请检查!"); @@ -291,19 +295,19 @@ public class OnlCgformHeadController { var2.setCgformHeadId(formId); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.saveEnhanceJava(var2); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } else { return Result.error("保存失败,配置重复了!"); } } } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error("保存失败!"); + return Result.error(SAVE_ERROR); } } @PutMapping({"/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("类实例化失败，请检查!"); @@ -311,42 +315,42 @@ public class OnlCgformHeadController { var2.setCgformHeadId(var1); if (this.onlCgformEnhanceService.checkOnlyEnhance(var2)) { this.onlCgformEnhanceService.updateEnhanceJava(var2); - return Result.OK("操作成功!"); + return Result.OK(OP_SUCCESS); } else { return Result.error("保存失败,配置重复了!"); } } } catch (Exception var4) { log.error(var4.getMessage(), var4); - return Result.error("保存失败!"); + return Result.error(SAVE_ERROR); } } @DeleteMapping({"/enhanceJava"}) - public Result g(@RequestParam(name = "id",required = true) String var1) { + public Result g(@RequestParam(name = "id",required = true) String var1) { try { this.onlCgformEnhanceService.deleteEnhanceJava(var1); return Result.OK("删除成功"); } catch (Exception var3) { log.error(var3.getMessage(), var3); - return Result.error("删除失败!"); + return Result.error(DEL_ERROR); } } @DeleteMapping({"/deleteBatchEnhanceJava"}) - public Result h(@RequestParam(name = "ids",required = true) String var1) { + public Result h(@RequestParam(name = "ids",required = true) String var1) { try { List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2); return Result.OK("删除成功"); } catch (Exception var3) { log.error(var3.getMessage(), var3); - return Result.error("删除失败!"); + return Result.error(DEL_ERROR); } } @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"); @@ -384,7 +388,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"); @@ -398,7 +402,7 @@ public class OnlCgformHeadController { for(int var5 = 0; var5 < var4.length; ++var5) { if (oConvertUtils.isNotEmpty(var4[var5])) { - int var6 = this.onlCgformHeadService.count((Wrapper)(new LambdaQueryWrapper()).eq(OnlCgformHead::getTableName, var4[var5])); + int var6 = this.onlCgformHeadService.count(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var4[var5])); if (var6 <= 0) { log.info("[IP] [online数据库导入表] --表名：" + var4[var5]); this.onlCgformHeadService.saveDbTable2Online(var4[var5]); @@ -414,10 +418,10 @@ public class OnlCgformHeadController { * 获取磁盘根目录 * @date 2021/4/6 11:20 * @param - * @return com.jero.common.api.vo.Result + * @return com.jero.common.api.vo.Result */ @GetMapping({"/rootFile"}) - public Result rootFile() { + public Result rootFile() { JSONArray jsonArray = new JSONArray(); File[] files = File.listRoots(); int var4 = files.length; @@ -444,10 +448,10 @@ public class OnlCgformHeadController { * 获取磁盘文件树 * @date 2021/4/6 11:20 * @param parentPath - * @return com.jero.common.api.vo.Result + * @return com.jero.common.api.vo.Result */ @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(); @@ -473,10 +477,10 @@ public class OnlCgformHeadController { } @GetMapping({"/tableInfo"}) - public Result tableInfo(@RequestParam(name = "code",required = true) String code) { - OnlCgformHead onlCgformHead = (OnlCgformHead)this.onlCgformHeadService.getById(code); + public Result tableInfo(@RequestParam(name = "code",required = true) String code) { + OnlCgformHead onlCgformHead = this.onlCgformHeadService.getById(code); if (onlCgformHead == null) { - return Result.error("未找到对应实体"); + return Result.error(EN_IS_NULL); } else { HashMap map = new HashMap(); map.put("main", onlCgformHead); @@ -491,7 +495,7 @@ public class OnlCgformHeadController { String subTable = subTableArray[i]; LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable); - OnlCgformHead onlCgformHead1 = (OnlCgformHead)this.onlCgformHeadService.getOne(lambdaQueryWrapper); + OnlCgformHead onlCgformHead1 = this.onlCgformHeadService.getOne(lambdaQueryWrapper); list.add(onlCgformHead1); } @@ -528,11 +532,11 @@ public class OnlCgformHeadController { } @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 = (OnlCgformHead)this.onlCgformHeadService.getById(var1); + OnlCgformHead var2 = this.onlCgformHeadService.getById(var1); if (var2 == null) { - return Result.error("未找到对应实体"); + return Result.error(EN_IS_NULL); } this.onlCgformHeadService.copyOnlineTableConfig(var2);