新增功能位置树接口

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

@@ -2,6 +2,8 @@ package com.ruoyi.asset.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import io.swagger.v3.oas.annotations.Parameter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -46,6 +48,12 @@ public class TbLocationController extends BaseController
         return getDataTable(list);
     }
 
+    @GetMapping("/tree")
+    public AjaxResult tree(@Parameter(name = "id") Long id) {
+        List<TbLocation> tbLocations = tbLocationService.selectTree(id);
+        return success(tbLocations);
+    }
+
     /**
      * 导出所属位置列表
      */

ruoyi-admin/src/main/java/com/ruoyi/asset/domain/TbLocation.java

@@ -5,6 +5,9 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 所属位置对象 tb_location
  * 
@@ -38,6 +41,8 @@ public class TbLocation extends BaseEntity
     @Excel(name = "位置标签")
     private String label;
 
+    private List<TbLocation> children = new ArrayList<>();
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -90,6 +95,14 @@ public class TbLocation extends BaseEntity
         this.label = label;
     }
 
+    public List<TbLocation> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<TbLocation> children) {
+        this.children = children;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -104,6 +117,7 @@ public class TbLocation extends BaseEntity
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())
             .append("updateTime", getUpdateTime())
+            .append("children", getChildren())
             .toString();
     }
 }

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

@@ -27,6 +27,8 @@ public interface ITbLocationService
      */
     public List<TbLocation> selectTbLocationList(TbLocation tbLocation);
 
+    public List<TbLocation> selectTree(Long id);
+
     /**
      * 新增所属位置
      * 

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

@@ -13,6 +13,8 @@ import com.ruoyi.asset.mapper.TbLocationMapper;
 import com.ruoyi.asset.domain.TbLocation;
 import com.ruoyi.asset.service.ITbLocationService;
 
+import javax.annotation.Resource;
+
 /**
  * 所属位置Service业务层处理
  * 
@@ -22,7 +24,7 @@ import com.ruoyi.asset.service.ITbLocationService;
 @Service
 public class TbLocationServiceImpl implements ITbLocationService 
 {
-    @Autowired
+    @Resource
     private TbLocationMapper tbLocationMapper;
 
     /**
@@ -49,6 +51,37 @@ public class TbLocationServiceImpl implements ITbLocationService
         return tbLocationMapper.selectTbLocationList(tbLocation);
     }
 
+    @Override
+    public List<TbLocation> selectTree(Long id) {
+        List<TbLocation> locations = new ArrayList<>();
+        if (id != null) {
+            TbLocation location = selectTbLocationById(id);
+            locations.add(location);
+        } else {
+            TbLocation location = new TbLocation();
+            location.setParentId(0L);
+            locations = selectTbLocationList(location);
+        }
+        for (TbLocation location : locations) {
+            List<TbLocation> tbLocations = buildChildren(location);
+            location.setChildren(tbLocations);
+        }
+        return locations;
+    }
+
+    private List<TbLocation> buildChildren(TbLocation location) {
+        TbLocation sunLocation = new TbLocation();
+        sunLocation.setParentId(location.getId());
+        List<TbLocation> locations = selectTbLocationList(sunLocation);
+        if (locations != null && !locations.isEmpty()) {
+            for (TbLocation tbLocation : locations) {
+                List<TbLocation> tbLocations = buildChildren(tbLocation);
+                tbLocation.setChildren(tbLocations);
+            }
+        }
+        return locations;
+    }
+
     /**
      * 新增所属位置
      * 
@@ -59,11 +92,16 @@ public class TbLocationServiceImpl implements ITbLocationService
     public int insertTbLocation(TbLocation tbLocation)
     {
         Long parentId = tbLocation.getParentId();
-        if (selectTbLocationById(parentId) == null) {
-            return 0;
+        if (parentId == null || parentId == 0) {
+            tbLocation.setParentId(0L);
+        } else {
+            if (selectTbLocationById(parentId) == null) {
+                return 0;
+            }
         }
+
         String dateTimeId = DateUtils.dateTimeNow("yyyyMMddHHmmssSSS");
-        String orderNumber = "PD" + dateTimeId;
+        String orderNumber = "WZ" + dateTimeId;
 
         tbLocation.setNumber(orderNumber);
         tbLocation.setCreateTime(DateUtils.getNowDate());

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/**", "/test/list").permitAll()
+                .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**", "/asset/location/tree").permitAll()
                 .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
                 // 除上面外的所有请求全部需要鉴权认证
                 .anyRequest().authenticated()