From 4dcad30d5d76a4231aaa1aa2ccd502121e54cdaf Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Mon, 3 Apr 2023 09:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8F=9C=E5=8D=95tab?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/pojo/constant/FunctionState.java     |  4 ++-
 .../njcn/user/pojo/param/FunctionParam.java   |  2 +-
 .../com/njcn/user/pojo/vo/FunctionVO.java     |  3 ++
 .../user/mapper/mapping/FunctionMapper.xml    |  4 +--
 .../service/impl/FunctionServiceImpl.java     | 28 ++++++++++++++++++-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/FunctionState.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/FunctionState.java
index c5069bdd5..16cd26f4a 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/FunctionState.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/constant/FunctionState.java
@@ -23,7 +23,7 @@ public interface FunctionState {
     String DRIVER_NAME = "/home";
 
     /**
-     * 权限资源类型 0-菜单、1-按钮、2-公共资源、3-服务间调用资源
+     * 权限资源类型 0-菜单、1-按钮、2-公共资源、3-服务间调用资源、4-tab页面
      */
     int MENU = 0;
 
@@ -33,4 +33,6 @@ public interface FunctionState {
 
     int IN_SERVICE = 3;
 
+    int TAB = 4;
+
 }
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java
index 66bf43b9c..9f88ab5ff 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/FunctionParam.java
@@ -50,7 +50,7 @@ public class FunctionParam {
 
     @ApiModelProperty("资源类型")
     @NotNull(message = UserValidMessage.TYPE_NOT_BLANK)
-    @Range(min = 0, max = 3, message = UserValidMessage.PARAM_FORMAT_ERROR)
+    @Range(min = 0, max = 4, message = UserValidMessage.PARAM_FORMAT_ERROR)
     private Integer type;
 
     @ApiModelProperty("描述")
diff --git a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java
index 334e2c8fb..04d337f12 100644
--- a/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java
+++ b/pqs-user/user-api/src/main/java/com/njcn/user/pojo/vo/FunctionVO.java
@@ -49,4 +49,7 @@ public class FunctionVO implements Serializable {
     @ApiModelProperty("子级")
     List<FunctionVO> children;
 
+    @ApiModelProperty("tab数据")
+    List<FunctionVO> userTab;
+
 }
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
index e8961c322..7b3639602 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/FunctionMapper.xml
@@ -14,7 +14,7 @@
         FROM
             sys_function
         WHERE
-            STATE = 1 AND Type IN(0,1)
+            STATE = 1 AND Type IN(0,1,4)
     </select>
 
     <select id="getFunctionsByList" resultType="FunctionVO">
@@ -29,7 +29,7 @@
         FROM
             sys_function
         WHERE
-            STATE = 1 AND Type = 0
+            STATE = 1 AND Type IN (0,4)
         AND
             Id in
             <foreach item="item" index="index" collection="list" open="(" separator="," close=")">
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
index bb601d6fa..a9c86a446 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/FunctionServiceImpl.java
@@ -165,7 +165,8 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function> i
 
     @Override
     public List<Function> getButtonsById(String id) {
-        return this.lambdaQuery().eq(Function::getPid,id).eq(Function::getType,FunctionState.BUTTON).eq(Function::getState,FunctionState.ENABLE).list();
+        List<Integer> typeList = Arrays.asList(FunctionState.BUTTON,FunctionState.PUBLIC,FunctionState.TAB);
+        return this.lambdaQuery().eq(Function::getPid,id).in(Function::getType,typeList).eq(Function::getState,FunctionState.ENABLE).orderByAsc(Function::getType).list();
     }
 
     @Override
@@ -190,6 +191,8 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function> i
                 .collect(Collectors.toList());
         //组装驾驶舱
         setDriverChildren(result);
+        //处理tab页
+        setTab(result);
         return result;
     }
 
@@ -278,6 +281,29 @@ public class FunctionServiceImpl extends ServiceImpl<FunctionMapper, Function> i
         });
     }
 
+    /**
+     *  处理tab页
+     */
+    private void setTab(List<FunctionVO> list) {
+        if (!CollectionUtils.isEmpty(list)){
+            list.forEach(item->{
+                List<FunctionVO> children = item.getChildren();
+                if (!CollectionUtils.isEmpty(children)){
+                    for (FunctionVO child : children) {
+                        List<FunctionVO> children2 = child.getChildren();
+                        if (!CollectionUtils.isEmpty(children2)){
+                            setTab(children2);
+                        } else if (Objects.equals(child.getType(),4)){
+                            item.setUserTab(item.getChildren());
+                            item.setChildren(new ArrayList<>());
+                            break;
+                        }
+                    }
+                }
+            });
+        }
+    }
+
     /**
      * 校验参数，
      * 1.检查是否存在相同名称的菜单