Commit 0b75bcaab3ad31a86efe4254cb4416617c607bce
1 parent
8da901c0d3
Exists in
master
and in
7 other branches
分娩作废产检劵
Showing 1 changed file with 52 additions and 22 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java
View file @
0b75bca
| ... | ... | @@ -13,10 +13,12 @@ |
| 13 | 13 | import com.lyms.platform.common.utils.JsonUtil; |
| 14 | 14 | import com.lyms.platform.common.utils.ResultUtils; |
| 15 | 15 | import com.lyms.platform.operate.web.facade.AccessPermissionFacade; |
| 16 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
| 16 | 17 | import com.lyms.platform.operate.web.request.AccessPermissionAddRequest; |
| 17 | 18 | import com.lyms.platform.permission.model.*; |
| 18 | 19 | import com.lyms.platform.permission.service.*; |
| 19 | 20 | import com.lyms.platform.pojo.DataPermissionsModel; |
| 21 | +import org.apache.commons.collections.CollectionUtils; | |
| 20 | 22 | import org.apache.commons.lang.StringUtils; |
| 21 | 23 | import org.apache.commons.lang.math.NumberUtils; |
| 22 | 24 | import org.springframework.beans.factory.annotation.Autowired; |
| 23 | 25 | |
| 24 | 26 | |
| ... | ... | @@ -38,21 +40,9 @@ |
| 38 | 40 | private Permissions2Service permissions2Service; |
| 39 | 41 | @Autowired |
| 40 | 42 | private UsersService usersService; |
| 41 | - | |
| 42 | 43 | @Autowired |
| 43 | - private DepartmentsService departmentsService; | |
| 44 | - @Autowired | |
| 45 | - private TokenService tokenService; | |
| 46 | - @Autowired | |
| 47 | 44 | private UserRoleMapsService userRoleMapsService; |
| 48 | 45 | @Autowired |
| 49 | - private RolePermissionMapsService rolePermissionMapsService; | |
| 50 | - | |
| 51 | - private static String NODE="children"; | |
| 52 | - private static String CHECK="check"; | |
| 53 | - | |
| 54 | - private Integer TYPE = 1; | |
| 55 | - @Autowired | |
| 56 | 46 | private AccessPermissionFacade accessPermissionFacade; |
| 57 | 47 | |
| 58 | 48 | |
| ... | ... | @@ -63,8 +53,8 @@ |
| 63 | 53 | @TokenRequired |
| 64 | 54 | public void getPermissions(HttpServletResponse response, |
| 65 | 55 | @RequestParam(value = "id", required = false) Integer id, |
| 66 | - @RequestParam(value = "page",required = false) Integer page, | |
| 67 | - @RequestParam(value = "limit",required = false) Integer limit) { | |
| 56 | + @RequestParam(value = "page", required = false) Integer page, | |
| 57 | + @RequestParam(value = "limit", required = false) Integer limit) { | |
| 68 | 58 | Permissions2Query permissionsQuery = new Permissions2Query(); |
| 69 | 59 | page = null == page ? 1 : page; |
| 70 | 60 | limit = null == limit ? 10 : limit; |
| 71 | 61 | |
| 72 | 62 | |
| 73 | 63 | |
| ... | ... | @@ -79,17 +69,58 @@ |
| 79 | 69 | } |
| 80 | 70 | |
| 81 | 71 | |
| 72 | + /** | |
| 73 | + * 获取权限列表 | |
| 74 | + */ | |
| 75 | + @RequestMapping(value = "/current/permissions", method = RequestMethod.GET) | |
| 76 | + @TokenRequired | |
| 77 | + public void getCurrentPermissions(HttpServletResponse response, HttpServletRequest request) { | |
| 78 | + /* Permissions2Query permissionsQuery = new Permissions2Query(); | |
| 79 | + page = null == page ? 1 : page; | |
| 80 | + limit = null == limit ? 10 : limit; | |
| 81 | + permissionsQuery.setNeed("true"); | |
| 82 | + permissionsQuery.setPage(page); | |
| 83 | + permissionsQuery.setId(id); | |
| 84 | + permissionsQuery.setLimit(limit); | |
| 85 | + permissionsQuery.setYn(YnEnums.YES.getId()); | |
| 86 | + List<Permissions2> permissionses = permissions2Service.queryPermissions2(permissionsQuery); | |
| 87 | +*/ | |
| 88 | + LoginContext loginContext = (LoginContext) request.getAttribute("loginContext"); | |
| 89 | + Users users = null; | |
| 90 | + if (null != loginContext) { | |
| 91 | + users = usersService.getUsers(loginContext.getId()); | |
| 92 | + } | |
| 82 | 93 | |
| 94 | + //获取用户角色信息 | |
| 95 | + UserRoleMapsQuery query = new UserRoleMapsQuery(); | |
| 96 | + query.setUserId(users.getId()); | |
| 97 | + query.setYn(YnEnums.YES.getId()); | |
| 98 | + List<Integer> userRoleMapses = userRoleMapsService.queryUserRoleList(query); | |
| 99 | + List<Integer> permissionIds = new ArrayList<>(); | |
| 100 | + List permissions = new ArrayList<>(); | |
| 83 | 101 | |
| 102 | + List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); | |
| 103 | + if (CollectionUtils.isNotEmpty(local)) { | |
| 104 | + for (Permissions2 permissions1 : local) { | |
| 105 | + if (!permissionIds.contains(permissions1.getId())) { | |
| 106 | + permissionIds.add(permissions1.getId()); | |
| 107 | + permissions.add(permissions1); | |
| 108 | + } | |
| 109 | + } | |
| 110 | + } | |
| 111 | + ResultUtils.buildSuccessResultAndWrite(response, permissions); | |
| 112 | + } | |
| 113 | + | |
| 114 | + | |
| 84 | 115 | @TokenRequired |
| 85 | 116 | @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET) |
| 86 | 117 | @ResponseBody |
| 87 | - public List getAccessPermission(){ | |
| 88 | - List<Map<String,Object>> list = new ArrayList<>(); | |
| 89 | - for(PermissionTypeEnums permissionTypeEnums:PermissionTypeEnums.values()){ | |
| 90 | - Map<String,Object> data = new HashMap<String,Object>(); | |
| 91 | - data.put("id",permissionTypeEnums.getId()); | |
| 92 | - data.put("title",permissionTypeEnums.getTitle()); | |
| 118 | + public List getAccessPermission() { | |
| 119 | + List<Map<String, Object>> list = new ArrayList<>(); | |
| 120 | + for (PermissionTypeEnums permissionTypeEnums : PermissionTypeEnums.values()) { | |
| 121 | + Map<String, Object> data = new HashMap<String, Object>(); | |
| 122 | + data.put("id", permissionTypeEnums.getId()); | |
| 123 | + data.put("title", permissionTypeEnums.getTitle()); | |
| 93 | 124 | list.add(data); |
| 94 | 125 | } |
| 95 | 126 | return list; |
| 96 | 127 | |
| ... | ... | @@ -98,10 +129,9 @@ |
| 98 | 129 | @TokenRequired |
| 99 | 130 | @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST) |
| 100 | 131 | @ResponseBody |
| 101 | - public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){ | |
| 132 | + public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest) { | |
| 102 | 133 | return accessPermissionFacade.addAccessPermission(accessPermissionAddRequest); |
| 103 | 134 | } |
| 104 | - | |
| 105 | 135 | |
| 106 | 136 | |
| 107 | 137 | /** |