shiyang / regional-platform

Download as
Browse Code »

Commit 7ace67f108395eea43213b543646130b34182001

Authored by zhangrui
1 parent 0f97e45773
Exists in master and in 1 other branch nobuildprocess

权限更替为permission2

Showing 4 changed files with 129 additions and 129 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java View file @ 7ace67f
... ... @@ -36,13 +36,13 @@
36 36 this.orgId = orgId;
37 37 }
38 38  
39   - private List<Permissions> permissions;
  39 + private List<Permissions2> permissions;
40 40  
41   - public List<Permissions> getPermissions() {
  41 + public List<Permissions2> getPermissions() {
42 42 return permissions;
43 43 }
44 44  
45   - public void setPermissions(List<Permissions> permissions) {
  45 + public void setPermissions(List<Permissions2> permissions) {
46 46 this.permissions = permissions;
47 47 }
48 48  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java View file @ 7ace67f
... ... @@ -35,7 +35,7 @@
35 35 public class PermissionsController extends BaseController {
36 36  
37 37 @Autowired
38   - private PermissionsService permissions2Service;
  38 + private Permissions2Service permissions2Service;
39 39 @Autowired
40 40 private UsersService usersService;
41 41  
... ... @@ -65,7 +65,7 @@
65 65 @RequestParam(value = "id", required = false) Integer id,
66 66 @RequestParam(value = "page",required = false) Integer page,
67 67 @RequestParam(value = "limit",required = false) Integer limit) {
68   - PermissionsQuery permissionsQuery = new PermissionsQuery();
  68 + Permissions2Query permissionsQuery = new Permissions2Query();
69 69 page = null == page ? 1 : page;
70 70 limit = null == limit ? 10 : limit;
71 71 permissionsQuery.setNeed("true");
72 72  
... ... @@ -74,124 +74,124 @@
74 74 permissionsQuery.setLimit(limit);
75 75  
76 76 permissionsQuery.setYn(YnEnums.YES.getId());
77   - List<Permissions> permissionses = permissions2Service.queryPermissions(permissionsQuery);
  77 + List<Permissions2> permissionses = permissions2Service.queryPermissions2(permissionsQuery);
78 78 ResultUtils.buildSuccessResultAndWrite(response, permissionses);
79 79 }
80 80  
81 81  
82   -//
83   -//
84   -// @TokenRequired
85   -// @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET)
86   -// @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());
93   -// list.add(data);
94   -// }
95   -// return list;
96   -// }
97   -//
98   -// @TokenRequired
99   -// @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST)
100   -// @ResponseBody
101   -// public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){
102   -// return accessPermissionFacade.addAccessPermission(accessPermissionAddRequest);
103   -// }
104   -//
105   -//
106   -//
107   -// /**
108   -// * 新增权限
109   -// * name;
110   -// */
111   -// @RequestMapping(value = "/permissions", method = RequestMethod.POST)
112   -// @TokenRequired
113   -// public void addPermissions(HttpServletResponse response, HttpServletRequest request,
114   -// @RequestParam(value = "uri") String uri,
115   -// @RequestParam(value = "puri") String puri,
116   -// @RequestParam(value = "name") String name,
117   -// @RequestParam(value = "type") String type,
118   -// @RequestParam(value = "icon") String icon) {
119   -// if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) {
120   -// ResultUtils.buildParameterErrorResultAndWrite(response);
121   -// return;
122   -// }
123   -//
124   -// //获取登录用户
125   -// LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
126   -// Users users = usersService.getUsers(loginState.getId());
127   -//
128   -// Permissions2 permissions = new Permissions2();
129   -// permissions.setUri(uri);
130   -// permissions.setPuri(puri);
131   -// permissions.setName(name);
132   -// permissions.setType(type);
133   -// permissions.setIcon(icon);
134   -//
135   -// permissions.setYn(YnEnums.YES.getId());
136   -// permissions2Service.addPermissions2(permissions);
137   -// ResultUtils.buildSuccessResultAndWrite(response);
138   -// }
139   -//
140   -// /**
141   -// * 权限修改
142   -// */
143   -// @RequestMapping(value = "/permissions/{id}", method = RequestMethod.PUT)
144   -// @TokenRequired
145   -// public void updatePermissions(HttpServletResponse response,
146   -// @PathVariable Integer id,
147   -// @RequestParam(value = "uri") String uri,
148   -// @RequestParam(value = "puri") String puri,
149   -// @RequestParam(value = "name") String name,
150   -// @RequestParam(value = "type") String type,
151   -// @RequestParam(value = "icon") String icon) {
152   -//
153   -// Permissions2 permissions = permissions2Service.getPermissions2(id);
154   -//
155   -// if (permissions == null) {
156   -// new BusinessException("", "根据id获取信息不存在");
157   -// return;
158   -// }
159   -//
160   -// if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) {
161   -// ResultUtils.buildParameterErrorResultAndWrite(response);
162   -// return;
163   -// }
164   -// permissions.setUri(uri);
165   -// permissions.setPuri(puri);
166   -// permissions.setName(name);
167   -// permissions.setType(type);
168   -// permissions.setIcon(icon);
169   -// permissions.setYn(YnEnums.YES.getId());
170   -//
171   -// permissions2Service.updatePermissions2(permissions);
172   -// ResultUtils.buildSuccessResultAndWrite(response);
173   -// }
174   -//
175   -// /**
176   -// * 删除权限
177   -// */
178   -// @RequestMapping(value = "/permissions/{id}", method = RequestMethod.DELETE)
179   -// @TokenRequired
180   -// public void deletePermissions(HttpServletResponse response, @PathVariable(value = "id") String id) {
181   -// if (StringUtils.isEmpty(id)) {
182   -// ResultUtils.buildIdIsNull(response);
183   -// return;
184   -// }
185   -// Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(id));
186   -// if (permissions == null) {
187   -// ResultUtils.buildIdResultData(response);
188   -// return;
189   -// }
190   -// permissions.setYn(YnEnums.NO.getId());
191   -// permissions2Service.updatePermissions2(permissions);
192   -//
193   -// ResultUtils.buildSuccessResultAndWrite(response);
194   -// }
  82 +
  83 +
  84 + @TokenRequired
  85 + @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET)
  86 + @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());
  93 + list.add(data);
  94 + }
  95 + return list;
  96 + }
  97 +
  98 + @TokenRequired
  99 + @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST)
  100 + @ResponseBody
  101 + public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){
  102 + return accessPermissionFacade.addAccessPermission(accessPermissionAddRequest);
  103 + }
  104 +
  105 +
  106 +
  107 + /**
  108 + * 新增权限
  109 + * name;
  110 + */
  111 + @RequestMapping(value = "/permissions", method = RequestMethod.POST)
  112 + @TokenRequired
  113 + public void addPermissions(HttpServletResponse response, HttpServletRequest request,
  114 + @RequestParam(value = "uri") String uri,
  115 + @RequestParam(value = "puri") String puri,
  116 + @RequestParam(value = "name") String name,
  117 + @RequestParam(value = "type") String type,
  118 + @RequestParam(value = "icon") String icon) {
  119 + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) {
  120 + ResultUtils.buildParameterErrorResultAndWrite(response);
  121 + return;
  122 + }
  123 +
  124 + //获取登录用户
  125 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  126 + Users users = usersService.getUsers(loginState.getId());
  127 +
  128 + Permissions2 permissions = new Permissions2();
  129 + permissions.setUri(uri);
  130 + permissions.setPuri(puri);
  131 + permissions.setName(name);
  132 + permissions.setType(type);
  133 + permissions.setIcon(icon);
  134 +
  135 + permissions.setYn(YnEnums.YES.getId());
  136 + permissions2Service.addPermissions2(permissions);
  137 + ResultUtils.buildSuccessResultAndWrite(response);
  138 + }
  139 +
  140 + /**
  141 + * 权限修改
  142 + */
  143 + @RequestMapping(value = "/permissions/{id}", method = RequestMethod.PUT)
  144 + @TokenRequired
  145 + public void updatePermissions(HttpServletResponse response,
  146 + @PathVariable Integer id,
  147 + @RequestParam(value = "uri") String uri,
  148 + @RequestParam(value = "puri") String puri,
  149 + @RequestParam(value = "name") String name,
  150 + @RequestParam(value = "type") String type,
  151 + @RequestParam(value = "icon") String icon) {
  152 +
  153 + Permissions2 permissions = permissions2Service.getPermissions2(id);
  154 +
  155 + if (permissions == null) {
  156 + new BusinessException("", "根据id获取信息不存在");
  157 + return;
  158 + }
  159 +
  160 + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) {
  161 + ResultUtils.buildParameterErrorResultAndWrite(response);
  162 + return;
  163 + }
  164 + permissions.setUri(uri);
  165 + permissions.setPuri(puri);
  166 + permissions.setName(name);
  167 + permissions.setType(type);
  168 + permissions.setIcon(icon);
  169 + permissions.setYn(YnEnums.YES.getId());
  170 +
  171 + permissions2Service.updatePermissions2(permissions);
  172 + ResultUtils.buildSuccessResultAndWrite(response);
  173 + }
  174 +
  175 + /**
  176 + * 删除权限
  177 + */
  178 + @RequestMapping(value = "/permissions/{id}", method = RequestMethod.DELETE)
  179 + @TokenRequired
  180 + public void deletePermissions(HttpServletResponse response, @PathVariable(value = "id") String id) {
  181 + if (StringUtils.isEmpty(id)) {
  182 + ResultUtils.buildIdIsNull(response);
  183 + return;
  184 + }
  185 + Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(id));
  186 + if (permissions == null) {
  187 + ResultUtils.buildIdResultData(response);
  188 + return;
  189 + }
  190 + permissions.setYn(YnEnums.NO.getId());
  191 + permissions2Service.updatePermissions2(permissions);
  192 +
  193 + ResultUtils.buildSuccessResultAndWrite(response);
  194 + }
195 195  
196 196 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 7ace67f
... ... @@ -44,7 +44,7 @@
44 44 @Autowired
45 45 private RolePermissionMapsService rolePermissionMapsService;
46 46 @Autowired
47   - private PermissionsService permissions2Service;
  47 + private Permissions2Service permissions2Service;
48 48 @Autowired
49 49 private UserRoleMapsService userRoleMapsService;
50 50 @Autowired
... ... @@ -88,7 +88,7 @@
88 88 for (String tmp : roleArrayIds) {
89 89  
90 90  
91   - Permissions permissions = permissions2Service.getPermissions(Integer.valueOf(tmp));
  91 + Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(tmp));
92 92 //权限是否存在
93 93 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) {
94 94 continue;
... ... @@ -421,7 +421,7 @@
421 421 }
422 422 }
423 423  
424   - List<Permissions> permissionses;
  424 + List<Permissions2> permissionses;
425 425 for (Roles roles1 : rolesList) {
426 426 permissionses = permissions2Service.queryPermissionByRoleIds1(roles1.getId());
427 427  
... ... @@ -487,7 +487,7 @@
487 487  
488 488 List<Roles> roles = rolesService.queryRoles(rolesQuery);
489 489  
490   - List<Permissions> permissionses = null;
  490 + List<Permissions2> permissionses = null;
491 491 for (Roles roles1 : roles) {
492 492 /*permissionses = new ArrayList<>();
493 493 RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 7ace67f
... ... @@ -63,7 +63,7 @@
63 63 @Autowired
64 64 private RolePermissionMapsService rolePermissionMapsService;
65 65 @Autowired
66   - private PermissionsService permissions2Service;
  66 + private Permissions2Service permissions2Service;
67 67 @Autowired
68 68 private AccessPermissionFacade accessPermissionFacade;
69 69 @Autowired
... ... @@ -361,7 +361,7 @@
361 361 users = usersService.getUsers(loginContext.getId());
362 362 }
363 363  
364   - List<Permissions> permissions = null;
  364 + List<Permissions2> permissions = null;
365 365 List<Roles> roles = new ArrayList<>();
366 366 //超级管理员拥有所有角色和权限
367 367 if(users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) {
368 368  
... ... @@ -369,9 +369,9 @@
369 369 rolesQuery.setYn(YnEnums.YES.getId());
370 370 roles = rolesService.queryRoles(rolesQuery);
371 371  
372   - PermissionsQuery permissionsQuery = new PermissionsQuery();
  372 + Permissions2Query permissionsQuery = new Permissions2Query();
373 373 permissionsQuery.setYn(YnEnums.YES.getId());
374   - permissions = permissions2Service.queryPermissions(permissionsQuery);
  374 + permissions = permissions2Service.queryPermissions2(permissionsQuery);
375 375  
376 376  
377 377 }
378 378  
... ... @@ -407,9 +407,9 @@
407 407 }
408 408 }*/
409 409 }
410   - List<Permissions> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses);
  410 + List<Permissions2> local = permissions2Service.queryPermissionByRoleIds(userRoleMapses);
411 411 if(CollectionUtils.isNotEmpty(local)){
412   - for(Permissions permissions1:local){
  412 + for(Permissions2 permissions1:local){
413 413 if(!permissionIds.contains(permissions1.getId())) {
414 414 permissionIds.add(permissions1.getId());
415 415 permissions.add(permissions1);