diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java index da0d936c..cb768b14 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/auth/controller/OnlCgformAuthController.java @@ -81,7 +81,7 @@ public class OnlCgformAuthController { } - @PostMapping({"/authData"}) + @PostMapping({"/editAuthData"}) public Result editAuthData(@RequestBody OnlAuthData paramOnlAuthData) { Result result = new Result<>(); this.onlAuthDataService.updateById(paramOnlAuthData); @@ -168,7 +168,7 @@ public class OnlCgformAuthController { LambdaQueryWrapper pageLambdaQueryWrapper = new LambdaQueryWrapper<>(); pageLambdaQueryWrapper.eq(OnlAuthPage::getCgformId, paramString).eq(OnlAuthPage::getType, 1); - List pageList = this.onlAuthPageService.list(pageLambdaQueryWrapper); + List pageList = this.onlAuthPageService.list(pageLambdaQueryWrapper); ArrayList arrayList = new ArrayList<>(); for (OnlCgformField onlCgformField : list) { @@ -215,7 +215,7 @@ public class OnlCgformAuthController { } - @PostMapping({"/authColumn"}) + @PostMapping({"/editAuthColumn"}) public Result editAuthColumn(@RequestBody AuthColumnVO paramAuthColumnVO) { try { if (paramAuthColumnVO.getStatus() == 1) { @@ -324,7 +324,7 @@ public class OnlCgformAuthController { Result> result = new Result<>(); LambdaQueryWrapper cgformFieldLambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(!Objects.isNull(onlCgformHead)){ + if (!Objects.isNull(onlCgformHead)) { cgformFieldLambdaQueryWrapper.eq(OnlCgformField::getCgformHeadId, onlCgformHead.getId()); } cgformFieldLambdaQueryWrapper.orderByAsc(OnlCgformField::getOrderNum); @@ -335,7 +335,7 @@ public class OnlCgformAuthController { ArrayList arrayList = new ArrayList<>(); for (OnlCgformField onlCgformField : list) { AuthColumnVO authColumnVO = new AuthColumnVO(onlCgformField); - if(!Objects.isNull(onlCgformHead)){ + if (!Objects.isNull(onlCgformHead)) { authColumnVO.setTableName(onlCgformHead.getTableName()); authColumnVO.setTableNameTxt(onlCgformHead.getTableTxt()); } 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 25404894..041b70ff 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 @@ -122,7 +122,7 @@ public class OnlCgformApiController { } } - @PutMapping({"/editAll"}) + @PostMapping({"/editAll"}) public Result b(@RequestBody OnlCgformModel var1) { try { return this.onlCgformHeadService.editAll(var1); @@ -402,7 +402,7 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @OnlineAuth("form") - @PutMapping({"/form/{code}"}) + @PostMapping({"/form/update/{code}"}) public Result a(@PathVariable("code") String var1, @RequestBody JSONObject var2) { try { String var3 = this.onlCgformHeadService.editManyFormData(var1, var2); @@ -421,7 +421,7 @@ public class OnlCgformApiController { module = ModuleType.ONLINE ) @OnlineAuth("form") - @DeleteMapping({"/form/{code}/{id}"}) + @PostMapping({"/form/{code}/{id}"}) public Result f(@PathVariable("code") String var1, @PathVariable("id") String var2) { OnlCgformHead var3 = this.onlCgformHeadService.getById(var1); if (var3 == null) { @@ -478,7 +478,7 @@ public class OnlCgformApiController { value = "online删除数据", module = ModuleType.ONLINE ) - @DeleteMapping({"/formByCode/{code}/{id}"}) + @PostMapping({"/formByCode/{code}/{id}"}) 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) { @@ -1119,7 +1119,7 @@ public class OnlCgformApiController { } } - @PutMapping({"/crazyForm/{name}"}) + @PostMapping({"/crazyForm/update/{name}"}) public Result c(@PathVariable("name") String var1, @RequestBody JSONObject var2) { try { var2.remove("create_by"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java index 202f83ce..ce70693a 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformButtonController.java @@ -8,12 +8,14 @@ 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.util.Arrays; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.generater.modules.online.cgform.entity.OnlCgformButton; import com.jero.generater.modules.online.cgform.service.IOnlCgformButtonService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; @@ -75,7 +77,7 @@ public class OnlCgformButtonController { } } - @PutMapping({"/edit"}) + @PostMapping({"/edit"}) public Result edit(@RequestBody OnlCgformButton cgformButton) { OnlCgformButton existCgformButton = this.onlCgformButtonService.getById(cgformButton.getId()); if (existCgformButton == null) { @@ -90,8 +92,12 @@ public class OnlCgformButtonController { return Result.OK(); } - @DeleteMapping({"/delete"}) - public Result delete(@RequestParam(name = "id",required = true) String id) { + @PostMapping({"/delete"}) + public Result delete(@RequestBody Map map) { + String id = map.get("id"); + if(StringUtils.isEmpty(id)){ + return Result.error("参数不识别!"); + } OnlCgformButton cgformButton = this.onlCgformButtonService.getById(id); if (cgformButton == null) { return Result.error(EN_IS_NULL); @@ -105,8 +111,9 @@ public class OnlCgformButtonController { return Result.OK(); } - @DeleteMapping({"/deleteBatch"}) - public Result deleteBatch(@RequestParam(name = "ids",required = true) String ids) { + @PostMapping({"/deleteBatch"}) + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if (ids != null && !"".equals(ids.trim())) { this.onlCgformButtonService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); 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 c5c33b6b..b1ac78dd 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 @@ -7,6 +7,7 @@ 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; @@ -17,6 +18,7 @@ import javax.servlet.http.HttpServletRequest; import com.jero.codegenerate.properties.CodeConfigProperties; import com.jero.generater.modules.online.cgform.entity.*; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.shiro.authz.annotation.RequiresRoles; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CgformEnum; @@ -62,11 +64,11 @@ public class OnlCgformHeadController { private static final String EN_IS_NULL = "未找到对应实体"; private static final String SAVE_ERROR = "保存失败!"; private static final String DEL_ERROR = "删除失败!"; - + private static final String PARAM_ERROR = "参数不识别!"; @GetMapping({"/list"}) - public Result> a(OnlCgformHead var1, @RequestParam(name = "pageNo",defaultValue = "1") Integer var2, @RequestParam(name = "pageSize",defaultValue = "10") Integer var3, HttpServletRequest var4) { + public Result> a(OnlCgformHead var1, @RequestParam(name = "pageNo", defaultValue = "1") Integer var2, @RequestParam(name = "pageSize", defaultValue = "10") Integer var3, HttpServletRequest var4) { Result> var5 = new Result<>(); QueryWrapper var6 = QueryGenerator.initQueryWrapper(var1, var4.getParameterMap()); Page var7 = new Page<>(var2, var3); @@ -91,7 +93,7 @@ public class OnlCgformHeadController { } } - @PutMapping({"/edit"}) + @PostMapping({"/edit"}) public Result edit(@RequestBody OnlCgformHead var1) { OnlCgformHead var3 = this.onlCgformHeadService.getById(var1.getId()); if (var3 == null) { @@ -105,8 +107,12 @@ public class OnlCgformHeadController { return Result.OK(); } - @DeleteMapping({"/delete"}) - public Result delete(@RequestParam(name = "id",required = true) String id) { + @PostMapping({"/delete"}) + public Result delete(@RequestBody Map map) { + String id = map.get("id"); + if (id == null || "".equals(id.trim())) { + return Result.error(PARAM_ERROR); + } try { this.onlCgformHeadService.deleteRecordAndTable(id); } catch (DBException | SQLException e) { @@ -116,8 +122,12 @@ public class OnlCgformHeadController { return Result.OK("删除成功!"); } - @DeleteMapping({"/removeRecord"}) - public Result removeRecord(@RequestParam(name = "id",required = true) String id) { + @PostMapping({"/removeRecord"}) + public Result removeRecord(@RequestBody Map map) { + String id = map.get("id"); + if (id == null || "".equals(id.trim())) { + return Result.error(PARAM_ERROR); + } try { this.onlCgformHeadService.deleteRecord(id); } catch (DBException | SQLException e) { @@ -127,18 +137,23 @@ public class OnlCgformHeadController { return Result.OK("移除成功!"); } - @DeleteMapping({"/deleteBatch"}) - public Result deleteBatch(@RequestParam(name = "ids",required = true) String var1, @RequestParam(name = "flag") String var2) { + @PostMapping({"/deleteBatch"}) + public Result deleteBatch(@RequestBody Map map) { + String var1 = map.get("ids"); + String var2 = map.get("flag"); + if (var2 == null || "".equals(var2.trim())) { + return Result.error(PARAM_ERROR); + } if (var1 != null && !"".equals(var1.trim())) { this.onlCgformHeadService.deleteBatch(var1, var2); return Result.OK("删除成功!"); } else { - return Result.error("参数不识别!"); + return Result.error(PARAM_ERROR); } } @GetMapping({"/queryById"}) - public Result queryById(@RequestParam(name = "id",required = true) String id) { + public Result queryById(@RequestParam(name = "id", required = true) String id) { OnlCgformHead cgformHead = this.onlCgformHeadService.getById(id); if (cgformHead == null) { return Result.error(EN_IS_NULL); @@ -149,7 +164,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)); @@ -157,7 +172,7 @@ public class OnlCgformHeadController { return var4 == null ? Result.error(EN_IS_NULL) : Result.OK(var4); } - @PostMapping({"/enhanceJs/{code}"}) + @PostMapping({"/addEnhanceJs/{code}"}) public Result addEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { try { var2.setCgformHeadId(var1); @@ -181,7 +196,7 @@ public class OnlCgformHeadController { } } - @PutMapping({"/enhanceJs/{code}"}) + @PostMapping({"/enhanceJs/{code}"}) public Result editEnhanceJs(@PathVariable("code") String var1, @RequestBody OnlCgformEnhanceJs var2) { try { var2.setCgformHeadId(var1); @@ -211,7 +226,7 @@ public class OnlCgformHeadController { } @RequiresRoles({"admin"}) - @PostMapping({"/enhanceSql/{formId}"}) + @PostMapping({"/addEnhanceSql/{formId}"}) public Result addEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { try { var2.setCgformHeadId(var1); @@ -228,7 +243,7 @@ public class OnlCgformHeadController { } @RequiresRoles({"admin"}) - @PutMapping({"/enhanceSql/{formId}"}) + @PostMapping({"/enhanceSql/{formId}"}) public Result editEnhanceSql(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceSql var2) { try { var2.setCgformHeadId(var1); @@ -244,8 +259,12 @@ public class OnlCgformHeadController { } } - @DeleteMapping({"/enhanceSql"}) - public Result deletenhanceSql(@RequestParam(name = "id",required = true) String var1) { + @PostMapping({"/enhanceSql"}) + public Result deletenhanceSql(@RequestBody Map map) { + String var1 = map.get("id"); + if (StringUtils.isBlank(var1)) { + return Result.error(PARAM_ERROR); + } try { this.onlCgformEnhanceService.deleteEnhanceSql(var1); return Result.OK("删除成功"); @@ -255,8 +274,12 @@ public class OnlCgformHeadController { } } - @DeleteMapping({"/deletebatchEnhanceSql"}) - public Result deletebatchEnhanceSql(@RequestParam(name = "ids",required = true) String var1) { + @PostMapping({"/deletebatchEnhanceSql"}) + public Result deletebatchEnhanceSql(@RequestBody Map map) { + String var1 = map.get("ids"); + if (StringUtils.isBlank(var1)) { + return Result.error(PARAM_ERROR); + } try { List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceSql(var2); @@ -273,7 +296,7 @@ public class OnlCgformHeadController { return Result.OK(var3); } - @PostMapping({"/enhanceJava/{formId}"}) + @PostMapping({"/addEnhanceJava/{formId}"}) public Result addEnhanceJava(@PathVariable("formId") String formId, @RequestBody OnlCgformEnhanceJava var2) { try { if (!CgformUtil.a(var2)) { @@ -293,7 +316,7 @@ public class OnlCgformHeadController { } } - @PutMapping({"/enhanceJava/{formId}"}) + @PostMapping({"/enhanceJava/{formId}"}) public Result c(@PathVariable("formId") String var1, @RequestBody OnlCgformEnhanceJava var2) { try { if (!CgformUtil.a(var2)) { @@ -313,8 +336,12 @@ public class OnlCgformHeadController { } } - @DeleteMapping({"/enhanceJava"}) - public Result g(@RequestParam(name = "id",required = true) String var1) { + @PostMapping({"/enhanceJava"}) + public Result g(@RequestBody Map map) { + String var1 = map.get("id"); + if (StringUtils.isBlank(var1)) { + return Result.error(PARAM_ERROR); + } try { this.onlCgformEnhanceService.deleteEnhanceJava(var1); return Result.OK("删除成功"); @@ -324,8 +351,12 @@ public class OnlCgformHeadController { } } - @DeleteMapping({"/deleteBatchEnhanceJava"}) - public Result h(@RequestParam(name = "ids",required = true) String var1) { + @PostMapping({"/deleteBatchEnhanceJava"}) + public Result h(@RequestBody Map map) { + String var1 = map.get("ids"); + if (StringUtils.isBlank(var1)) { + return Result.error(PARAM_ERROR); + } try { List var2 = Arrays.asList(var1.split(",")); this.onlCgformEnhanceService.deleteBatchEnhanceJava(var2); @@ -337,7 +368,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"); @@ -385,7 +416,7 @@ public class OnlCgformHeadController { c = var1; String[] var4 = var1.split(","); - for(int var5 = 0; var5 < var4.length; ++var5) { + for (int var5 = 0; var5 < var4.length; ++var5) { if (oConvertUtils.isNotEmpty(var4[var5])) { int var6 = this.onlCgformHeadService.count(new LambdaQueryWrapper().eq(OnlCgformHead::getTableName, var4[var5])); if (var6 <= 0) { @@ -399,11 +430,13 @@ public class OnlCgformHeadController { return Result.OK("同步完成!"); } } + /** * 获取磁盘根目录 - * @date 2021/4/6 11:20 + * * @param * @return com.jero.common.api.vo.Result + * @date 2021/4/6 11:20 */ @GetMapping({"/rootFile"}) public Result rootFile() { @@ -411,7 +444,7 @@ public class OnlCgformHeadController { File[] files = File.listRoots(); int var4 = files.length; - for(int i = 0; i < var4; ++i) { + for (int i = 0; i < var4; ++i) { File file = files[i]; JSONObject jsonObject = new JSONObject(); if (file.isDirectory()) { @@ -429,20 +462,22 @@ public class OnlCgformHeadController { return Result.OK(jsonArray); } + /** * 获取磁盘文件树 - * @date 2021/4/6 11:20 + * * @param parentPath * @return com.jero.common.api.vo.Result + * @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(); int length = files.length; - for(int i = 0; i < length; ++i) { + for (int i = 0; i < length; ++i) { File file1 = files[i]; if (file1.isDirectory() && oConvertUtils.isNotEmpty(file1.getPath())) { JSONObject jsonObject = new JSONObject(); @@ -462,7 +497,7 @@ 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); @@ -476,7 +511,7 @@ public class OnlCgformHeadController { String[] subTableArray = subTableStr.split(","); int length = subTableArray.length; - for(int i = 0; i < length; ++i) { + for (int i = 0; i < length; ++i) { String subTable = subTableArray[i]; LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(OnlCgformHead::getTableName, subTable); @@ -514,7 +549,7 @@ 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 = this.onlCgformHeadService.getById(var1); if (var2 == null) { @@ -538,8 +573,8 @@ public class OnlCgformHeadController { return false; } - var3 = (String)var2.next(); - } while(!var1.startsWith(var3) && !var1.startsWith(var3.toUpperCase())); + var3 = (String) var2.next(); + } while (!var1.startsWith(var3) && !var1.startsWith(var3.toUpperCase())); return true; } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java index 5774ce36..fc0506c6 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgform/controller/OnlCgformIndexController.java @@ -9,12 +9,14 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.generater.modules.online.cgform.entity.OnlCgformIndex; import com.jero.generater.modules.online.cgform.service.IOnlCgformIndexService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.List; +import java.util.Map; @RestController("onlCgformIndexController") @RequestMapping({"/online/cgform/index"}) @@ -58,7 +60,7 @@ public class OnlCgformIndexController { } } - @PutMapping({"/edit"}) + @PostMapping({"/edit"}) public Result edit(@RequestBody OnlCgformIndex cgformIndex) { OnlCgformIndex existCgformIndex = this.onlCgformIndexService.getById(cgformIndex.getId()); if (existCgformIndex == null) { @@ -73,8 +75,12 @@ public class OnlCgformIndexController { return Result.OK(); } - @DeleteMapping({"/delete"}) - public Result delete(@RequestParam(name = "id",required = true) String id) { + @PostMapping({"/delete"}) + public Result delete(@RequestBody Map map) { + String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } OnlCgformIndex cgformIndex = this.onlCgformIndexService.getById(id); if (cgformIndex == null) { return Result.error(EN_IS_NULL); @@ -88,8 +94,9 @@ public class OnlCgformIndexController { return Result.OK(); } - @DeleteMapping({"/deleteBatch"}) - public Result deleteBatch(@RequestParam(name = "ids",required = true) String ids) { + @PostMapping({"/deleteBatch"}) + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if (ids != null && !"".equals(ids.trim())) { this.onlCgformIndexService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("删除成功!"); diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java index bff8dc25..169b4809 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportHeadController.java @@ -4,10 +4,8 @@ package com.jero.generater.modules.online.cgreport.controller; 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.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; + +import java.util.*; import javax.servlet.http.HttpServletRequest; import com.jero.modules.base.service.BaseCommonService; @@ -168,7 +166,7 @@ public class OnlCgreportHeadController { } } - @PutMapping({"/editAll"}) + @PostMapping({"/editAll"}) public Result editAll(@RequestBody OnlCgreportModel cgreportModel) { try { return this.onlCgreportHeadService.editAll(cgreportModel); @@ -178,13 +176,21 @@ public class OnlCgreportHeadController { } } - @DeleteMapping({"/delete"}) - public Result delete(@RequestParam(name = "id",required = true) String id) { + @PostMapping({"/delete"}) + public Result delete(@RequestBody Map map) { + String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } return this.onlCgreportHeadService.delete(id); } - @DeleteMapping({"/deleteBatch"}) - public Result deleteBatch(@RequestParam(name = "ids",required = true) String ids) { + @PostMapping({"/deleteBatch"}) + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } return this.onlCgreportHeadService.bathDelete(ids.split(",")); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java index dbac7882..e8552e93 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportItemController.java @@ -4,23 +4,19 @@ package com.jero.generater.modules.online.cgreport.controller; 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.util.Arrays; -import java.util.List; -import javax.servlet.http.HttpServletRequest; import com.jero.common.api.vo.Result; import com.jero.common.system.query.QueryGenerator; import com.jero.generater.modules.online.cgreport.entity.OnlCgreportItem; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportItemService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -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.util.Arrays; +import java.util.List; +import java.util.Map; @RestController("onlCgreportItemController") @RequestMapping({"/online/cgreport/item"}) @@ -59,20 +55,28 @@ public class OnlCgreportItemController { return Result.OK("操作成功!"); } - @PutMapping({"/edit"}) + @PostMapping({"/edit"}) public Result b(@RequestBody OnlCgreportItem var1) { this.onlCgreportItemService.updateById(var1); return Result.OK("操作成功!"); } - @DeleteMapping({"/delete"}) - public Result b(@RequestParam(name = "id",required = true) String var1) { + @PostMapping({"/delete"}) + public Result b(@RequestBody Map map) { + String var1 = map.get("id"); + if(StringUtils.isEmpty(var1)){ + return Result.error("参数不识别!"); + } this.onlCgreportItemService.removeById(var1); return Result.OK("删除成功!"); } - @DeleteMapping({"/deleteBatch"}) - public Result c(@RequestParam(name = "ids",required = true) String var1) { + @PostMapping({"/deleteBatch"}) + public Result c(@RequestBody Map map) { + String var1 = map.get("ids"); + if(StringUtils.isBlank(var1)){ + return Result.error("参数不识别!"); + } this.onlCgreportItemService.removeByIds(Arrays.asList(var1.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java index f7995548..693cdc3f 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java +++ b/jero-boot/jero-boot-base/jero-boot-base-generater/src/main/java/com/jero/generater/modules/online/cgreport/controller/OnlCgreportParamController.java @@ -9,6 +9,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.generater.modules.online.cgreport.entity.OnlCgreportParam; import com.jero.generater.modules.online.cgreport.service.IOnlCgreportParamService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -65,6 +66,9 @@ public class OnlCgreportParamController { // public Result b(@RequestParam(name = "id",required = true) String var1) { public Result b(@RequestBody Map map) { String var1 = map.get("id"); + if(StringUtils.isBlank(var1)){ + return Result.error("参数不识别!"); + } this.onlCgreportParamService.removeById(var1); return Result.OK("删除成功!"); } @@ -73,6 +77,9 @@ public class OnlCgreportParamController { // public Result c(@RequestParam(name = "ids", required = true) String var1) { public Result deleteBatch(@RequestBody Map map) { String var1 = map.get("ids"); + if(StringUtils.isBlank(var1)){ + return Result.error("参数不识别!"); + } this.onlCgreportParamService.removeByIds(Arrays.asList(var1.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java index e93c4dfc..961ba4c7 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java @@ -18,6 +18,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -108,6 +109,9 @@ public class JeroDemoController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } JeroDemoService.removeById(id); return Result.OK("删除成功!"); } @@ -122,6 +126,9 @@ public class JeroDemoController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.JeroDemoService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java index 74ca73ce..0d1f80ea 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderMainController.java @@ -15,6 +15,7 @@ import com.jero.modules.demo.test.service.IJeroOrderMainService; import com.jero.modules.demo.test.service.IJeroOrderTicketService; import com.jero.modules.demo.test.vo.JeroOrderMainPage; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -108,6 +109,9 @@ public class JeroOrderMainController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } jeroOrderMainService.delMain(id); return Result.OK("删除成功!"); } @@ -121,6 +125,9 @@ public class JeroOrderMainController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.jeroOrderMainService.delBatchMain(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java index b1c21d9e..896f4734 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroOrderTabMainController.java @@ -15,6 +15,7 @@ import com.jero.modules.demo.test.service.IJeroOrderCustomerService; import com.jero.modules.demo.test.service.IJeroOrderMainService; import com.jero.modules.demo.test.service.IJeroOrderTicketService; import com.jero.modules.demo.test.vo.JeroOrderMainPage; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -108,6 +109,9 @@ public class JeroOrderTabMainController { @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } jeroOrderMainService.delMain(id); return Result.OK(ResultConstant.DEL_OK); } @@ -121,6 +125,9 @@ public class JeroOrderTabMainController { @PostMapping(value = "/deleteBatch") public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.jeroOrderMainService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK(ResultConstant.BATCH_DEL_OK); } @@ -205,6 +212,9 @@ public class JeroOrderTabMainController { @PostMapping(value = "/deleteCustomer") public Result deleteCustomer(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } jeroOrderCustomerService.removeById(id); return Result.OK(ResultConstant.DEL_OK); } @@ -218,6 +228,9 @@ public class JeroOrderTabMainController { @PostMapping(value = "/deleteBatchCustomer") public Result deleteBatchCustomer(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.jeroOrderCustomerService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK(ResultConstant.BATCH_DEL_OK); } @@ -255,6 +268,9 @@ public class JeroOrderTabMainController { @PostMapping(value = "/deleteTicket") public Result deleteTicket(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } jeroOrderTicketService.removeById(id); return Result.OK(ResultConstant.DEL_OK); } @@ -268,6 +284,9 @@ public class JeroOrderTabMainController { @PostMapping(value = "/deleteBatchTicket") public Result deleteBatchTicket(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.jeroOrderTicketService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK(ResultConstant.BATCH_DEL_OK); } diff --git a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java index d6930434..401bb3f9 100644 --- a/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java +++ b/jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java @@ -11,6 +11,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.common.util.oConvertUtils; import com.jero.modules.demo.test.entity.JoaDemo; import com.jero.modules.demo.test.service.IJoaDemoService; +import org.apache.commons.lang.StringUtils; import lombok.extern.slf4j.Slf4j; import org.apache.poi.ss.formula.functions.T; import org.jeecgframework.poi.excel.ExcelImportUtil; @@ -112,6 +113,9 @@ public class JoaDemoController { @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } JoaDemo joaDemo = joaDemoService.getById(id); if(joaDemo==null) { return Result.error(ResultConstant.EN_WAS_NOT_FOUND); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java index 33ab7d2c..a7f57971 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageController.java @@ -9,6 +9,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.modules.message.entity.SysMessage; import com.jero.modules.message.service.ISysMessageService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -84,6 +85,9 @@ public class SysMessageController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysMessageService.removeById(id); return Result.OK("删除成功!"); } @@ -97,6 +101,9 @@ public class SysMessageController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.sysMessageService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java index b8dd10f9..5ebaae3b 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/controller/SysMessageTemplateController.java @@ -12,6 +12,7 @@ import com.jero.modules.message.entity.SysMessageTemplate; import com.jero.modules.message.service.ISysMessageTemplateService; import com.jero.modules.message.util.PushMsgUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -88,6 +89,9 @@ public class SysMessageTemplateController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysMessageTemplateService.removeById(id); return Result.OK("删除成功!"); } @@ -101,6 +105,9 @@ public class SysMessageTemplateController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.sysMessageTemplateService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java index b05c5055..1f183364 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/oss/controller/OSSFileController.java @@ -8,6 +8,7 @@ import com.jero.common.system.query.QueryGenerator; import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.service.IOSSFileService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -57,6 +58,9 @@ public class OSSFileController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } OSSFile file = ossFileService.getById(id); if (file == null) { return Result.error("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java index 1a825730..3e498e3d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/quartz/controller/QuartzJobController.java @@ -14,6 +14,7 @@ import com.jero.modules.quartz.service.IQuartzJobService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.def.NormalExcelConstants; @@ -114,6 +115,9 @@ public class QuartzJobController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } QuartzJob quartzJob = quartzJobService.getById(id); if (quartzJob == null) { return Result.error("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java index 5e3af1f5..70da40a1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/LoginController.java @@ -71,7 +71,7 @@ public class LoginController { * @return */ // @RequestMapping(value = "/selectDepart", method = RequestMethod.PUT) - @PutMapping("/selectDepart") + @PostMapping("/selectDepart") public Result selectDepart(@RequestBody SysUser user) { return loginService.selectDepart(user); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 8dd6d35f..662a29d0 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -166,6 +166,9 @@ public class SysAnnouncementController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { return Result.error(ERROR_TEXT); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java index 30359fbd..641b3733 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementSendController.java @@ -13,6 +13,7 @@ import com.jero.modules.system.entity.SysAnnouncementSend; import com.jero.modules.system.model.AnnouncementSendModel; import com.jero.modules.system.service.ISysAnnouncementSendService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -114,6 +115,9 @@ public class SysAnnouncementSendController { @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { return Result.error(ERROE_MSG); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java index 3e24574a..b5d9db22 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCategoryController.java @@ -134,6 +134,9 @@ public class SysCategoryController { @PostMapping(value = "/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { return Result.error(ERROE_MSG); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java index 376a08e4..f1b27d9c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysCheckRuleController.java @@ -13,6 +13,7 @@ import com.jero.modules.system.service.ISysCheckRuleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -131,6 +132,9 @@ public class SysCheckRuleController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysCheckRuleService.removeById(id); return Result.OK("删除成功!"); } @@ -146,6 +150,9 @@ public class SysCheckRuleController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.sysCheckRuleService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java index 4ea7eab7..a1dc8f81 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDataSourceController.java @@ -154,6 +154,9 @@ public class SysDataSourceController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysDataSource sysDataSource = sysDataSourceService.getById(id); DataSourceCachePool.removeCache(sysDataSource.getCode()); sysDataSourceService.removeById(id); @@ -171,6 +174,9 @@ public class SysDataSourceController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } List idList = Arrays.asList(ids.split(",")); idList.forEach(item->{ SysDataSource sysDataSource = sysDataSourceService.getById(item); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java index 2aa6682a..de311147 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java @@ -224,6 +224,9 @@ public class SysDepartController { @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(org.apache.commons.lang.StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysDepart sysDepart = sysDepartService.getById(id); if(sysDepart==null) { return Result.error("未找到对应实体"); @@ -245,7 +248,6 @@ public class SysDepartController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:depart:del") -// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) public Result deleteBatch(@RequestBody Map map) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java index 6adb9865..17a23d86 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartPermissionController.java @@ -24,6 +24,7 @@ import lombok.extern.slf4j.Slf4j; import com.jero.modules.system.service.ISysPermissionDataRuleService; import com.jero.modules.system.service.ISysPermissionService; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -108,6 +109,9 @@ public class SysDepartPermissionController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysDepartPermissionService.removeById(id); return Result.OK("删除成功!"); } @@ -122,6 +126,9 @@ public class SysDepartPermissionController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.sysDepartPermissionService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java index 206110aa..bf3366ec 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java @@ -27,6 +27,7 @@ import com.jero.modules.system.vo.SysDictPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.jeecgframework.poi.excel.ExcelImportCheckUtil; @@ -394,6 +395,9 @@ public class SysDictController { @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } boolean ok = sysDictService.removeById(id); if(ok) { return Result.OK(DEL_SUCCESS); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java index 54a887c2..6881f627 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictItemController.java @@ -124,6 +124,9 @@ public class SysDictItemController { @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { return Result.error("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java index a9d3a66e..b6a595e5 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysFillRuleController.java @@ -15,6 +15,7 @@ import com.jero.modules.system.service.ISysFillRuleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -112,6 +113,9 @@ public class SysFillRuleController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysFillRuleService.removeById(id); return Result.OK("删除成功!"); } @@ -127,6 +131,9 @@ public class SysFillRuleController extends JeroController deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } this.sysFillRuleService.removeByIds(Arrays.asList(ids.split(","))); return Result.OK("批量删除成功!"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java index 7010fd5f..209ae599 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysGatewayRouteController.java @@ -11,6 +11,7 @@ import com.jero.modules.system.entity.SysGatewayRoute; import com.jero.modules.system.service.ISysGatewayRouteService; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,6 +75,9 @@ public class SysGatewayRouteController extends JeroController delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysGatewayRouteService.deleteById(id); return Result.OK("删除路由成功"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java index 8753a3f0..cfcd06d6 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysLogController.java @@ -10,6 +10,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysLog; import com.jero.modules.system.service.ISysLogService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -74,6 +75,9 @@ public class SysLogController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } SysLog sysLog = sysLogService.getById(id); if(sysLog==null) { return Result.error("未找到对应实体"); diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java index 810fefab..d587b289 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysPermissionController.java @@ -21,6 +21,7 @@ import com.jero.modules.system.service.ISysPermissionService; import com.jero.modules.system.service.ISysRolePermissionService; import com.jero.modules.system.util.PermissionDataUtil; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; @@ -273,6 +274,9 @@ public class SysPermissionController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } try { sysPermissionService.deletePermission(id); return Result.OK(DEL_SUCCESS); @@ -292,6 +296,9 @@ public class SysPermissionController { @PostMapping("/deleteBatch") public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } try { String[] arr = ids.split(","); for (String id : arr) { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java index 8dd8795f..97befe6d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java @@ -14,6 +14,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.jero.common.system.base.controller.JeroController; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresRoles; @@ -158,6 +159,9 @@ public class SysRoleController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysRoleService.deleteRole(id); return Result.OK("删除角色成功"); } @@ -173,6 +177,9 @@ public class SysRoleController { @PostMapping("/deleteBatch") public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } if(oConvertUtils.isEmpty(ids)) { return Result.error("未选中角色!"); }else { diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java index 94ed67dd..f3baccd1 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysTenantController.java @@ -12,6 +12,7 @@ import com.jero.common.util.oConvertUtils; import com.jero.modules.system.entity.SysTenant; import com.jero.modules.system.service.ISysTenantService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang.StringUtils; import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -104,6 +105,9 @@ public class SysTenantController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } sysTenantService.removeTenantById(id); return Result.OK("删除成功"); } diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java index c86db272..bae46798 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java @@ -263,6 +263,9 @@ public class SysUserController { @PostMapping("/delete") public Result delete(@RequestBody Map map) { String id = map.get("id"); + if(StringUtils.isBlank(id)){ + return Result.error("参数不识别!"); + } baseCommonService.addLog("删除用户,id: " +id ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteUser(id); return Result.OK("删除用户成功"); @@ -272,6 +275,9 @@ public class SysUserController { @PostMapping("/deleteBatch") public Result deleteBatch(@RequestBody Map map) { String ids = map.get("ids"); + if(StringUtils.isBlank(ids)){ + return Result.error("参数不识别!"); + } baseCommonService.addLog("批量删除用户, ids: " +ids ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteBatchUsers(ids); return Result.OK("批量删除用户成功");