From 3c5dd69c85fbeb9f574274b038558db22aef2b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 24 Sep 2024 11:58:11 +0800
Subject: [PATCH] 'commit'

---
 .../com/dsideal/resource/Menu/Bean/Menu.java  | 17 ----------
 .../com/dsideal/resource/Menu/Bean/Meta.java  | 16 ----------
 .../com/dsideal/resource/Menu/GetVueMenu.java | 31 ++++++++++++++++---
 3 files changed, 27 insertions(+), 37 deletions(-)
 delete mode 100644 dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java
 delete mode 100644 dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java

diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java
deleted file mode 100644
index 27d8a12f..00000000
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Menu.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dsideal.resource.Menu.Bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Getter
-@Setter
-public class Menu {
-    private String path;
-    private String name;
-    private String component;
-    private Meta meta;
-    private List<Menu> children=new ArrayList<>();
-}
\ No newline at end of file
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java b/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java
deleted file mode 100644
index 73e9856f..00000000
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/Bean/Meta.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.dsideal.resource.Menu.Bean;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class Meta {
-    private String icon;
-    private String title;
-    private String isLink;
-    private boolean isHide;
-    private boolean isFull;
-    private boolean isAffix;
-    private boolean isKeepAlive;
-}
diff --git a/dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java b/dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java
index 14cea063..4be68a70 100644
--- a/dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java
+++ b/dsRes/src/main/java/com/dsideal/resource/Menu/GetVueMenu.java
@@ -1,7 +1,5 @@
 package com.dsideal.resource.Menu;
 
-import com.dsideal.resource.Menu.Bean.Menu;
-import com.dsideal.resource.Menu.Bean.Meta;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,11 +11,36 @@ import com.jfinal.plugin.activerecord.Db;
 import com.jfinal.plugin.hikaricp.HikariCpPlugin;
 import com.dsideal.resource.Plugin.YamlProp;
 import com.jfinal.plugin.activerecord.Record;
+import lombok.Getter;
+import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class GetVueMenu {
+    //子类1：菜单
+    @Getter
+    @Setter
+    public class Menu {
+        private String path;
+        private String name;
+        private String component;
+        private Meta meta;
+        private List<Menu> children=new ArrayList<>();
+    }
+    //子类2:LinkMeta
+    @Getter
+    @Setter
+    public class Meta {
+        private String icon;
+        private String title;
+        private String isLink;
+        private boolean isHide;
+        private boolean isFull;
+        private boolean isAffix;
+        private boolean isKeepAlive;
+    }
+    public static GetVueMenu gm=new GetVueMenu();
     public static void main(String[] args) throws JsonProcessingException {
         String configFile = "application_dev.yaml";
         Prop PropKit = new YamlProp(configFile);
@@ -28,7 +51,7 @@ public class GetVueMenu {
         ActiveRecordPlugin arp = new ActiveRecordPlugin(hp);
         arp.start();
 
-        List<Menu> rootMenu = fetchMenu(-1);  // 从父ID为-1开始递归
+        List<Menu> rootMenu = gm.fetchMenu(-1);  // 从父ID为-1开始递归
         //输出JSON格式
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(rootMenu.getFirst());
@@ -68,7 +91,7 @@ public class GetVueMenu {
      * @param parent_id 父节点ID
      * @return 此父节点下所有的子菜单
      */
-    private static List<Menu> fetchMenu(int parent_id) {
+    private List<Menu> fetchMenu(int parent_id) {
         String sql = "select * from t_base_menu where parent_id = ?";
         List<Record> list = Db.find(sql, parent_id);
         List<Menu> res = new ArrayList<>();