From a3f6748a36503b628506d21c4f9016396ea6a71b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 15 Nov 2023 10:53:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=A0=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=82=E7=BA=A7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SarMenuStandardNewServiceNewImpl.java   | 2 +-
 .../da/sys/sarMenuStandard/entity/SarMenuStandard.java   | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index 4ec4634f..d608537c 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -161,7 +161,7 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
         List<SarBussStandMenu> esStandMenu = sarBussStandMenuService.list().stream().filter(sarBussStandMenu -> sarBussStandMenu.getMenuId().length() > 30).collect(Collectors.toList());
         List<StandMenuRelation> esRelations = BeanCopyUtils.copyBeanList(esStandMenu, StandMenuRelation.class);
         // 计算每个节点的数值
-        TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations);
+        TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0);
         // 拼接返回
         return TsResources;
     }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
index 6b9c6fa4..de532370 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
@@ -107,6 +107,10 @@ public class  SarMenuStandard extends BaseEntity {
     @TableField(exist = false)
     private String treeType;
 
+    @ApiModelProperty(value = "树层级")
+    @TableField(exist = false)
+    private Integer level;
+
     @TableField(exist = false)
     private Integer gbStandCount;
 
@@ -118,13 +122,14 @@ public class  SarMenuStandard extends BaseEntity {
 
     // 添加用于计算和设置关联关系数量的方法
     // 添加用于计算和设置关联关系数量的方法
-    public void calculateAndSetCounts(List<StandMenuRelation> gbStandMenu, List<StandMenuRelation> fbStandMenu, List<StandMenuRelation> esStandMenu) {
+    public void calculateAndSetCounts(List<StandMenuRelation> gbStandMenu, List<StandMenuRelation> fbStandMenu, List<StandMenuRelation> esStandMenu, Integer curLevel) {
+        this.level = curLevel;
         this.gbStandCount = countMatches(gbStandMenu, this.id);
         this.fbStandCount = countMatches(fbStandMenu, this.id);
         this.esStandCount = countMatches(esStandMenu, this.id);
 
         for (SarMenuStandard child : children) {
-            child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu);
+            child.calculateAndSetCounts(gbStandMenu, fbStandMenu, esStandMenu, curLevel + 1);
             this.gbStandCount += child.gbStandCount;
             this.fbStandCount += child.fbStandCount;
             this.esStandCount += child.esStandCount;