Browse Source

移除没用的类。

lighter 4 years ago
parent
commit
fc34232ae0

+ 1 - 1
src/main/java/thyyxxk/webserver/controller/settings/SettingsController.java

@@ -62,7 +62,7 @@ public class SettingsController {
     }
 
     @GetMapping("/getAllMenus")
-    public ResultVo<List<MenuTree>> getAllMenus() {
+    public ResultVo<List<MenuItem>> getAllMenus() {
         return service.getAllMenus();
     }
 

+ 0 - 1
src/main/java/thyyxxk/webserver/dao/his/LoginDao.java

@@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Select;
 import thyyxxk.webserver.entity.dictionary.CodeName;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.settings.permissions.MenuItem;
-import thyyxxk.webserver.entity.settings.permissions.MenuTree;
 
 import java.util.List;
 

+ 2 - 2
src/main/java/thyyxxk/webserver/dao/his/settings/SettingsDao.java

@@ -4,7 +4,7 @@ import org.apache.ibatis.annotations.*;
 import thyyxxk.webserver.entity.dictionary.PureCodeName;
 import thyyxxk.webserver.entity.login.UserInfo;
 import thyyxxk.webserver.entity.settings.deptphones.DeptPhones;
-import thyyxxk.webserver.entity.settings.permissions.MenuTree;
+import thyyxxk.webserver.entity.settings.permissions.MenuItem;
 import thyyxxk.webserver.entity.settings.permissions.Role;
 
 import java.util.List;
@@ -82,7 +82,7 @@ public interface SettingsDao {
     void addNewRole(Role role);
 
     @Select("select * from dj_dict_menu where parent=#{code}")
-    List<MenuTree> getMenusByParent(@Param("code") Integer code);
+    List<MenuItem> getMenusByParent(@Param("code") Integer code);
 
     @Select("select code from dj_dict_menu where code in (select menu_code from dj_role_menu where role_id=#{id})")
     List<Integer> getRoleMenus(@Param("id") Integer id);

+ 0 - 19
src/main/java/thyyxxk/webserver/entity/settings/permissions/MenuTree.java

@@ -1,19 +0,0 @@
-package thyyxxk.webserver.entity.settings.permissions;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @author dj
- */
-@Data
-public class MenuTree {
-    private Integer code;
-    private String path;
-    private String name;
-    private Integer parent;
-    private Integer type;
-    private String icon;
-    private List<MenuTree> menus;
-}

+ 12 - 12
src/main/java/thyyxxk/webserver/service/settings/SettingsService.java

@@ -120,29 +120,29 @@ public class SettingsService {
         return ResultVoUtil.success();
     }
 
-    public ResultVo<List<MenuTree>> getAllMenus() {
-        List<MenuTree> tree = new ArrayList<>();
-        List<MenuTree> topLevelMenus = dao.getMenusByParent(0);
-        for (MenuTree topLevel : topLevelMenus) {
-            List<MenuTree> secondLevelMenus = dao.getMenusByParent(topLevel.getCode());
+    public ResultVo<List<MenuItem>> getAllMenus() {
+        List<MenuItem> tree = new ArrayList<>();
+        List<MenuItem> topLevelMenus = dao.getMenusByParent(0);
+        for (MenuItem topLevel : topLevelMenus) {
+            List<MenuItem> secondLevelMenus = dao.getMenusByParent(topLevel.getCode());
             if (null == secondLevelMenus || secondLevelMenus.isEmpty()) {
                 continue;
             }
-            for (MenuTree second : secondLevelMenus) {
-                List<MenuTree> thirdLevelMenus = dao.getMenusByParent(second.getCode());
+            for (MenuItem second : secondLevelMenus) {
+                List<MenuItem> thirdLevelMenus = dao.getMenusByParent(second.getCode());
                 if (null == thirdLevelMenus || thirdLevelMenus.isEmpty()) {
                     continue;
                 }
-                for (MenuTree third : thirdLevelMenus) {
-                    List<MenuTree> forthLevelMenus = dao.getMenusByParent(third.getCode());
+                for (MenuItem third : thirdLevelMenus) {
+                    List<MenuItem> forthLevelMenus = dao.getMenusByParent(third.getCode());
                     if (null == forthLevelMenus || forthLevelMenus.isEmpty()) {
                         continue;
                     }
-                    third.setMenus(forthLevelMenus);
+                    third.setChildren(forthLevelMenus);
                 }
-                second.setMenus(thirdLevelMenus);
+                second.setChildren(thirdLevelMenus);
             }
-            topLevel.setMenus(secondLevelMenus);
+            topLevel.setChildren(secondLevelMenus);
             tree.add(topLevel);
         }
         return ResultVoUtil.success(tree);