From 1320f7dcedfe301030533cc27b6aba5e691a86fd Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 9 May 2016 19:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=BA=E6=89=B9=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/dao/PermissionsMapper.java | 2 + .../permission/service/PermissionsService.java | 2 +- .../service/impl/PermissionsServiceImpl.java | 54 +++++--- .../src/main/resources/mainOrm/Permissions.xml | 7 +- .../operate/web/controller/RolesController.java | 137 +++++++++++---------- 5 files changed, 117 insertions(+), 85 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java index 988ff53..d8e8899 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/PermissionsMapper.java @@ -18,4 +18,6 @@ public interface PermissionsMapper { public List queryPermissions(PermissionsQuery query); + List queryPermissionByRoleIds(Integer roleIds); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java index c4434ad..dd9e2be 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PermissionsService.java @@ -17,5 +17,5 @@ public interface PermissionsService { public int queryPermissionsCount(PermissionsQuery query); public List queryPermissions(PermissionsQuery query); - + List queryPermissionByRoleIds(Integer roleIds); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java index 5339cd0..ce873f2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PermissionsServiceImpl.java @@ -7,26 +7,48 @@ import com.lyms.platform.permission.service.PermissionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; import java.util.List; @Service public class PermissionsServiceImpl implements PermissionsService { -@Autowired -private PermissionsMapper permissionsMapper; - -@Override -public void addPermissions(Permissions obj){permissionsMapper.addPermissions(obj);} -@Override -public void updatePermissions(Permissions obj){permissionsMapper.updatePermissions(obj);} -@Override -public void deletePermissions (Integer id){permissionsMapper.deletePermissions(id);} -@Override -public Permissions getPermissions (Integer id){return permissionsMapper.getPermissions(id);} -@Override -public int queryPermissionsCount (PermissionsQuery query){return permissionsMapper.queryPermissionsCount(query);} -@Override -public List queryPermissions (PermissionsQuery query){if (query.getNeed() != null) {query.mysqlBuild(permissionsMapper.queryPermissionsCount(query));}return permissionsMapper.queryPermissions(query);} + @Autowired + private PermissionsMapper permissionsMapper; + @Override + public void addPermissions(Permissions obj) { + permissionsMapper.addPermissions(obj); + } + + @Override + public void updatePermissions(Permissions obj) { + permissionsMapper.updatePermissions(obj); + } + + @Override + public void deletePermissions(Integer id) { + permissionsMapper.deletePermissions(id); + } + + @Override + public Permissions getPermissions(Integer id) { + return permissionsMapper.getPermissions(id); + } + + @Override + public int queryPermissionsCount(PermissionsQuery query) { + return permissionsMapper.queryPermissionsCount(query); + } + + @Override + public List queryPermissions(PermissionsQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(permissionsMapper.queryPermissionsCount(query)); + } + return permissionsMapper.queryPermissions(query); + } + + public List queryPermissionByRoleIds(Integer roleIds) { + return permissionsMapper.queryPermissionByRoleIds(roleIds); + } } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml index dcdda59..9bbd0c2 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Permissions.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Permissions.xml @@ -180,6 +180,9 @@ select count(1) from permissions - - + \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java index fe3e399..c98db2f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java @@ -12,6 +12,7 @@ import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -22,7 +23,9 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.*; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; /** * Created by Administrator on 2015/9/29 0029. @@ -57,7 +60,7 @@ public class RolesController extends BaseController { stopWatch.start("get role by id"); //判断是否存在该角色 Roles roles = rolesService.getRoles(id); - if(null == roles || id == null || StringUtils.isBlank(ids)) { + if (null == roles || id == null || StringUtils.isBlank(ids)) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -82,8 +85,7 @@ public class RolesController extends BaseController { for (String tmp : roleArrayIds) { - - Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp)); + Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp)); //权限是否存在 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) { continue; @@ -104,20 +106,17 @@ public class RolesController extends BaseController { } - - - /** * 角色绑定访问权限 */ @RequestMapping(value = "/roles/dataAccessByRole", method = RequestMethod.POST) @TokenRequired public void updateUserPermission(HttpServletResponse response, - @RequestParam(value = "id") Integer id, - @RequestParam(value = "type") Integer accessPermType) { + @RequestParam(value = "id") Integer id, + @RequestParam(value = "type") Integer accessPermType) { Roles roles = rolesService.getRoles(id); - Assert.notNull(roles,"角色为空."); + Assert.notNull(roles, "角色为空."); roles.setPermissiontype(Integer.valueOf(accessPermType)); @@ -125,24 +124,26 @@ public class RolesController extends BaseController { ResultUtils.buildSuccessResultAndWrite(response); } + /** - * 创建用户角色 + * 创建用户角色 + * * @param response */ - @RequestMapping(value = "/userRoles",method = RequestMethod.POST) + @RequestMapping(value = "/userRoles", method = RequestMethod.POST) @TokenRequired public void addUserRoles(HttpServletResponse response, - HttpServletRequest request, - @RequestParam(value = "name")String name, - @RequestParam(value = "enable")Integer enable, - @RequestParam(value = "remarks", required = false)String remarks, - @RequestParam(value = "shortCode", required = false)String shortCode) { + HttpServletRequest request, + @RequestParam(value = "name") String name, + @RequestParam(value = "enable") Integer enable, + @RequestParam(value = "remarks", required = false) String remarks, + @RequestParam(value = "shortCode", required = false) String shortCode) { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsers(loginState.getId()); - if ( StringUtils.isBlank(name) || null == users) { + if (StringUtils.isBlank(name) || null == users) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } @@ -150,8 +151,8 @@ public class RolesController extends BaseController { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setName(name); - if(0 < rolesService.queryRolesCount(rolesQuery)) { - ResultUtils.buildResultAndWrite(response,ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); + if (0 < rolesService.queryRolesCount(rolesQuery)) { + ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); return; } @@ -173,17 +174,18 @@ public class RolesController extends BaseController { /** - * 创建管理员角色 + * 创建管理员角色 + * * @param response */ - @RequestMapping(value = "/adminRoles",method = RequestMethod.POST) + @RequestMapping(value = "/adminRoles", method = RequestMethod.POST) @TokenRequired public void addAdminRoles(HttpServletResponse response, - HttpServletRequest request, - @RequestParam(value = "name")String name, - @RequestParam(value = "enable")Integer enable, - @RequestParam(value = "remarks", required = false)String remarks, - @RequestParam(value = "shortCode", required = false)String shortCode) { + HttpServletRequest request, + @RequestParam(value = "name") String name, + @RequestParam(value = "enable") Integer enable, + @RequestParam(value = "remarks", required = false) String remarks, + @RequestParam(value = "shortCode", required = false) String shortCode) { //获取登录用户 LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); @@ -197,7 +199,7 @@ public class RolesController extends BaseController { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setName(name); - if(0 < rolesService.queryRolesCount(rolesQuery)) { + if (0 < rolesService.queryRolesCount(rolesQuery)) { ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); return; } @@ -221,29 +223,29 @@ public class RolesController extends BaseController { /** * 角色修改 */ - @RequestMapping(value = "/roles/{id}",method = RequestMethod.PUT) + @RequestMapping(value = "/roles/{id}", method = RequestMethod.PUT) @TokenRequired - public void updateRoles(HttpServletResponse response ,@PathVariable Integer id, - @RequestParam(value = "name",required = false)String name, - @RequestParam(value = "enable",required = false)Integer enable, - @RequestParam(value = "remarks",required = false)String remarks, - @RequestParam(value = "shortCode",required = false)String shortCode) { + public void updateRoles(HttpServletResponse response, @PathVariable Integer id, + @RequestParam(value = "name", required = false) String name, + @RequestParam(value = "enable", required = false) Integer enable, + @RequestParam(value = "remarks", required = false) String remarks, + @RequestParam(value = "shortCode", required = false) String shortCode) { - if ( StringUtils.isBlank(name) || null == id ) { + if (StringUtils.isBlank(name) || null == id) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } Roles roles = rolesService.getRoles(id); - if (roles==null){ + if (roles == null) { new BusinessException("", "角色信息不存在."); return; } - if(!roles.getName().equals(name)) { + if (!roles.getName().equals(name)) { RolesQuery rolesQuery = new RolesQuery(); rolesQuery.setYn(YnEnums.YES.getId()); rolesQuery.setName(name); - if(0 < rolesService.queryRolesCount(rolesQuery)) { + if (0 < rolesService.queryRolesCount(rolesQuery)) { ResultUtils.buildResultAndWrite(response, ErrorCodeConstants.NAME_EXIST, "角色名称已存在"); return; } @@ -261,16 +263,16 @@ public class RolesController extends BaseController { /** * 角色删除 */ - @RequestMapping(value = "/roles/{id}",method = RequestMethod.DELETE) + @RequestMapping(value = "/roles/{id}", method = RequestMethod.DELETE) @TokenRequired - public void deleteRoles(HttpServletResponse response ,@PathVariable(value = "id")Integer id) { + public void deleteRoles(HttpServletResponse response, @PathVariable(value = "id") Integer id) { if (null == id) { ResultUtils.buildIdIsNull(response); return; } Roles roles = rolesService.getRoles(id); - if (roles==null){ + if (roles == null) { ResultUtils.buildIdResultData(response); return; } @@ -283,8 +285,8 @@ public class RolesController extends BaseController { UserRoleMapsQuery userRoleMapsQuery = new UserRoleMapsQuery(); userRoleMapsQuery.setRoleId(id); List userRoleMapses = userRoleMapsService.queryUserRoleMaps(userRoleMapsQuery); - if(null != userRoleMapses) { - for(UserRoleMaps userRoleMaps : userRoleMapses) { + if (null != userRoleMapses) { + for (UserRoleMaps userRoleMaps : userRoleMapses) { userRoleMaps.setYn(YnEnums.NO.getId()); userRoleMapsService.updateUserRoleMaps(userRoleMaps); } @@ -293,7 +295,7 @@ public class RolesController extends BaseController { RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setRoleId(id); List rolePermissionMapsList = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); - if(null != rolePermissionMapsList) { + if (null != rolePermissionMapsList) { for (RolePermissionMaps rolePermissionMaps : rolePermissionMapsList) { rolePermissionMaps.setYn(YnEnums.NO.getId()); rolePermissionMapsService.updateRolePermissionMaps(rolePermissionMaps);//把状态设置成无效 @@ -309,7 +311,7 @@ public class RolesController extends BaseController { */ @RequestMapping(value = "/roles/enable", method = RequestMethod.POST) @TokenRequired - public void enableUsers(HttpServletResponse response,@RequestParam Integer id, @RequestParam Integer flag) { + public void enableUsers(HttpServletResponse response, @RequestParam Integer id, @RequestParam Integer flag) { if (null == id && null == flag) { ResultUtils.buildIdIsNull(response); return; @@ -317,7 +319,7 @@ public class RolesController extends BaseController { //判断是否存在 Roles roles = rolesService.getRoles(id); - if(null == roles) { + if (null == roles) { ResultUtils.buildIdIsNull(response); return; } @@ -336,11 +338,11 @@ public class RolesController extends BaseController { @ResponseBody @TokenRequired public FrontEndResult getUserList(HttpServletResponse response, - @RequestParam(value = "keyword",required = false) String keyword, - @RequestParam(value = "page",required = false) Integer page, - @RequestParam(value = "limit",required = false) Integer limit, - @RequestParam(value = "orgId", required = false) Integer orgId, - @RequestParam(value = "enable", required = false) Integer enable) { + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "orgId", required = false) Integer orgId, + @RequestParam(value = "enable", required = false) Integer enable) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -356,10 +358,14 @@ public class RolesController extends BaseController { rolesQuery.setEnable(enable); List roles = rolesService.queryRoles(rolesQuery); - List permissionses = null; - for(Roles roles1 : roles) { - permissionses = new ArrayList<>(); - RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); + if (CollectionUtils.isNotEmpty(roles)) { + + + List permissionses; + for (Roles roles1 : roles) { + permissionses = permissionsService.queryPermissionByRoleIds(roles1.getId()); + + /* RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); rolePermissionMapsQuery.setRoleId(roles1.getId()); List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); @@ -369,12 +375,12 @@ public class RolesController extends BaseController { if(permissions.getYn().equals(YnEnums.NO.getId())) continue; permissionses.add(permissions); } - - roles1.setPermissions(permissionses); + */ + roles1.setPermissions(permissionses); + } } - FrontEndResult frontEndResult = new FrontEndResult(); frontEndResult.setPageInfo(rolesQuery.getPageInfo()); frontEndResult.setData(roles); @@ -393,10 +399,10 @@ public class RolesController extends BaseController { @ResponseBody @TokenRequired public FrontEndResult getAdminList(HttpServletResponse response, - @RequestParam(value = "keyword",required = false) String keyword, - @RequestParam(value = "page",required = false) Integer page, - @RequestParam(value = "limit",required = false) Integer limit, - @RequestParam(value = "enable",required = false) Integer enable) { + @RequestParam(value = "keyword", required = false) String keyword, + @RequestParam(value = "page", required = false) Integer page, + @RequestParam(value = "limit", required = false) Integer limit, + @RequestParam(value = "enable", required = false) Integer enable) { limit = limit == null ? 10 : limit; page = page == null ? 1 : page; @@ -414,16 +420,16 @@ public class RolesController extends BaseController { List roles = rolesService.queryRoles(rolesQuery); List permissionses = null; - for(Roles roles1 : roles) { + for (Roles roles1 : roles) { permissionses = new ArrayList<>(); RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setYn(YnEnums.YES.getId()); rolePermissionMapsQuery.setRoleId(roles1.getId()); List rolePermissionMapses = rolePermissionMapsService.queryRolePermissionMaps(rolePermissionMapsQuery); - for(RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { + for (RolePermissionMaps rolePermissionMaps : rolePermissionMapses) { Permissions permissions = permissionsService.getPermissions(rolePermissionMaps.getPermissionId()); - if(permissions.getYn().equals(YnEnums.NO.getId())) continue; + if (permissions.getYn().equals(YnEnums.NO.getId())) continue; permissionses.add(permissions); } @@ -431,7 +437,6 @@ public class RolesController extends BaseController { } - FrontEndResult frontEndResult = new FrontEndResult(); frontEndResult.setPageInfo(rolesQuery.getPageInfo()); frontEndResult.setData(roles); -- 1.8.3.1