新增功能位置下拉树接口

ruoyi-admin/src/main/java/com/ruoyi/asset/controller/TbLocationController.java

@@ -3,6 +3,7 @@ package com.ruoyi.asset.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.ruoyi.common.core.domain.TreeSelect;
 import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -54,6 +55,12 @@ public class TbLocationController extends BaseController
         return success(tbLocations);
     }
 
+    @GetMapping("/treeSelect")
+    public AjaxResult treeSelect(@Parameter(name = "id") Long id) {
+        List<TreeSelect> tbLocations = tbLocationService.selectTreeSelect(id);
+        return success(tbLocations);
+    }
+
     /**
      * 导出所属位置列表
      */

ruoyi-admin/src/main/java/com/ruoyi/asset/service/ITbLocationService.java

@@ -1,7 +1,11 @@
 package com.ruoyi.asset.service;
 
 import java.util.List;
+
+import cn.hutool.core.lang.tree.Tree;
 import com.ruoyi.asset.domain.TbLocation;
+import com.ruoyi.common.core.domain.TreeEntity;
+import com.ruoyi.common.core.domain.TreeSelect;
 
 /**
  * 所属位置Service接口
@@ -29,6 +33,8 @@ public interface ITbLocationService
 
     public List<TbLocation> selectTree(Long id);
 
+    public List<TreeSelect> selectTreeSelect(Long id);
+
     /**
      * 新增所属位置
      * 

ruoyi-admin/src/main/java/com/ruoyi/asset/service/impl/TbLocationServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 
 import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.core.domain.TreeSelect;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,6 +83,51 @@ public class TbLocationServiceImpl implements ITbLocationService
         return locations;
     }
 
+    @Override
+    public List<TreeSelect> selectTreeSelect(Long id) {
+        ArrayList<TreeSelect> treeSelects = new ArrayList<>();
+        if (id != null) {
+            TbLocation location = selectTbLocationById(id);
+            TreeSelect treeSelect = new TreeSelect();
+            treeSelect.setId(location.getId());
+            treeSelect.setLabel(location.getName());
+            treeSelects.add(treeSelect);
+        } else {
+            TbLocation location = new TbLocation();
+            location.setParentId(0L);
+            List<TbLocation> locations = selectTbLocationList(location);
+            for (TbLocation tbLocation : locations) {
+                TreeSelect treeSelect = new TreeSelect();
+                treeSelect.setId(tbLocation.getId());
+                treeSelect.setLabel(tbLocation.getName());
+                treeSelects.add(treeSelect);
+            }
+        }
+        for (TreeSelect treeSelect : treeSelects) {
+            List<TreeSelect> treeSelectList = buildChildrenSelect(treeSelect);
+            treeSelect.setChildren(treeSelectList);
+        }
+        return treeSelects;
+    }
+
+    private List<TreeSelect> buildChildrenSelect(TreeSelect treeSelect) {
+        TbLocation sunLocation = new TbLocation();
+        sunLocation.setParentId(treeSelect.getId());
+        List<TbLocation> locations = selectTbLocationList(sunLocation);
+        ArrayList<TreeSelect> treeSelects = new ArrayList<>();
+        if (locations != null && !locations.isEmpty()) {
+            for (TbLocation tbLocation : locations) {
+                TreeSelect childrenTreeSelect = new TreeSelect();
+                childrenTreeSelect.setId(tbLocation.getId());
+                childrenTreeSelect.setLabel(tbLocation.getName());
+                List<TreeSelect> treeSelectList = buildChildrenSelect(childrenTreeSelect);
+                childrenTreeSelect.setChildren(treeSelectList);
+                treeSelects.add(childrenTreeSelect);
+            }
+        }
+        return treeSelects;
+    }
+
     /**
      * 新增所属位置
      * 

ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -113,7 +113,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage").permitAll()
                 // 静态资源，可匿名访问
-                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/asset/location/tree").permitAll()
+                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/asset/location/tree", "/asset/location/treeSelect").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()