From 231171b6c8f3daf8d01b8c429971c10e09ea69ad Mon Sep 17 00:00:00 2001
From: tiger_zhou <123456>
Date: Fri, 21 Oct 2022 17:14:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=9D=83=E9=99=90=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=9F=A5=E7=9C=8B=E5=B7=B2=E5=BE=88=E9=85=8D=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96=E7=9A=84=E6=9D=83=E9=99=90=EF=BC=8C=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=9C=A8=E5=88=9B=E5=BB=BA=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=E5=8F=8A=E6=9C=89=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PermissionSubjectController.java          | 16 +++++++++++++
 .../dao/permission/PermissionSubjectDAO.java  | 23 +++++++++++++++----
 .../paper/PaperUserCreateService.java         |  1 +
 .../permission/PermissionSubjectService.java  | 22 +++++++++++++++---
 .../subject/PermissionSubjectVO.java          |  3 +++
 5 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/src/main/java/club/joylink/rtss/controller/permission2/PermissionSubjectController.java b/src/main/java/club/joylink/rtss/controller/permission2/PermissionSubjectController.java
index b743f44d8..814a680b2 100644
--- a/src/main/java/club/joylink/rtss/controller/permission2/PermissionSubjectController.java
+++ b/src/main/java/club/joylink/rtss/controller/permission2/PermissionSubjectController.java
@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 主体(用户或组织)的权限管理接口V2<br>
  */
@@ -29,8 +31,22 @@ public class PermissionSubjectController {
         return this.subjectService.page(req);
     }
 
+    /**
+     * 用户权限失效设置
+     * @param subjectId
+     */
     @GetMapping(path = "/inValid/{subjectId}")
     public void statusForInValid(@PathVariable Long subjectId){
         this.subjectService.subjectAndDistributeStatusForInValid(subjectId);
     }
+
+    /**
+     * 查看用户分发的下级所有用户权限
+     * @param subjectId
+     */
+    @GetMapping(path = "/distribute/{subjectId}")
+    public List<PermissionSubjectVO> distributePermission(@PathVariable Long subjectId){
+        List<PermissionSubjectVO> list = this.subjectService.findDistributePermission(subjectId);
+        return list;
+    }
 }
diff --git a/src/main/java/club/joylink/rtss/dao/permission/PermissionSubjectDAO.java b/src/main/java/club/joylink/rtss/dao/permission/PermissionSubjectDAO.java
index c9faf494c..cb1de5ed5 100644
--- a/src/main/java/club/joylink/rtss/dao/permission/PermissionSubjectDAO.java
+++ b/src/main/java/club/joylink/rtss/dao/permission/PermissionSubjectDAO.java
@@ -1,7 +1,5 @@
 package club.joylink.rtss.dao.permission;
 
-import java.util.List;
-
 import club.joylink.rtss.entity.permission.PermissionSubject;
 import club.joylink.rtss.entity.permission.PermissionSubjectExample;
 import club.joylink.rtss.vo.permission.subject.PermissionSubjectQueryVO;
@@ -9,14 +7,31 @@ import club.joylink.rtss.vo.permission.subject.PermissionSubjectVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Mapper
 @Repository
 public interface PermissionSubjectDAO {
 
-
+    @Select("<script>" +
+            "select A.id,A.subject_type,A.subject_id, " +
+            "(case when A.subject_type = 'user' then C.name when A.subject_type = 'org' then D.name end)  as named," +
+            "(case when A.subject_type = 'user' then C.nickname else '' end)  as nick_name," +
+            "B.name as permission_name,A.permission_id " +
+            " from rts_permission_subject A left join rts_permission B on A.permission_id = B.id" +
+            " left join sys_account C on  A.subject_type = 'user' and A.subject_id = C.id " +
+            " left join org D on A.subject_type = 'org' and A.subject_id = C.id " +
+            " where 1 = 1 and A.parent_id in " +
+            "<if test=\"idList != null and idList.size > 0\"> " +
+            "   <foreach collection=\"lable\" open=\"(\" close=\")\" item=\"d\" separator=\" , \"> "+
+            "       #{d}"+
+            "   </foreach>" +
+            "</if> " +
+            "order by id asc" +
+            "</script>")
+    List<PermissionSubjectVO> findDistributePermission(List<Long> idList);
 /*    @Select("<script>" +
             "select t4.* from " +
             "(" +
diff --git a/src/main/java/club/joylink/rtss/services/paper/PaperUserCreateService.java b/src/main/java/club/joylink/rtss/services/paper/PaperUserCreateService.java
index 2124b20b0..7e8fa5172 100644
--- a/src/main/java/club/joylink/rtss/services/paper/PaperUserCreateService.java
+++ b/src/main/java/club/joylink/rtss/services/paper/PaperUserCreateService.java
@@ -80,6 +80,7 @@ public class PaperUserCreateService {
         paper.setPcId(pcId);
         paper.setOrgId(orgId);
         paper.setCreateTime(LocalDateTime.now());
+        paper.setStartTime(LocalDateTime.now());
         paperUserDAO.insertSelective(paper);
         paper = paperUserService.findByUserIdAndPcId(user.getId(), pcId);
         //
diff --git a/src/main/java/club/joylink/rtss/services/permission/PermissionSubjectService.java b/src/main/java/club/joylink/rtss/services/permission/PermissionSubjectService.java
index 04b6f8d03..55b15100a 100644
--- a/src/main/java/club/joylink/rtss/services/permission/PermissionSubjectService.java
+++ b/src/main/java/club/joylink/rtss/services/permission/PermissionSubjectService.java
@@ -39,7 +39,7 @@ public class PermissionSubjectService {
     public PageVO<PermissionSubjectVO> page(PermissionSubjectQueryVO queryVO){
         PageHelper.startPage(queryVO.getPageNum(),queryVO.getPageSize());
         Page<PermissionSubjectVO> page = (Page<PermissionSubjectVO>) this.subjectDAO.customerQuery(queryVO);
-        List<Long> permissionList = page.getResult().stream().filter(Objects::nonNull).map(PermissionSubjectVO::getPermissionId).collect(Collectors.toList());
+        List<Long> permissionList = page.getResult().stream().map(PermissionSubjectVO::getPermissionId).filter(Objects::nonNull).collect(Collectors.toList());
         List<PermissionSystemAbilityVO> abilityVOList = this.systemAbilityService.findSystemAbilityByPermissionId(permissionList);
         Map<Long,List<PermissionSystemAbilityVO>> permissionMapList = abilityVOList.stream().collect(Collectors.groupingBy(PermissionSystemAbilityVO::getPermissionId));
         for (PermissionSubjectVO subjectVO : page.getResult()) {
@@ -53,15 +53,15 @@ public class PermissionSubjectService {
 
     public PermissionSubject findById(Long subjectId){
         PermissionSubject ps = this.subjectDAO.selectByPrimaryKey(subjectId);
-        BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(ps),"");
+        BusinessExceptionAssertEnum.DATA_NOT_EXIST.assertTrue(Objects.nonNull(ps),"未找到对应的数据");
         return ps;
     }
 
 
     @Transactional
     public void subjectAndDistributeStatusForInValid(Long subjectId){
-        List<PermissionSubject> allList = Lists.newArrayList();
         PermissionSubject ps = this.findById(subjectId);
+        List<PermissionSubject> allList = Lists.newArrayList();
         allList.add(ps);
         if(Objects.equals(ps.getSubjectType(),PermissionSubjectTypeEnum.user.name())){
             this.circleFindChildSubject(allList, Arrays.asList(ps.getId()));
@@ -82,11 +82,27 @@ public class PermissionSubjectService {
     private void circleFindChildSubject(List<PermissionSubject> subjectList,List<Long> ids){
         PermissionSubjectExample example = new PermissionSubjectExample();
         example.createCriteria().andParentIdIn(ids);
+        example.setOrderByClause(" id desc");
         List<PermissionSubject> list = this.subjectDAO.selectByExample(example);
+
         if(!CollectionUtils.isEmpty(list)){
             subjectList.addAll(list);
             List<Long> childIdList = list.stream().map(PermissionSubject::getId).collect(Collectors.toList());
             this.circleFindChildSubject(subjectList,childIdList);
         }
     }
+
+    public List<PermissionSubjectVO> findDistributePermission(Long subjectId){
+        PermissionSubject ps = this.findById(subjectId);
+        List<PermissionSubjectVO> voList = Lists.newArrayList();
+        this.distributePermission(voList,Arrays.asList(ps.getId()));
+        return voList;
+    }
+
+    private void distributePermission(List<PermissionSubjectVO> lists,List<Long> ids){
+        List<PermissionSubjectVO> voList = this.subjectDAO.findDistributePermission(ids);
+        if(!CollectionUtils.isEmpty(voList)){
+            lists.addAll(voList);
+        }
+    }
 }
diff --git a/src/main/java/club/joylink/rtss/vo/permission/subject/PermissionSubjectVO.java b/src/main/java/club/joylink/rtss/vo/permission/subject/PermissionSubjectVO.java
index 3b8ef0cb8..a9d58f54d 100644
--- a/src/main/java/club/joylink/rtss/vo/permission/subject/PermissionSubjectVO.java
+++ b/src/main/java/club/joylink/rtss/vo/permission/subject/PermissionSubjectVO.java
@@ -28,6 +28,9 @@ public class PermissionSubjectVO {
      * 用户昵称
      */
     private String nickName;
+    /**
+     * 重量权限数
+     */
     private Integer amount;
     /**
      * 主体对该权限的剩余数量