From dc09ced2a9dbca391ad9790728c073c12efff06e Mon Sep 17 00:00:00 2001
From: zhansihu <zhansihu@axzo.cn>
Date: Mon, 18 Sep 2023 18:16:46 +0800
Subject: [PATCH] =?UTF-8?q?feature(=E6=9D=83=E9=99=90=E7=82=B9):=20?=
 =?UTF-8?q?=E6=A0=91=E5=BD=A2=E6=9F=A5=E8=AF=A2=E6=94=AF=E6=8C=81=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=8F=82=E6=95=B0=E6=89=A9?=
 =?UTF-8?q?=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../permission/PermissionPointTreeNode.java   | 65 ++++++++++++++++++-
 .../PermissionPointTreeQueryReq.java          |  3 +
 .../impl/PermissionPointServiceImpl.java      |  3 +-
 .../permission/PermissionPointTest.java       |  1 +
 4 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
index fc9081c5..067a636e 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java
@@ -7,6 +7,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -68,9 +69,6 @@ public class PermissionPointTreeNode implements IBaseTree<PermissionPointTreeNod
     /** 小程序ID **/
     private String microAppItemId;
 
-    /** 下级节点 **/
-    private List<PermissionPointTreeNode> children;
-
     /**
      * 网关专属字段，所属应用
      */
@@ -81,6 +79,67 @@ public class PermissionPointTreeNode implements IBaseTree<PermissionPointTreeNod
      */
     private String featureUrl;
 
+    /**
+     * 创建人id
+     */
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateAt;
+
+    /**
+     * 修改人id
+     */
+    private Long updateBy;
+
+    private String legacyLayout;
+
+
+    /**
+     * 0:查看 1:操作
+     */
+    private Integer operateType;
+
+
+    /**
+     * 适用单位类型 1:总包 2:建设单位 4:监理单位 8:劳务分包 16:专业分包 32-班组
+     */
+    private List<Long> fitOuTypeList;
+
+    /**
+     * 适用节点类型 1:部门 2:班组 4:小组
+     */
+    private List<Long> fitOuNodeTypeList;
+
+    /**
+     * 是否认证 0:无需要认证 1:需要认证
+     */
+    private Boolean needCert;
+
+    /**
+     * 是否授权 0:无需要授权 1:需要授权
+     */
+    private Boolean needAuth;
+
+
+    /** 业务编码 **/
+    private String businessNo;
+
+    /**
+     * 父级业务id
+     */
+    private String parentBusinessNo;
+
+    /** 下级节点 **/
+    private List<PermissionPointTreeNode> children;
+
 
     @JsonIgnore
     @Override
diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
index 6f869369..d9e3ffc5 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeQueryReq.java
@@ -38,4 +38,7 @@ public class PermissionPointTreeQueryReq {
      * 1-工作台类型 2-工作台
      * **/
     private Integer maxLevel;
+
+    /** featureType 层级过滤-过滤掉featureType大于该值的数据 **/
+    private Integer maxFeatureType;
 }
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
index 17627ab0..18c69d8d 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java
@@ -159,7 +159,8 @@ public class PermissionPointServiceImpl implements PermissionPointService {
         workspace2Terminal(request);
         //查询条件构建
         LambdaQueryWrapper<SaasFeature> queryWrapper = new LambdaQueryWrapper<SaasFeature>()
-                .in(CollectionUtil.isNotEmpty(request.getTerminalList()), SaasFeature::getTerminal, request.getTerminalList());
+                .in(CollectionUtil.isNotEmpty(request.getTerminalList()), SaasFeature::getTerminal, request.getTerminalList())
+                .le(Objects.nonNull(request.getMaxFeatureType()), SaasFeature::getFeatureType, request.getMaxFeatureType());
         //查指定节点子级处理条件
         if (request.getParentId() != null && request.getParentId() != 0) {
             SaasFeature parent = this.saasFeatureDao.getById(request.getParentId());
diff --git a/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java b/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java
index ed81af0c..b6b4e1af 100644
--- a/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java
+++ b/tyr-server/src/test/java/cn/axzo/tyr/server/permission/PermissionPointTest.java
@@ -49,6 +49,7 @@ public class PermissionPointTest {
         //request.setTerminalList(Arrays.asList("NT_CMS_WEB_ENT_ZB"));
         request.setDelegateType(0);
         request.setMaxLevel(3);
+        request.setMaxFeatureType(2);
         ApiResult<List<PermissionPointTreeNode>> result = controller.listTreeNodes(request);
         System.out.println("---------------");
         System.out.println(JSON.toJSONString(result, SerializerFeature.DisableCircularReferenceDetect));