From ddb5b306808c4f21d93fcc4b28bc34affbb5203b Mon Sep 17 00:00:00 2001 From: zhangrui Date: Thu, 17 Nov 2016 17:05:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A1=A8=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=20=20=E6=9B=B4=E6=96=B0=E4=B8=BApermission2=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../permission/dao/master/Permissions2Mapper.java | 24 ++++ .../permission/dao/slave/Permissions2Mapper.java | 23 ++++ .../platform/permission/model/Permissions2.java | 115 ++++++++++++++++ .../permission/model/Permissions2Query.java | 119 ++++++++++++++++ .../com/lyms/platform/permission/model/Roles.java | 6 +- .../permission/service/Permissions2Service.java | 24 ++++ .../service/impl/Permissions2ServiceImpl.java | 65 +++++++++ .../main/resources/mainOrm/master/Permissions2.xml | 149 +++++++++++++++++++++ .../main/resources/mainOrm/slave/Permissions2.xml | 149 +++++++++++++++++++++ .../com/lyms/platform/common/utils/ExcelUtil.java | 12 +- .../web/controller/DepartmentsController.java | 2 - .../web/controller/PermissionsController.java | 78 +++++------ .../operate/web/controller/RolesController.java | 12 +- .../operate/web/controller/UsersController.java | 12 +- 14 files changed, 722 insertions(+), 68 deletions(-) create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/Permissions2Mapper.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/dao/slave/Permissions2Mapper.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2Query.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/Permissions2Service.java create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/Permissions2ServiceImpl.java create mode 100644 platform-biz-service/src/main/resources/mainOrm/master/Permissions2.xml create mode 100644 platform-biz-service/src/main/resources/mainOrm/slave/Permissions2.xml diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/Permissions2Mapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/Permissions2Mapper.java new file mode 100644 index 0000000..ab06312 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/Permissions2Mapper.java @@ -0,0 +1,24 @@ +package com.lyms.platform.permission.dao.master; + +import com.lyms.platform.permission.model.Permissions2; +import com.lyms.platform.permission.model.Permissions2Query; + +import java.util.List; + +public interface Permissions2Mapper { + public void addPermissions2(Permissions2 obj); + + public void updatePermissions2(Permissions2 obj); + + public void deletePermissions2(Integer id); + + public Permissions2 getPermissions2(Integer id); + + public int queryPermissions2Count(Permissions2Query query); + + public List queryPermissions2(Permissions2Query query); + List queryPermissionByRoleIds(List statusList); + + List queryPermissionByRoleIds1(Integer roleIds); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/slave/Permissions2Mapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/slave/Permissions2Mapper.java new file mode 100644 index 0000000..588b9ab --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/slave/Permissions2Mapper.java @@ -0,0 +1,23 @@ +package com.lyms.platform.permission.dao.slave; + +import com.lyms.platform.permission.model.Permissions2; +import com.lyms.platform.permission.model.Permissions2Query; + +import java.util.List; + +public interface Permissions2Mapper { + public void addPermissions2(Permissions2 obj); + + public void updatePermissions2(Permissions2 obj); + + public void deletePermissions2(Integer id); + + public Permissions2 getPermissions2(Integer id); + + public int queryPermissions2Count(Permissions2Query query); + + public List queryPermissions2(Permissions2Query query); + List queryPermissionByRoleIds(List statusList); + + List queryPermissionByRoleIds1(Integer roleIds); +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2.java new file mode 100644 index 0000000..2e7dc86 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2.java @@ -0,0 +1,115 @@ +package com.lyms.platform.permission.model; + +import java.sql.Timestamp; +import java.util.Date; + +public class Permissions2 { + private Integer id; + private String name; + private String uri; + private String type; + private String puri; + private String icon; + private Integer yn; + private Timestamp createDate; + private String createUser; + private Integer enable; + + public Integer getId() { + return id; + } + + + public void setId(Integer id) { + this.id = id; + + } + + public String getName() { + return name; + } + + + public void setName(String name) { + this.name = name; + + } + + public String getUri() { + return uri; + } + + + public void setUri(String uri) { + this.uri = uri; + + } + + public String getType() { + return type; + } + + + public void setType(String type) { + this.type = type; + + } + + public String getPuri() { + return puri; + } + + + public void setPuri(String puri) { + this.puri = puri; + + } + + public String getIcon() { + return icon; + } + + + public void setIcon(String icon) { + this.icon = icon; + + } + + public Integer getYn() { + return yn; + } + + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Timestamp getCreateDate() { + return createDate; + } + + public void setCreateDate(Timestamp createDate) { + this.createDate = createDate; + } + + public String getCreateUser() { + return createUser; + } + + + public void setCreateUser(String createUser) { + this.createUser = createUser; + + } + + public Integer getEnable() { + return enable; + } + + + public void setEnable(Integer enable) { + this.enable = enable; + + } +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2Query.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2Query.java new file mode 100644 index 0000000..cf9c49a --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Permissions2Query.java @@ -0,0 +1,119 @@ +package com.lyms.platform.permission.model; + + +import com.lyms.platform.common.dao.BaseQuery; + +import java.sql.Timestamp; +import java.util.Date; + + +public class Permissions2Query extends BaseQuery { + private Integer id; + private String name; + private String uri; + private String type; + private String puri; + private String icon; + private Integer yn; + private Timestamp createDate; + private String createUser; + private Integer enable; + + public Integer getId() { + return id; + } + + + public void setId(Integer id) { + this.id = id; + + } + + public String getName() { + return name; + } + + + public void setName(String name) { + this.name = name; + + } + + public String getUri() { + return uri; + } + + + public void setUri(String uri) { + this.uri = uri; + + } + + public String getType() { + return type; + } + + + public void setType(String type) { + this.type = type; + + } + + public String getPuri() { + return puri; + } + + + public void setPuri(String puri) { + this.puri = puri; + + } + + public String getIcon() { + return icon; + } + + + public void setIcon(String icon) { + this.icon = icon; + + } + + public Integer getYn() { + return yn; + } + + + public void setYn(Integer yn) { + this.yn = yn; + + } + + public Timestamp getCreateDate() { + return createDate; + } + + public void setCreateDate(Timestamp createDate) { + this.createDate = createDate; + } + + public String getCreateUser() { + return createUser; + } + + + public void setCreateUser(String createUser) { + this.createUser = createUser; + + } + + public Integer getEnable() { + return enable; + } + + + public void setEnable(Integer enable) { + this.enable = enable; + + } +} \ No newline at end of file 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 b57a244..638f3a8 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-biz-service/src/main/java/com/lyms/platform/permission/service/Permissions2Service.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/Permissions2Service.java new file mode 100644 index 0000000..48d5434 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/Permissions2Service.java @@ -0,0 +1,24 @@ +package com.lyms.platform.permission.service; + +import com.lyms.platform.permission.model.Permissions; +import com.lyms.platform.permission.model.Permissions2; +import com.lyms.platform.permission.model.Permissions2Query; + +import java.util.List; + +public interface Permissions2Service { + public void addPermissions2(Permissions2 obj); + + public void updatePermissions2(Permissions2 obj); + + public void deletePermissions2(Integer id); + + public Permissions2 getPermissions2(Integer id); + + public int queryPermissions2Count(Permissions2Query query); + + public List queryPermissions2(Permissions2Query query); + List queryPermissionByRoleIds(List roleIds); + List queryPermissionByRoleIds1(Integer roleIds); + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/Permissions2ServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/Permissions2ServiceImpl.java new file mode 100644 index 0000000..a9eac50 --- /dev/null +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/Permissions2ServiceImpl.java @@ -0,0 +1,65 @@ +package com.lyms.platform.permission.service.impl; + +import com.lyms.platform.permission.dao.master.Permissions2Mapper; +import com.lyms.platform.permission.model.Permissions2; +import com.lyms.platform.permission.model.Permissions2Query; +import com.lyms.platform.permission.service.Permissions2Service; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Service +public class Permissions2ServiceImpl implements Permissions2Service { + + @Autowired + private Permissions2Mapper permissions2Mapper; + + @Override + public void addPermissions2(Permissions2 obj) { + permissions2Mapper.addPermissions2(obj); + } + + @Override + public void updatePermissions2(Permissions2 obj) { + permissions2Mapper.updatePermissions2(obj); + } + + @Override + public void deletePermissions2(Integer id) { + permissions2Mapper.deletePermissions2(id); + } + + @Override + public Permissions2 getPermissions2(Integer id) { + return permissions2Mapper.getPermissions2(id); + } + + @Override + public int queryPermissions2Count(Permissions2Query query) { + return permissions2Mapper.queryPermissions2Count(query); + } + + @Override + public List queryPermissions2(Permissions2Query query) { + if (query.getNeed() != null) { + query.mysqlBuild(permissions2Mapper.queryPermissions2Count(query)); + } + return permissions2Mapper.queryPermissions2(query); + } + + public List queryPermissionByRoleIds(List roleIds) { + if (CollectionUtils.isEmpty(roleIds)) { + return Collections.emptyList(); + } + return permissions2Mapper.queryPermissionByRoleIds(roleIds); + } + + public List queryPermissionByRoleIds1(Integer roleIds) { + return permissions2Mapper.queryPermissionByRoleIds1(roleIds); + } + +} \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/Permissions2.xml b/platform-biz-service/src/main/resources/mainOrm/master/Permissions2.xml new file mode 100644 index 0000000..beaa58d --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/master/Permissions2.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + +insert into permissions2 (name,uri,type,puri,icon,yn,create_date,create_user,enable) values (#{name},#{uri},#{type},#{puri},#{icon},#{yn},#{createDate},#{createUser},#{enable}) + + + + + + update permissions2 + name = #{name,jdbcType=VARCHAR}, + + + uri = #{uri,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=VARCHAR}, + + + puri = #{puri,jdbcType=VARCHAR}, + + + icon = #{icon,jdbcType=VARCHAR}, + + + yn = #{yn,jdbcType=INTEGER}, + + + create_date = #{createDate,jdbcType=TIMESTAMP} + + + create_user = #{createUser,jdbcType=VARCHAR}, + + + enable = #{enable,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + + + delete from permissions2 where id = #{id,jdbcType=INTEGER} + + + + + + + + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + + and id = #{id,jdbcType=INTEGER} + + + and name = #{name,jdbcType=VARCHAR} + + + and uri = #{uri,jdbcType=VARCHAR} + + + and type = #{type,jdbcType=VARCHAR} + + + and puri = #{puri,jdbcType=VARCHAR} + + + and icon = #{icon,jdbcType=VARCHAR} + + + and yn = #{yn,jdbcType=INTEGER} + + + and create_date = #{createDate,jdbcType=TIMESTAMP} + + + and create_user = #{createUser,jdbcType=VARCHAR} + + + and enable = #{enable,jdbcType=INTEGER} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/slave/Permissions2.xml b/platform-biz-service/src/main/resources/mainOrm/slave/Permissions2.xml new file mode 100644 index 0000000..be6e17e --- /dev/null +++ b/platform-biz-service/src/main/resources/mainOrm/slave/Permissions2.xml @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + insert into permissions2 (name,uri,type,puri,icon,yn,create_date,create_user,enable) values (#{name},#{uri},#{type},#{puri},#{icon},#{yn},#{createDate},#{createUser},#{enable}) + + + + + + update permissions2 + name = #{name,jdbcType=VARCHAR}, + + + uri = #{uri,jdbcType=VARCHAR}, + + + type = #{type,jdbcType=VARCHAR}, + + + puri = #{puri,jdbcType=VARCHAR}, + + + icon = #{icon,jdbcType=VARCHAR}, + + + yn = #{yn,jdbcType=INTEGER}, + + + create_date = #{createDate,jdbcType=TIMESTAMP} + + + create_user = #{createUser,jdbcType=VARCHAR}, + + + enable = #{enable,jdbcType=INTEGER}, + + + where id = #{id,jdbcType=INTEGER} + + + + + delete from permissions2 where id = #{id,jdbcType=INTEGER} + + + + + + + + + + order by ${sort} + + limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER} + + + + + + + + + 1 = 1 + + and id = #{id,jdbcType=INTEGER} + + + and name = #{name,jdbcType=VARCHAR} + + + and uri = #{uri,jdbcType=VARCHAR} + + + and type = #{type,jdbcType=VARCHAR} + + + and puri = #{puri,jdbcType=VARCHAR} + + + and icon = #{icon,jdbcType=VARCHAR} + + + and yn = #{yn,jdbcType=INTEGER} + + + and create_date = #{createDate,jdbcType=TIMESTAMP} + + + and create_user = #{createUser,jdbcType=VARCHAR} + + + and enable = #{enable,jdbcType=INTEGER} + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java index 2ebbc71..759cd90 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/ExcelUtil.java @@ -23,15 +23,15 @@ import jxl.write.biff.RowsExceededException; /** * Excel 工具类 - * + * * @author lqy * */ public class ExcelUtil { - + static File from_file; - + static WritableWorkbook to_wwb; // 创建可写入workbook对象 public static OutputStream toChanExcel(OutputStream out, List> data, Map columName) @@ -110,7 +110,7 @@ public class ExcelUtil j++; } } - + wwb.write(); wwb.close(); } @@ -192,7 +192,7 @@ public class ExcelUtil } return out; } - - + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java index b9f8ad3..df0d9de 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java @@ -32,8 +32,6 @@ public class DepartmentsController extends BaseController { @Autowired private DepartmentsService departmentsService; @Autowired - private PermissionsService permissionsService; - @Autowired private UsersService usersService; @Autowired private TokenService tokenService; 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 529c8a2..e59267e 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 PermissionsService permissionsService; + private Permissions2Service 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) { - PermissionsQuery permissionsQuery = new PermissionsQuery(); + Permissions2Query permissionsQuery = new Permissions2Query(); page = null == page ? 1 : page; limit = null == limit ? 10 : limit; permissionsQuery.setNeed("true"); @@ -74,7 +74,7 @@ public class PermissionsController extends BaseController { permissionsQuery.setLimit(limit); permissionsQuery.setYn(YnEnums.YES.getId()); - List permissionses = permissionsService.queryPermissions(permissionsQuery); + List permissionses = permissions2Service.queryPermissions2(permissionsQuery); ResultUtils.buildSuccessResultAndWrite(response, permissionses); } @@ -106,18 +106,17 @@ public class PermissionsController extends BaseController { /** * 新增权限 + * name; */ @RequestMapping(value = "/permissions", method = RequestMethod.POST) @TokenRequired public void addPermissions(HttpServletResponse response, HttpServletRequest request, - @RequestParam(value = "url") String url, - @RequestParam(value = "moduleName") String moduleName, - @RequestParam(value = "functionName") String functionName, - @RequestParam(value = "permissionName") String permissionName, - @RequestParam(value = "action") String action, - @RequestParam(value = "ext", required = false) String ext, - @RequestParam(value = "weight") Integer weight) { - if (StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) { + @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; } @@ -126,22 +125,15 @@ public class PermissionsController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); Users users = usersService.getUsers(loginState.getId()); - Permissions permissions = new Permissions(); - - permissions.setType(TYPE); - permissions.setModuleName(moduleName); - permissions.setFunctionName(functionName); - permissions.setPermissionName(permissionName); - permissions.setAction(action); - permissions.setExt(ext); - permissions.setUrl(url); - permissions.setPublishId(users.getId()); - permissions.setPublishName(users.getName()); - permissions.setWeight(weight); + Permissions2 permissions = new Permissions2(); + permissions.setUri(uri); + permissions.setPuri(puri); + permissions.setName(name); + permissions.setType(type); + permissions.setIcon(icon); + permissions.setYn(YnEnums.YES.getId()); - permissions.setModified(new Date()); - permissions.setCreated(new Date()); - permissionsService.addPermissions(permissions); + permissions2Service.addPermissions2(permissions); ResultUtils.buildSuccessResultAndWrite(response); } @@ -152,34 +144,31 @@ public class PermissionsController extends BaseController { @TokenRequired public void updatePermissions(HttpServletResponse response, @PathVariable Integer id, - @RequestParam(value = "moduleName") String moduleName, - @RequestParam(value = "functionName") String functionName, - @RequestParam(value = "permissionName") String permissionName, - @RequestParam(value = "action") String action, - @RequestParam(value = "ext", required = false) String ext, - @RequestParam(value = "weight") Integer weight) { + @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) { - Permissions permissions = permissionsService.getPermissions(id); + Permissions2 permissions = permissions2Service.getPermissions2(id); if (permissions == null) { new BusinessException("", "根据id获取信息不存在"); return; } - if (id == null || StringUtils.isEmpty(moduleName) || StringUtils.isEmpty(functionName) || StringUtils.isEmpty(permissionName) || StringUtils.isEmpty(action)) { + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(name) || StringUtils.isEmpty(type)) { ResultUtils.buildParameterErrorResultAndWrite(response); return; } - permissions.setModuleName(moduleName); - permissions.setFunctionName(functionName); - permissions.setPermissionName(permissionName); - permissions.setAction(action); - permissions.setExt(ext); - permissions.setWeight(weight); + permissions.setUri(uri); + permissions.setPuri(puri); + permissions.setName(name); + permissions.setType(type); + permissions.setIcon(icon); permissions.setYn(YnEnums.YES.getId()); - permissions.setModified(new Date()); - permissionsService.updatePermissions(permissions); + permissions2Service.updatePermissions2(permissions); ResultUtils.buildSuccessResultAndWrite(response); } @@ -193,14 +182,13 @@ public class PermissionsController extends BaseController { ResultUtils.buildIdIsNull(response); return; } - Permissions permissions = permissionsService.getPermissions(Integer.valueOf(id)); + Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(id)); if (permissions == null) { ResultUtils.buildIdResultData(response); return; } permissions.setYn(YnEnums.NO.getId()); - permissions.setModified(new Date()); - permissionsService.updatePermissions(permissions); + permissions2Service.updatePermissions2(permissions); ResultUtils.buildSuccessResultAndWrite(response); } 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 1d0a014..df10628 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 PermissionsService permissionsService; + private Permissions2Service permissions2Service; @Autowired private UserRoleMapsService userRoleMapsService; @Autowired @@ -88,7 +88,7 @@ public class RolesController extends BaseController { for (String tmp : roleArrayIds) { - Permissions permissions = permissionsService.getPermissions(Integer.valueOf(tmp)); + Permissions2 permissions = permissions2Service.getPermissions2(Integer.valueOf(tmp)); //权限是否存在 if (permissions == null || permissions.getYn() == YnEnums.NO.getId()) { continue; @@ -421,9 +421,9 @@ public class RolesController extends BaseController { } } - List permissionses; + List permissionses; for (Roles roles1 : rolesList) { - permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId()); + permissionses = permissions2Service.queryPermissionByRoleIds1(roles1.getId()); /* RolePermissionMapsQuery rolePermissionMapsQuery = new RolePermissionMapsQuery(); rolePermissionMapsQuery.setYn(YnEnums.YES.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(); @@ -500,7 +500,7 @@ public class RolesController extends BaseController { if (permissions.getYn().equals(YnEnums.NO.getId())) continue; permissionses.add(permissions); }*/ - permissionses = permissionsService.queryPermissionByRoleIds1(roles1.getId()); + permissionses = permissions2Service.queryPermissionByRoleIds1(roles1.getId()); roles1.setPermissions(permissionses); } 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 5dfd981..89bd85a 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 PermissionsService permissionsService; + private Permissions2Service 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); - PermissionsQuery permissionsQuery = new PermissionsQuery(); + Permissions2Query permissionsQuery = new Permissions2Query(); permissionsQuery.setYn(YnEnums.YES.getId()); - permissions = permissionsService.queryPermissions(permissionsQuery); + permissions = permissions2Service.queryPermissions2(permissionsQuery); } @@ -407,9 +407,9 @@ public class UsersController extends BaseController { } }*/ } - List local = permissionsService.queryPermissionByRoleIds(userRoleMapses); + List local = permissions2Service.queryPermissionByRoleIds(userRoleMapses); if(CollectionUtils.isNotEmpty(local)){ - for(Permissions permissions1:local){ + for(Permissions2 permissions1:local){ if(!permissionIds.contains(permissions1.getId())) { permissionIds.add(permissions1.getId()); permissions.add(permissions1); -- 1.8.3.1