diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java index 638f3a8..b57a244 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Roles.java @@ -36,13 +36,13 @@ public class Roles { this.orgId = orgId; } - private List permissions; + private List permissions; - public List getPermissions() { + public List getPermissions() { return permissions; } - public void setPermissions(List permissions) { + public void setPermissions(List permissions) { this.permissions = permissions; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java index e59267e..afae59e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java @@ -35,7 +35,7 @@ import java.util.*; public class PermissionsController extends BaseController { @Autowired - private Permissions2Service permissions2Service; + private PermissionsService permissions2Service; @Autowired private UsersService usersService; @@ -65,7 +65,7 @@ public class PermissionsController extends BaseController { @RequestParam(value = "id", required = false) Integer id, @RequestParam(value = "page",required = false) Integer page, @RequestParam(value = "limit",required = false) Integer limit) { - Permissions2Query permissionsQuery = new Permissions2Query(); + PermissionsQuery permissionsQuery = new PermissionsQuery(); page = null == page ? 1 : page; limit = null == limit ? 10 : limit; permissionsQuery.setNeed("true"); @@ -74,123 +74,123 @@ public class PermissionsController extends BaseController { permissionsQuery.setLimit(limit); permissionsQuery.setYn(YnEnums.YES.getId()); - List permissionses = permissions2Service.queryPermissions2(permissionsQuery); + List permissionses = permissions2Service.queryPermissions(permissionsQuery); ResultUtils.buildSuccessResultAndWrite(response, permissionses); } - - - @TokenRequired - @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET) - @ResponseBody - public List getAccessPermission(){ - List> list = new ArrayList<>(); - for(PermissionTypeEnums permissionTypeEnums:PermissionTypeEnums.values()){ - Map data = new HashMap(); - data.put("id",permissionTypeEnums.getId()); - data.put("title",permissionTypeEnums.getTitle()); - list.add(data); - } - return list; - } - - @TokenRequired - @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST) - @ResponseBody - public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){ - return accessPermissionFacade.addAccessPermission(accessPermissionAddRequest); - } - - - - /** - * 新增权限 - * name; - */ - @RequestMapping(value = "/permissions", method = RequestMethod.POST) - @TokenRequired - public void addPermissions(HttpServletResponse response, HttpServletRequest request, - @RequestParam(value = "uri") String uri, - @RequestParam(value = "puri") String puri, - @RequestParam(value = "name") String name, - @RequestParam(value = "type") String type, - @RequestParam(value = "icon") String icon) { - if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) { - ResultUtils.buildParameterErrorResultAndWrite(response); - return; - } - - //获取登录用户 - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - Users users = usersService.getUsers(loginState.getId()); - - Permissions2 permissions = new Permissions2(); - permissions.setUri(uri); - permissions.setPuri(puri); - permissions.setName(name); - permissions.setType(type); - permissions.setIcon(icon); - - permissions.setYn(YnEnums.YES.getId()); - permissions2Service.addPermissions2(permissions); - ResultUtils.buildSuccessResultAndWrite(response); - } - - /** - * 权限修改 - */ - @RequestMapping(value = "/permissions/{id}", method = RequestMethod.PUT) - @TokenRequired - public void updatePermissions(HttpServletResponse response, - @PathVariable Integer id, - @RequestParam(value = "uri") String uri, - @RequestParam(value = "puri") String puri, - @RequestParam(value = "name") String name, - @RequestParam(value = "type") String type, - @RequestParam(value = "icon") String icon) { - - Permissions2 permissions = permissions2Service.getPermissions2(id); - - if (permissions == null) { - new BusinessException("", "根据id获取信息不存在"); - return; - } - - if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) { - ResultUtils.buildParameterErrorResultAndWrite(response); - return; - } - permissions.setUri(uri); - permissions.setPuri(puri); - permissions.setName(name); - permissions.setType(type); - permissions.setIcon(icon); - permissions.setYn(YnEnums.YES.getId()); - - permissions2Service.updatePermissions2(permissions); - ResultUtils.buildSuccessResultAndWrite(response); - } - - /** - * 删除权限 - */ - @RequestMapping(value = "/permissions/{id}", method = RequestMethod.DELETE) - @TokenRequired - public void deletePermissions(HttpServletResponse response, @PathVariable(value = "id") String id) { - if (StringUtils.isEmpty(id)) { - ResultUtils.buildIdIsNull(response); - return; - } - Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(id)); - if (permissions == null) { - ResultUtils.buildIdResultData(response); - return; - } - permissions.setYn(YnEnums.NO.getId()); - permissions2Service.updatePermissions2(permissions); - - ResultUtils.buildSuccessResultAndWrite(response); - } +// +// +// @TokenRequired +// @RequestMapping(value = "/accesspermissions", method = RequestMethod.GET) +// @ResponseBody +// public List getAccessPermission(){ +// List> list = new ArrayList<>(); +// for(PermissionTypeEnums permissionTypeEnums:PermissionTypeEnums.values()){ +// Map data = new HashMap(); +// data.put("id",permissionTypeEnums.getId()); +// data.put("title",permissionTypeEnums.getTitle()); +// list.add(data); +// } +// return list; +// } +// +// @TokenRequired +// @RequestMapping(value = "/accesspermissions", method = RequestMethod.POST) +// @ResponseBody +// public BaseResponse addDataAccessPermission(@Valid AccessPermissionAddRequest accessPermissionAddRequest){ +// return accessPermissionFacade.addAccessPermission(accessPermissionAddRequest); +// } +// +// +// +// /** +// * 新增权限 +// * name; +// */ +// @RequestMapping(value = "/permissions", method = RequestMethod.POST) +// @TokenRequired +// public void addPermissions(HttpServletResponse response, HttpServletRequest request, +// @RequestParam(value = "uri") String uri, +// @RequestParam(value = "puri") String puri, +// @RequestParam(value = "name") String name, +// @RequestParam(value = "type") String type, +// @RequestParam(value = "icon") String icon) { +// if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) { +// ResultUtils.buildParameterErrorResultAndWrite(response); +// return; +// } +// +// //获取登录用户 +// LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); +// Users users = usersService.getUsers(loginState.getId()); +// +// Permissions2 permissions = new Permissions2(); +// permissions.setUri(uri); +// permissions.setPuri(puri); +// permissions.setName(name); +// permissions.setType(type); +// permissions.setIcon(icon); +// +// permissions.setYn(YnEnums.YES.getId()); +// permissions2Service.addPermissions2(permissions); +// ResultUtils.buildSuccessResultAndWrite(response); +// } +// +// /** +// * 权限修改 +// */ +// @RequestMapping(value = "/permissions/{id}", method = RequestMethod.PUT) +// @TokenRequired +// public void updatePermissions(HttpServletResponse response, +// @PathVariable Integer id, +// @RequestParam(value = "uri") String uri, +// @RequestParam(value = "puri") String puri, +// @RequestParam(value = "name") String name, +// @RequestParam(value = "type") String type, +// @RequestParam(value = "icon") String icon) { +// +// Permissions2 permissions = permissions2Service.getPermissions2(id); +// +// if (permissions == null) { +// new BusinessException("", "根据id获取信息不存在"); +// return; +// } +// +// if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) { +// ResultUtils.buildParameterErrorResultAndWrite(response); +// return; +// } +// permissions.setUri(uri); +// permissions.setPuri(puri); +// permissions.setName(name); +// permissions.setType(type); +// permissions.setIcon(icon); +// permissions.setYn(YnEnums.YES.getId()); +// +// permissions2Service.updatePermissions2(permissions); +// ResultUtils.buildSuccessResultAndWrite(response); +// } +// +// /** +// * 删除权限 +// */ +// @RequestMapping(value = "/permissions/{id}", method = RequestMethod.DELETE) +// @TokenRequired +// public void deletePermissions(HttpServletResponse response, @PathVariable(value = "id") String id) { +// if (StringUtils.isEmpty(id)) { +// ResultUtils.buildIdIsNull(response); +// return; +// } +// Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(id)); +// if (permissions == null) { +// ResultUtils.buildIdResultData(response); +// return; +// } +// permissions.setYn(YnEnums.NO.getId()); +// permissions2Service.updatePermissions2(permissions); +// +// ResultUtils.buildSuccessResultAndWrite(response); +// } } \ 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 df10628..7acf8bf 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 @@ -44,7 +44,7 @@ public class RolesController extends BaseController { @Autowired private RolePermissionMapsService rolePermissionMapsService; @Autowired - private Permissions2Service permissions2Service; + private PermissionsService permissions2Service; @Autowired private UserRoleMapsService userRoleMapsService; @Autowired @@ -88,7 +88,7 @@ public class RolesController extends BaseController { for (String tmp : roleArrayIds) { - Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(tmp)); + Permissions permissions = permissions2Service.getPermissions(Integer.valueOf(tmp)); //权限是否存在 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) { continue; @@ -421,7 +421,7 @@ public class RolesController extends BaseController { } } - List permissionses; + List permissionses; for (Roles roles1 : rolesList) { permissionses = permissions2Service.queryPermissionByRoleIds1(roles1.getId()); @@ -487,7 +487,7 @@ public class RolesController extends BaseController { List roles = rolesService.queryRoles(rolesQuery); - List permissionses = null; + List permissionses = null; for (Roles roles1 : roles) { /*permissionses = new ArrayList<>(); RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index 89bd85a..dba5d25 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -63,7 +63,7 @@ public class UsersController extends BaseController { @Autowired private RolePermissionMapsService rolePermissionMapsService; @Autowired - private Permissions2Service permissions2Service; + private PermissionsService permissions2Service; @Autowired private AccessPermissionFacade accessPermissionFacade; @Autowired @@ -361,7 +361,7 @@ public class UsersController extends BaseController { users = usersService.getUsers(loginContext.getId()); } - List permissions = null; + List permissions = null; List roles = new ArrayList<>(); //超级管理员拥有所有角色和权限 if(users.getType().equals(UserTypeEnum.SUPPER_ADMIN.getId())) { @@ -369,9 +369,9 @@ public class UsersController extends BaseController { rolesQuery.setYn(YnEnums.YES.getId()); roles = rolesService.queryRoles(rolesQuery); - Permissions2Query permissionsQuery = new Permissions2Query(); + PermissionsQuery permissionsQuery = new PermissionsQuery(); permissionsQuery.setYn(YnEnums.YES.getId()); - permissions = permissions2Service.queryPermissions2(permissionsQuery); + permissions = permissions2Service.queryPermissions(permissionsQuery); } @@ -407,9 +407,9 @@ public class UsersController extends BaseController { } }*/ } - List local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); + List local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); if(CollectionUtils.isNotEmpty(local)){ - for(Permissions2 permissions1:local){ + for(Permissions permissions1:local){ if(!permissionIds.contains(permissions1.getId())) { permissionIds.add(permissions1.getId()); permissions.add(permissions1);