JeroBoot/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

【fix sonar】SysRoleController.java文件

Browse Source
This commit is contained in:
tianwenbo
2023-03-06 14:40:15 +08:00
parent d45ee64516
commit 76ada5cfc9
1 changed files with 58 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysRoleController.java
+58 -51
View File
@@ -13,6 +13,8 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; 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.RequiresPermissions;
import org.apache.shiro.authz.annotation.RequiresRoles; import org.apache.shiro.authz.annotation.RequiresRoles;
import com.jero.common.api.vo.Result; 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.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
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.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
@@ -72,16 +67,18 @@ import lombok.extern.slf4j.Slf4j;
public class SysRoleController { public class SysRoleController {
@Autowired @Autowired
private ISysRoleService sysRoleService; private ISysRoleService sysRoleService;
@Autowired @Autowired
private ISysPermissionDataRuleService sysPermissionDataRuleService; private ISysPermissionDataRuleService sysPermissionDataRuleService;
@Autowired @Autowired
private ISysRolePermissionService sysRolePermissionService; private ISysRolePermissionService sysRolePermissionService;
@Autowired @Autowired
private ISysPermissionService sysPermissionService; private ISysPermissionService sysPermissionService;
private static String OPTION_SUCCESS = "操作成功!";
/** /**
* 分页列表查询 * 分页列表查询
* @param role * @param role
@@ -91,39 +88,41 @@ public class SysRoleController {
* @return * @return
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/page", method = RequestMethod.GET) // @RequestMapping(value = "/page", method = RequestMethod.GET)
@GetMapping("/page")
public Result<IPage<SysRole>> queryPageList(SysRole role, public Result<IPage<SysRole>> queryPageList(SysRole role,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) { HttpServletRequest req) {
Result<IPage<SysRole>> result = new Result<IPage<SysRole>>(); Result<IPage<SysRole>> result = new Result<>();
QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap()); QueryWrapper<SysRole> queryWrapper = QueryGenerator.initQueryWrapper(role, req.getParameterMap());
Page<SysRole> page = new Page<SysRole>(pageNo, pageSize); Page<SysRole> page = new Page<>(pageNo, pageSize);
IPage<SysRole> pageList = sysRoleService.page(page, queryWrapper); IPage<SysRole> pageList = sysRoleService.page(page, queryWrapper);
result.setSuccess(true); result.setSuccess(true);
result.setResult(pageList); result.setResult(pageList);
return result; return result;
} }
/** /**
* 添加 * 添加
* @param role * @param role
* @return * @return
*/ */
@RequiresPermissions("sys:role:add") @RequiresPermissions("sys:role:add")
@RequestMapping(value = "/add", method = RequestMethod.POST) // @RequestMapping(value = "/add", method = RequestMethod.POST)
@PostMapping("/add")
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
public Result<Object> add(@RequestBody SysRole role) { public Result<Object> add(@RequestBody SysRole role) {
try { try {
role.setCreateTime(new Date()); role.setCreateTime(new Date());
sysRoleService.save(role); sysRoleService.save(role);
return Result.OK("操作成功!"); return Result.OK(OPTION_SUCCESS);
} catch (Exception e) { } catch (Exception e) {
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
return Result.error("操作失败"); return Result.error("操作失败");
} }
} }
/** /**
* 编辑 * 编辑
* @param role * @param role
@@ -131,7 +130,8 @@ public class SysRoleController {
*/ */
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:edit") @RequiresPermissions("sys:role:edit")
@RequestMapping(value = "/edit", method = RequestMethod.PUT) // @RequestMapping(value = "/edit", method = RequestMethod.PUT)
@PutMapping("/edit")
public Result<Object> edit(@RequestBody SysRole role) { public Result<Object> edit(@RequestBody SysRole role) {
SysRole sysrole = sysRoleService.getById(role.getId()); SysRole sysrole = sysRoleService.getById(role.getId());
if(sysrole==null) { if(sysrole==null) {
@@ -140,13 +140,13 @@ public class SysRoleController {
role.setUpdateTime(new Date()); role.setUpdateTime(new Date());
boolean ok = sysRoleService.updateById(role); boolean ok = sysRoleService.updateById(role);
if(ok) { if(ok) {
return Result.OK("操作成功!"); return Result.OK(OPTION_SUCCESS);
} }
} }
return Result.OK(); return Result.OK();
} }
/** /**
* 通过id删除 * 通过id删除
* @param id * @param id
@@ -154,12 +154,13 @@ public class SysRoleController {
*/ */
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:del") @RequiresPermissions("sys:role:del")
@RequestMapping(value = "/delete", method = RequestMethod.DELETE) // @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
public Result<?> delete(@RequestParam(name="id",required=true) String id) { @DeleteMapping("/delete")
public Result<T> delete(@RequestParam(name="id",required=true) String id) {
sysRoleService.deleteRole(id); sysRoleService.deleteRole(id);
return Result.OK("删除角色成功"); return Result.OK("删除角色成功");
} }
/** /**
* 批量删除 * 批量删除
* @param ids * @param ids
@@ -167,7 +168,8 @@ public class SysRoleController {
*/ */
//@RequiresRoles({"admin"}) //@RequiresRoles({"admin"})
@RequiresPermissions("sys:role:del") @RequiresPermissions("sys:role:del")
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE) // @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
@DeleteMapping("/deleteBatch")
public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) { public Result<Object> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
if(oConvertUtils.isEmpty(ids)) { if(oConvertUtils.isEmpty(ids)) {
return Result.error("未选中角色！"); return Result.error("未选中角色！");
@@ -176,14 +178,15 @@ public class SysRoleController {
return Result.OK("删除角色成功!"); return Result.OK("删除角色成功!");
} }
} }
/** /**
* 通过id查询 * 通过id查询
* @param id * @param id
* @return * @return
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/queryById", method = RequestMethod.GET) // @RequestMapping(value = "/queryById", method = RequestMethod.GET)
@GetMapping("/queryById")
public Result<SysRole> queryById(@RequestParam(name="id",required=true) String id) { public Result<SysRole> queryById(@RequestParam(name="id",required=true) String id) {
SysRole sysRole = sysRoleService.getById(id); SysRole sysRole = sysRoleService.getById(id);
if(sysRole==null) { if(sysRole==null) {
@@ -193,21 +196,23 @@ public class SysRoleController {
} }
} }
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/queryall", method = RequestMethod.GET) // @RequestMapping(value = "/queryall", method = RequestMethod.GET)
@GetMapping("/queryall")
public Result<List<SysRole>> queryall() { public Result<List<SysRole>> queryall() {
List<SysRole> list = sysRoleService.list(); List<SysRole> list = sysRoleService.list();
if(list==null||list.size()<=0) { if(list==null||list.isEmpty()) {
return Result.error("未找到角色信息"); return Result.error("未找到角色信息");
}else { }else {
return Result.OK(list); return Result.OK(list);
} }
} }
/** /**
* 校验角色编码唯一 * 校验角色编码唯一
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET) // @RequestMapping(value = "/checkRoleCode", method = RequestMethod.GET)
@GetMapping("/checkRoleCode")
public Result<Boolean> checkUsername(String id,String roleCode) { public Result<Boolean> checkUsername(String id,String roleCode) {
Result<Boolean> result = new Result<>(); Result<Boolean> result = new Result<>();
result.setResult(true);//如果此参数为false则程序发生异常 result.setResult(true);//如果此参数为false则程序发生异常
@@ -255,10 +260,10 @@ public class SysRoleController {
ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
List<SysRole> pageList = sysRoleService.list(queryWrapper); List<SysRole> pageList = sysRoleService.list(queryWrapper);
//导出文件名称 //导出文件名称
mv.addObject(NormalExcelConstants.FILE_NAME,"角色列表"); mv.addObject(JeroController.FILE_NAME,"角色列表");
mv.addObject(NormalExcelConstants.CLASS,SysRole.class); mv.addObject(JeroController.CLASS,SysRole.class);
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); 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); mv.addObject(NormalExcelConstants.DATA_LIST,pageList);
return mv; return mv;
} }
@@ -270,8 +275,9 @@ public class SysRoleController {
* @return * @return
*/ */
@RequiresPermissions("sys:role:import") @RequiresPermissions("sys:role:import")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) // @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { @PostMapping("/importExcel")
public Result<T> importExcel(HttpServletRequest request, HttpServletResponse response) {
MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
Map<String, MultipartFile> fileMap = multipartRequest.getFileMap(); Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) { for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
@@ -295,15 +301,15 @@ public class SysRoleController {
} }
return Result.error("文件导入失败！"); return Result.error("文件导入失败！");
} }
/** /**
* 查询数据规则数据 * 查询数据规则数据
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@GetMapping(value = "/datarule/{permissionId}/{roleId}") @GetMapping(value = "/datarule/{permissionId}/{roleId}")
public Result<?> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) { public Result<Map<String, Object>> loadDatarule(@PathVariable("permissionId") String permissionId,@PathVariable("roleId") String roleId) {
List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId); List<SysPermissionDataRule> list = sysPermissionDataRuleService.getPermRuleListByPermId(permissionId);
if(list==null || list.size()==0) { if(list==null || list.isEmpty()) {
return Result.error("未找到权限配置信息"); return Result.error("未找到权限配置信息");
}else { }else {
Map<String,Object> map = new HashMap<>(); Map<String,Object> map = new HashMap<>();
@@ -325,13 +331,13 @@ public class SysRoleController {
//TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key //TODO 以后按钮权限的查询也走这个请求 无非在map中多加两个key
} }
} }
/** /**
* 保存数据规则至角色菜单关联表 * 保存数据规则至角色菜单关联表
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@PostMapping(value = "/datarule") @PostMapping(value = "/datarule")
public Result<?> saveDatarule(@RequestBody JSONObject jsonObject) { public Result<T> saveDatarule(@RequestBody JSONObject jsonObject) {
try { try {
String permissionId = jsonObject.getString("permissionId"); String permissionId = jsonObject.getString("permissionId");
String roleId = jsonObject.getString("roleId"); String roleId = jsonObject.getString("roleId");
@@ -351,23 +357,24 @@ public class SysRoleController {
log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e); log.error("SysRoleController.saveDatarule()发生异常：" + e.getMessage(),e);
return Result.error("保存失败"); return Result.error("保存失败");
} }
return Result.OK("操作成功!"); return Result.OK(OPTION_SUCCESS);
} }
/** /**
* 用户角色授权功能，查询菜单权限树 * 用户角色授权功能，查询菜单权限树
* @param request * @param request
* @return * @return
*/ */
//@RequiresPermissions("sys:role:list") //@RequiresPermissions("sys:role:list")
@RequestMapping(value = "/queryTreeList", method = RequestMethod.GET) // @RequestMapping(value = "/queryTreeList", method = RequestMethod.GET)
@GetMapping("/queryTreeList")
public Result<Map<String,Object>> queryTreeList(HttpServletRequest request) { public Result<Map<String,Object>> queryTreeList(HttpServletRequest request) {
Result<Map<String,Object>> result = new Result<>(); Result<Map<String,Object>> result = new Result<>();
//全部权限ids //全部权限ids
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
try { try {
LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<SysPermission>(); LambdaQueryWrapper<SysPermission> query = new LambdaQueryWrapper<>();
query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0); query.eq(SysPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
query.orderByAsc(SysPermission::getSortNo); query.orderByAsc(SysPermission::getSortNo);
List<SysPermission> list = sysPermissionService.list(query); List<SysPermission> list = sysPermissionService.list(query);
@@ -376,7 +383,7 @@ public class SysRoleController {
} }
List<TreeModel> treeList = new ArrayList<>(); List<TreeModel> treeList = new ArrayList<>();
getTreeModelList(treeList, list, null); getTreeModelList(treeList, list, null);
Map<String,Object> resMap = new HashMap<String,Object>(); Map<String,Object> resMap = new HashMap<>();
resMap.put("treeList", treeList); //全部树节点数据 resMap.put("treeList", treeList); //全部树节点数据
resMap.put("ids", ids);//全部树ids resMap.put("ids", ids);//全部树ids
result.setResult(resMap); result.setResult(resMap);
@@ -402,9 +409,9 @@ public class SysRoleController {
getTreeModelList(treeList, metaList, tree); getTreeModelList(treeList, metaList, tree);
} }
} }
} }
} }
} }