user/role/tright 6.15

src/main/java/com/pangding/web/authority/controller/AuthorityController.java

@@ -5,6 +5,7 @@ import com.pangding.web.authority.service.AuthorityService;
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
+import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityResVo;
 import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.yanzuoguang.util.helper.CheckerHelper;
@@ -34,7 +35,7 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/save", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<List<AuthorityListByLevelResVo>> saveAuthority(@RequestBody AuthorityVo authorityVo){
+    public ResponseResult<AuthorityListResVo> saveAuthority(@RequestBody AuthorityVo authorityVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("authorityName",authorityVo.getName())
                 .notBlankCheck("type",authorityVo.getType())
@@ -53,7 +54,7 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/update", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<List<AuthorityListByLevelResVo>> updateAuthority(@RequestBody AuthorityVo authorityVo){
+    public ResponseResult<AuthorityListResVo> updateAuthority(@RequestBody AuthorityVo authorityVo){
         CheckerHelper.newInstance()
                 .notBlankCheck("authorityName",authorityVo.getName())
                 .notBlankCheck("type",authorityVo.getType())
@@ -89,7 +90,7 @@ public class AuthorityController {
      * @return
      */
     @RequestMapping(value = "/listByLevel", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public ResponseResult<List<AuthorityListByLevelResVo>> listByLevel(@RequestBody AuthorityListReqVo reqVo){
+    public ResponseResult<AuthorityListResVo> listByLevel(@RequestBody AuthorityListReqVo reqVo){
         return ResponseResult.result(authorityServiceImpl.getListByLevel(reqVo));
     }
 

src/main/java/com/pangding/web/authority/service/AuthorityService.java

@@ -3,6 +3,7 @@ package com.pangding.web.authority.service;
 import com.pangding.web.authority.vo.AuthorityVo;
 import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
+import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityResVo;
 import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.yanzuoguang.util.vo.PageSizeData;
@@ -19,7 +20,7 @@ public interface AuthorityService {
      * @param authorityVo authorityVo对象
      * @return 用户id
      */
-    List<AuthorityListByLevelResVo> save(AuthorityVo authorityVo);
+    AuthorityListResVo save(AuthorityVo authorityVo);
 
     /**
      * 更新authorityVo对象数据
@@ -27,7 +28,7 @@ public interface AuthorityService {
      * @param authorityVo authorityVo对象
      * @return 用户id
      */
-    List<AuthorityListByLevelResVo> update(AuthorityVo authorityVo);
+    AuthorityListResVo update(AuthorityVo authorityVo);
 
     /**
      * 通过权限表主键获取authorityVo对象
@@ -68,7 +69,7 @@ public interface AuthorityService {
      */
     List<AuthorityVo> getAuthorityList(AuthorityListReqVo reqVo);
 
-    List<AuthorityListByLevelResVo> getListByLevel(AuthorityListReqVo reqVo);
+    AuthorityListResVo getListByLevel(AuthorityListReqVo reqVo);
 
     List<AuthorityListByLevelResVo> getCompanyAuthority(CompanyAuthorityReqVo reqVo);
 

src/main/java/com/pangding/web/authority/service/impl/AuthorityServiceImpl.java

@@ -9,6 +9,7 @@ import com.pangding.web.authority.vo.reqvo.*;
 import com.pangding.web.authority.service.AuthorityService;
 import com.pangding.web.authority.vo.*;
 import com.pangding.web.authority.vo.resvo.AuthorityListByLevelResVo;
+import com.pangding.web.authority.vo.resvo.AuthorityListResVo;
 import com.pangding.web.authority.vo.resvo.AuthorityResVo;
 import com.pangding.web.authority.vo.resvo.WebAuthorityResVo;
 import com.yanzuoguang.util.base.ObjectHelper;
@@ -45,7 +46,7 @@ public class AuthorityServiceImpl implements AuthorityService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<AuthorityListByLevelResVo> save(AuthorityVo authorityVo) {
+    public AuthorityListResVo save(AuthorityVo authorityVo) {
         /*this.checkValid(authorityVo);*/
         if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
             authorityVo.setPid("");
@@ -106,7 +107,7 @@ public class AuthorityServiceImpl implements AuthorityService {
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public List<AuthorityListByLevelResVo> update(AuthorityVo authorityVo) {
+    public AuthorityListResVo update(AuthorityVo authorityVo) {
         /*this.checkValid(authorityVo);*/
         if (null == authorityVo.getPid() || authorityVo.getPid().isEmpty()){
             authorityVo.setPid("");
@@ -246,7 +247,7 @@ public class AuthorityServiceImpl implements AuthorityService {
     }
 
     @Override
-    public List<AuthorityListByLevelResVo> getListByLevel(AuthorityListReqVo reqVo) {
+    public AuthorityListResVo getListByLevel(AuthorityListReqVo reqVo) {
         List<AuthorityVo> parentList = authorityDao.getLevelOne(reqVo);
         if (null == parentList || parentList.isEmpty()){
             throw new CodeException("暂无一级权限，请添加");
@@ -259,7 +260,26 @@ public class AuthorityServiceImpl implements AuthorityService {
             resVo.setChildList(childList);
             resVoList.add(resVo);
         }
-        return resVoList;
+
+        /*返回对象*/
+        AuthorityListResVo authorityListResVo = new AuthorityListResVo();
+        authorityListResVo.setAuthorityListByLevel(resVoList);
+
+        /*若roleId存在，则需要返回该角色拥有的权限列表*/
+        if (null != reqVo.getRoleId() && !reqVo.getRoleId().isEmpty()){
+            RoleAuthorityGetReqVo roleAuthorityGetReqVo = new RoleAuthorityGetReqVo();
+            roleAuthorityGetReqVo.setRoleId(reqVo.getRoleId());
+            List<RoleAuthorityVo> roleAuthorityVoList = roleAuthorityDao.loadList(roleAuthorityGetReqVo,RoleAuthorityVo.class);
+            List<String> authorityIdList = new ArrayList<>();
+            if (null != roleAuthorityVoList && !roleAuthorityVoList.isEmpty()){
+                for (RoleAuthorityVo roleAuthorityVo:roleAuthorityVoList) {
+                    authorityIdList.add(roleAuthorityVo.getAuthorityId());
+                }
+            }
+            authorityListResVo.setAuthorityListByRole(authorityIdList);
+        }
+
+        return authorityListResVo;
     }
 
     private List<AuthorityListByLevelResVo> getChildList(String id){

src/main/java/com/pangding/web/authority/vo/reqvo/AuthorityListReqVo.java

@@ -9,6 +9,16 @@ public class AuthorityListReqVo {
 
     private String levelOne;
 
+    private String roleId;
+
+    public String getRoleId() {
+        return roleId;
+    }
+
+    public void setRoleId(String roleId) {
+        this.roleId = roleId;
+    }
+
     public String getLevelOne() {
         return levelOne;
     }

src/main/java/com/pangding/web/authority/vo/resvo/AuthorityListResVo.java

+package com.pangding.web.authority.vo.resvo;
+
+import java.util.List;
+
+/**
+ * @Author zhangjinyao
+ * @create 2019/6/15 17:43
+ */
+public class AuthorityListResVo {
+    private List<AuthorityListByLevelResVo> authorityListByLevel;
+
+    private List<String> authorityListByRole;
+
+    public List<AuthorityListByLevelResVo> getAuthorityListByLevel() {
+        return authorityListByLevel;
+    }
+
+    public void setAuthorityListByLevel(List<AuthorityListByLevelResVo> authorityListByLevel) {
+        this.authorityListByLevel = authorityListByLevel;
+    }
+
+    public List<String> getAuthorityListByRole() {
+        return authorityListByRole;
+    }
+
+    public void setAuthorityListByRole(List<String> authorityListByRole) {
+        this.authorityListByRole = authorityListByRole;
+    }
+}