From 89a7a746966f0d2fb9d95d1df926fafe56f83bf8 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Tue, 14 Mar 2023 14:50:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9delete=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E6=94=B6=E5=8F=82=E6=95=B0=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysMessageController.java | 186 +++++++++--------- .../SysMessageTemplateController.java | 10 +- .../oss/controller/OSSFileController.java | 4 +- .../controller/QuartzJobController.java | 6 +- .../controller/SysAnnouncementController.java | 10 +- .../SysAnnouncementSendController.java | 14 +- .../controller/SysCategoryController.java | 10 +- .../controller/SysCheckRuleController.java | 9 +- .../controller/SysDataSourceController.java | 11 +- .../controller/SysDepartController.java | 9 +- .../SysDepartPermissionController.java | 10 +- .../system/controller/SysDictController.java | 6 +- .../controller/SysDictItemController.java | 12 +- .../controller/SysFillRuleController.java | 11 +- .../controller/SysGatewayRouteController.java | 6 +- .../system/controller/SysLogController.java | 12 +- .../controller/SysPermissionController.java | 11 +- .../system/controller/SysRoleController.java | 10 +- .../controller/SysTenantController.java | 9 +- .../controller/SysUserAgentController.java | 5 +- .../system/controller/SysUserController.java | 6 +- 21 files changed, 210 insertions(+), 157 deletions(-) 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 f956ae70..33ab7d2c 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 @@ -17,6 +17,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.Map; /** * @Description: 消息 @@ -28,109 +29,110 @@ import java.util.Arrays; @RestController @RequestMapping("/sys/message/sysMessage") public class SysMessageController extends JeroController { - @Autowired - private ISysMessageService sysMessageService; + @Autowired + private ISysMessageService sysMessageService; - /** - * 分页列表查询 - * - * @param sysMessage - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @GetMapping(value = "/page") - public Result> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap()); - Page page = new Page<>(pageNo, pageSize); - IPage pageList = sysMessageService.page(page, queryWrapper); + /** + * 分页列表查询 + * + * @param sysMessage + * @param pageNo + * @param pageSize + * @param req + * @return + */ + @GetMapping(value = "/page") + public Result> queryPageList(SysMessage sysMessage, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(sysMessage, req.getParameterMap()); + Page page = new Page<>(pageNo, pageSize); + IPage pageList = sysMessageService.page(page, queryWrapper); return Result.OK(pageList); - } + } - /** - * 添加 - * - * @param sysMessage - * @return - */ - @PostMapping(value = "/add") - public Result add(@RequestBody SysMessage sysMessage) { - sysMessageService.save(sysMessage); - return Result.OK("操作成功!"); - } + /** + * 添加 + * + * @param sysMessage + * @return + */ + @PostMapping(value = "/add") + public Result add(@RequestBody SysMessage sysMessage) { + sysMessageService.save(sysMessage); + return Result.OK("操作成功!"); + } - /** - * 编辑 - * - * @param sysMessage - * @return - */ - @PostMapping(value = "/edit") - public Result edit(@RequestBody SysMessage sysMessage) { - sysMessageService.updateById(sysMessage); + /** + * 编辑 + * + * @param sysMessage + * @return + */ + @PostMapping(value = "/edit") + public Result edit(@RequestBody SysMessage sysMessage) { + sysMessageService.updateById(sysMessage); return Result.OK("操作成功!"); - } + } - /** - * 通过id删除 - * - * @param id - * @return - */ - @PostMapping(value = "/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { - sysMessageService.removeById(id); + /** + * 通过id删除 + * + * @param map + * @return + */ + @PostMapping(value = "/delete") + public Result delete(@RequestBody Map map) { + String id = map.get("id"); + sysMessageService.removeById(id); return Result.OK("删除成功!"); - } + } - /** - * 批量删除 - * - * @param ids - * @return - */ - @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + /** + * 批量删除 + * + * @param map + * @return + */ + @PostMapping(value = "/deleteBatch") + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); + this.sysMessageService.removeByIds(Arrays.asList(ids.split(","))); + return Result.OK("批量删除成功！"); + } - this.sysMessageService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("批量删除成功！"); - } + /** + * 通过id查询 + * + * @param id + * @return + */ + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name = "id", required = true) String id) { + SysMessage sysMessage = sysMessageService.getById(id); + return Result.OK(sysMessage); + } - /** - * 通过id查询 - * - * @param id - * @return - */ - @GetMapping(value = "/queryById") - public Result queryById(@RequestParam(name = "id", required = true) String id) { - SysMessage sysMessage = sysMessageService.getById(id); - return Result.OK(sysMessage); - } + /** + * 导出excel + * + * @param request + */ + @GetMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, SysMessage sysMessage) { + return super.exportXls(request, sysMessage, SysMessage.class, "推送消息模板"); + } - /** - * 导出excel - * - * @param request - */ - @GetMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, SysMessage sysMessage) { - return super.exportXls(request,sysMessage,SysMessage.class, "推送消息模板"); - } - - /** - * excel导入 - * - * @param request - * @param response - * @return - */ - @PostMapping(value = "/importExcel") - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { - return super.importExcel(request, response, SysMessage.class); - } + /** + * excel导入 + * + * @param request + * @param response + * @return + */ + @PostMapping(value = "/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { + return super.importExcel(request, response, SysMessage.class); + } } 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 a3de15c3..b8dd10f9 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 @@ -82,11 +82,12 @@ public class SysMessageTemplateController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); sysMessageTemplateService.removeById(id); return Result.OK("删除成功!"); } @@ -94,11 +95,12 @@ public class SysMessageTemplateController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 dc72895c..b05c5055 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 @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; +import java.util.Map; @Slf4j @Controller @@ -54,7 +55,8 @@ public class OSSFileController { @ResponseBody @PostMapping("/delete") - public Result delete(@RequestParam(name = "id") String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); 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 13e1bb73..0eda9a77 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 @@ -111,7 +111,8 @@ public class QuartzJobController { */ //@RequiresRoles("admin") @PostMapping("/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); QuartzJob quartzJob = quartzJobService.getById(id); if (quartzJob == null) { return Result.error("未找到对应实体"); @@ -130,7 +131,8 @@ public class QuartzJobController { //@RequiresRoles("admin") // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if (ids == null || "".equals(ids.trim())) { return Result.error("参数不识别！"); } 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 3d3baab4..8dd6d35f 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 @@ -159,12 +159,13 @@ public class SysAnnouncementController { /** * 通过id删除 - * @param id + * @param map * @return */ // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id); if(sysAnnouncement==null) { return Result.error(ERROR_TEXT); @@ -181,12 +182,13 @@ public class SysAnnouncementController { /** * 批量删除 - * @param ids + * @param map * @return */ // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if(ids==null || "".equals(ids.trim())) { return Result.error("参数不识别！"); }else { 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 f4d0a9fa..30359fbd 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.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -20,8 +21,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.Arrays; import java.util.Date; +import java.util.Map; - /** +/** * @Title: Controller * @Description: 用户通告阅读标记表 * @Author: jero-boot @@ -106,11 +108,12 @@ public class SysAnnouncementSendController { /** * 通过id删除 - * @param id + * @param map * @return */ @PostMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysAnnouncementSend sysAnnouncementSend = sysAnnouncementSendService.getById(id); if(sysAnnouncementSend==null) { return Result.error(ERROE_MSG); @@ -126,11 +129,12 @@ public class SysAnnouncementSendController { /** * 批量删除 - * @param ids + * @param map * @return */ @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if(ids == null || "".equals(ids.trim())) { return Result.error("参数不识别！"); }else { 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 13247668..3e24574a 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 @@ -127,12 +127,13 @@ public class SysCategoryController { /** * 通过id删除 - * @param id + * @param map * @return */ @RequiresPermissions("sys:category:del") @PostMapping(value = "/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysCategory sysCategory = sysCategoryService.getById(id); if(sysCategory==null) { return Result.error(ERROE_MSG); @@ -144,12 +145,13 @@ public class SysCategoryController { /** * 批量删除 - * @param ids + * @param map * @return */ @RequiresPermissions("sys:category:del") @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if(ids==null || "".equals(ids.trim())) { return Result.error("参数不识别！"); }else { 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 eb889a58..376a08e4 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 @@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; import java.util.Arrays; +import java.util.Map; /** * @Description: 编码校验规则 @@ -128,7 +129,8 @@ public class SysCheckRuleController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); sysCheckRuleService.removeById(id); return Result.OK("删除成功!"); } @@ -136,13 +138,14 @@ public class SysCheckRuleController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 8554a4cf..4ea7eab7 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 @@ -26,6 +26,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; import java.util.List; +import java.util.Map; /** * @Description: 多数据源管理 @@ -145,13 +146,14 @@ public class SysDataSourceController extends JeroController delete(@RequestParam(name = "id") String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysDataSource sysDataSource = sysDataSourceService.getById(id); DataSourceCachePool.removeCache(sysDataSource.getCode()); sysDataSourceService.removeById(id); @@ -161,13 +163,14 @@ public class SysDataSourceController extends JeroController deleteBatch(@RequestParam(name = "ids") String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 04271d1b..f7ea7bbe 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 @@ -215,7 +215,7 @@ public class SysDepartController { /** * 通过id删除 - * @param id + * @param map * @return */ //@RequiresRoles({"admin"}) @@ -223,7 +223,8 @@ public class SysDepartController { // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysDepart sysDepart = sysDepartService.getById(id); if(sysDepart==null) { return Result.error("未找到对应实体"); @@ -248,7 +249,9 @@ public class SysDepartController { // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") @CacheEvict(value= {CacheConstant.SYS_DEPARTS_CACHE,CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries=true) - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { +// public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if (ids == null || "".equals(ids.trim())) { return Result.error("参数不识别！"); } else { 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 2a5f7f4f..6adb9865 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 @@ -101,12 +101,13 @@ public class SysDepartPermissionController extends JeroController delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); sysDepartPermissionService.removeById(id); return Result.OK("删除成功!"); } @@ -114,12 +115,13 @@ public class SysDepartPermissionController extends JeroController deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 4751a28e..3b5ca9b1 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 @@ -385,13 +385,15 @@ public class SysDictController { /** * @功能：删除 - * @param id + * @param map * @return */ @ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典") @PostMapping(value = "/delete") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { +// public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); 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 5a2fc913..54a887c2 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 @@ -3,12 +3,14 @@ package com.jero.modules.system.controller; import java.util.Arrays; import java.util.Date; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import io.swagger.annotations.ApiOperation; 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; import com.jero.common.api.vo.Result; @@ -112,7 +114,7 @@ public class SysDictItemController { /** * @功能：删除字典数据 - * @param id + * @param map * @return */ //@RequiresRoles({"admin"}) @@ -120,7 +122,8 @@ public class SysDictItemController { // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysDictItem joinSystem = sysDictItemService.getById(id); if(joinSystem==null) { return Result.error("未找到对应实体"); @@ -135,7 +138,7 @@ public class SysDictItemController { /** * @功能：批量删除字典数据 - * @param ids + * @param map * @return */ //@RequiresRoles({"admin"}) @@ -143,7 +146,8 @@ public class SysDictItemController { // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true) - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if(ids==null || "".equals(ids.trim())) { return Result.error("参数不识别！"); }else { 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 9c6b0f8c..a9d3a66e 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 @@ -23,6 +23,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; +import java.util.Map; /** * @Description: 填值规则 @@ -103,13 +104,14 @@ public class SysFillRuleController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); sysFillRuleService.removeById(id); return Result.OK("删除成功!"); } @@ -117,13 +119,14 @@ public class SysFillRuleController extends JeroController deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 490896ed..7010fd5f 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 @@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * @Description: gateway路由管理 @@ -65,13 +66,14 @@ public class SysGatewayRouteController extends JeroController delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); 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 da202776..8753a3f0 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,11 +10,13 @@ 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.poi.ss.formula.functions.T; 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.Map; /** *

@@ -65,12 +67,13 @@ public class SysLogController { /** * @功能：删除单个日志记录 - * @param id + * @param map * @return */ // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); SysLog sysLog = sysLogService.getById(id); if(sysLog==null) { return Result.error("未找到对应实体"); @@ -85,12 +88,13 @@ public class SysLogController { /** * @功能：批量，全部清空日志记录 - * @param ids + * @param map * @return */ // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if(ids==null || "".equals(ids.trim())) { return Result.error("参数不识别！"); }else { 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 153ff2e4..810fefab 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.poi.ss.formula.functions.T; import org.apache.shiro.SecurityUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -264,13 +265,14 @@ public class SysPermissionController { /** * 删除菜单 - * @param id + * @param map * @return */ //@RequiresRoles({ "admin" }) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") - public Result delete(@RequestParam(name = "id", required = true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); try { sysPermissionService.deletePermission(id); return Result.OK(DEL_SUCCESS); @@ -282,13 +284,14 @@ public class SysPermissionController { /** * 批量删除菜单 - * @param ids + * @param map * @return */ //@RequiresRoles({ "admin" }) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name = "ids", required = true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 3717e25c..8dd8795f 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 @@ -149,28 +149,30 @@ public class SysRoleController { /** * 通过id删除 - * @param id + * @param map * @return */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); sysRoleService.deleteRole(id); return Result.OK("删除角色成功"); } /** * 批量删除 - * @param ids + * @param map * @return */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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 b3e04a04..94ed67dd 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 @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * 租户配置信息 @@ -101,19 +102,21 @@ public class SysTenantController { */ // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); sysTenantService.removeTenantById(id); return Result.OK("删除成功"); } /** * 批量删除 - * @param ids + * @param map * @return */ // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); 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/SysUserAgentController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java index 61822c14..8a76ee86 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserAgentController.java @@ -129,11 +129,12 @@ public class SysUserAgentController { /** * 批量删除 - * @param ids + * @param map * @return */ @PostMapping(value = "/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); if(ids==null || "".equals(ids.trim())) { return Result.error("参数不识别！"); }else { 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 72eb6da3..0dd740aa 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 @@ -261,7 +261,8 @@ public class SysUserController { // @RequestMapping(value = "/delete", method = RequestMethod.DELETE) @PostMapping("/delete") - public Result delete(@RequestParam(name="id",required=true) String id) { + public Result delete(@RequestBody Map map) { + String id = map.get("id"); baseCommonService.addLog("删除用户，id： " +id ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteUser(id); return Result.OK("删除用户成功"); @@ -269,7 +270,8 @@ public class SysUserController { // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) @PostMapping("/deleteBatch") - public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { + public Result deleteBatch(@RequestBody Map map) { + String ids = map.get("ids"); baseCommonService.addLog("批量删除用户， ids： " +ids ,CommonConstant.LOG_TYPE_2, 3); this.sysUserService.deleteBatchUsers(ids); return Result.OK("批量删除用户成功");