From 76ada5cfc919b207439f5ab74639351fe4c32bb2 Mon Sep 17 00:00:00 2001 From: tianwenbo Date: Mon, 6 Mar 2023 14:40:05 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90fix=20sonar=E3=80=91SysRoleController.?= =?UTF-8?q?java=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/SysRoleController.java | 109 ++++++++++-------- 1 file changed, 58 insertions(+), 51 deletions(-) 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 105e4462..0ae5637e 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 @@ -13,6 +13,8 @@ import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.jero.common.system.base.controller.JeroController; +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; @@ -37,14 +39,7 @@ import org.jeecgframework.poi.excel.entity.ImportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cache.annotation.CacheEvict; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; @@ -72,16 +67,18 @@ import lombok.extern.slf4j.Slf4j; public class SysRoleController { @Autowired private ISysRoleService sysRoleService; - + @Autowired private ISysPermissionDataRuleService sysPermissionDataRuleService; - + @Autowired private ISysRolePermissionService sysRolePermissionService; - + @Autowired private ISysPermissionService sysPermissionService; + private static String OPTION_SUCCESS = "操作成功!"; + /** * 分页列表查询 * @param role @@ -91,39 +88,41 @@ public class SysRoleController { * @return */ //@RequiresPermissions("sys:role:list") - @RequestMapping(value = "/page", method = RequestMethod.GET) +// @RequestMapping(value = "/page", method = RequestMethod.GET) + @GetMapping("/page") public Result> queryPageList(SysRole role, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - Result> result = new Result>(); + Result> result = new Result<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = sysRoleService.page(page, queryWrapper); result.setSuccess(true); result.setResult(pageList); return result; } - + /** * 添加 * @param role * @return */ @RequiresPermissions("sys:role:add") - @RequestMapping(value = "/add", method = RequestMethod.POST) +// @RequestMapping(value = "/add", method = RequestMethod.POST) + @PostMapping("/add") //@RequiresRoles({"admin"}) public Result add(@RequestBody SysRole role) { try { role.setCreateTime(new Date()); sysRoleService.save(role); - return Result.OK("操作成功!"); + return Result.OK(OPTION_SUCCESS); } catch (Exception e) { log.error(e.getMessage(), e); return Result.error("操作失败"); } } - + /** * 编辑 * @param role @@ -131,7 +130,8 @@ public class SysRoleController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:edit") - @RequestMapping(value = "/edit", method = RequestMethod.PUT) +// @RequestMapping(value = "/edit", method = RequestMethod.PUT) + @PutMapping("/edit") public Result edit(@RequestBody SysRole role) { SysRole sysrole = sysRoleService.getById(role.getId()); if(sysrole==null) { @@ -140,13 +140,13 @@ public class SysRoleController { role.setUpdateTime(new Date()); boolean ok = sysRoleService.updateById(role); if(ok) { - return Result.OK("操作成功!"); + return Result.OK(OPTION_SUCCESS); } } - + return Result.OK(); } - + /** * 通过id删除 * @param id @@ -154,12 +154,13 @@ public class SysRoleController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") - @RequestMapping(value = "/delete", method = RequestMethod.DELETE) - public Result delete(@RequestParam(name="id",required=true) String id) { +// @RequestMapping(value = "/delete", method = RequestMethod.DELETE) + @DeleteMapping("/delete") + public Result delete(@RequestParam(name="id",required=true) String id) { sysRoleService.deleteRole(id); return Result.OK("删除角色成功"); } - + /** * 批量删除 * @param ids @@ -167,7 +168,8 @@ public class SysRoleController { */ //@RequiresRoles({"admin"}) @RequiresPermissions("sys:role:del") - @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) +// @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) + @DeleteMapping("/deleteBatch") public Result deleteBatch(@RequestParam(name="ids",required=true) String ids) { if(oConvertUtils.isEmpty(ids)) { return Result.error("未选中角色！"); @@ -176,14 +178,15 @@ public class SysRoleController { return Result.OK("删除角色成功!"); } } - + /** * 通过id查询 * @param id * @return */ //@RequiresPermissions("sys:role:list") - @RequestMapping(value = "/queryById", method = RequestMethod.GET) +// @RequestMapping(value = "/queryById", method = RequestMethod.GET) + @GetMapping("/queryById") public Result queryById(@RequestParam(name="id",required=true) String id) { SysRole sysRole = sysRoleService.getById(id); if(sysRole==null) { @@ -193,21 +196,23 @@ public class SysRoleController { } } //@RequiresPermissions("sys:role:list") - @RequestMapping(value = "/queryall", method = RequestMethod.GET) +// @RequestMapping(value = "/queryall", method = RequestMethod.GET) + @GetMapping("/queryall") public Result> queryall() { List list = sysRoleService.list(); - if(list==null||list.size()<=0) { + if(list==null||list.isEmpty()) { return Result.error("未找到角色信息"); }else { return Result.OK(list); } } - + /** * 校验角色编码唯一 */ //@RequiresPermissions("sys:role:list") - @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET) +// @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET) + @GetMapping("/checkRoleCode") public Result checkUsername(String id,String roleCode) { Result result = new Result<>(); result.setResult(true);//如果此参数为false则程序发生异常 @@ -255,10 +260,10 @@ public class SysRoleController { ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); List pageList = sysRoleService.list(queryWrapper); //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME,"角色列表"); - mv.addObject(NormalExcelConstants.CLASS,SysRole.class); + mv.addObject(JeroController.FILE_NAME,"角色列表"); + mv.addObject(JeroController.CLASS,SysRole.class); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - mv.addObject(NormalExcelConstants.PARAMS,new ExportParams("角色列表数据","导出人:"+user.getRealname(),"导出信息")); + mv.addObject(JeroController.PARAMS,new ExportParams("角色列表数据","导出人:"+user.getRealname(),"导出信息")); mv.addObject(NormalExcelConstants.DATA_LIST,pageList); return mv; } @@ -270,8 +275,9 @@ public class SysRoleController { * @return */ @RequiresPermissions("sys:role:import") - @RequestMapping(value = "/importExcel", method = RequestMethod.POST) - public Result importExcel(HttpServletRequest request, HttpServletResponse response) { +// @RequestMapping(value = "/importExcel", method = RequestMethod.POST) + @PostMapping("/importExcel") + public Result importExcel(HttpServletRequest request, HttpServletResponse response) { MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; Map fileMap = multipartRequest.getFileMap(); for (Map.Entry entity : fileMap.entrySet()) { @@ -295,15 +301,15 @@ public class SysRoleController { } return Result.error("文件导入失败！"); } - + /** * 查询数据规则数据 */ //@RequiresPermissions("sys:role:list") @GetMapping(value = "/datarule/{permissionId}/{roleId}") - public Result loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) { + public Result> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) { List list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); - if(list==null || list.size()==0) { + if(list==null || list.isEmpty()) { return Result.error("未找到权限配置信息"); }else { Map map = new HashMap<>(); @@ -325,13 +331,13 @@ public class SysRoleController { //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key } } - + /** * 保存数据规则至角色菜单关联表 */ //@RequiresPermissions("sys:role:list") @PostMapping(value = "/datarule") - public Result saveDatarule(@RequestBody JSONObject jsonObject) { + public Result saveDatarule(@RequestBody JSONObject jsonObject) { try { String permissionId = jsonObject.getString("permissionId"); String roleId = jsonObject.getString("roleId"); @@ -351,23 +357,24 @@ public class SysRoleController { log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); return Result.error("保存失败"); } - return Result.OK("操作成功!"); + return Result.OK(OPTION_SUCCESS); } - - + + /** * 用户角色授权功能，查询菜单权限树 * @param request * @return */ //@RequiresPermissions("sys:role:list") - @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) +// @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) + @GetMapping("/queryTreeList") public Result> queryTreeList(HttpServletRequest request) { Result> result = new Result<>(); //全部权限ids List ids = new ArrayList<>(); try { - LambdaQueryWrapper query = new LambdaQueryWrapper(); + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0); query.orderByAsc(SysPermission::getSortNo); List list = sysPermissionService.list(query); @@ -376,7 +383,7 @@ public class SysRoleController { } List treeList = new ArrayList<>(); getTreeModelList(treeList, list, null); - Map resMap = new HashMap(); + Map resMap = new HashMap<>(); resMap.put("treeList", treeList); //全部树节点数据 resMap.put("ids", ids);//全部树ids result.setResult(resMap); @@ -402,9 +409,9 @@ public class SysRoleController { getTreeModelList(treeList, metaList, tree); } } - + } } - - + + }