zsl 2 лет назад
Родитель
Сommit
49e5b73121

+ 9 - 0
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/controller/SysConstantMenuController.java

@@ -1,5 +1,7 @@
 package cn.tr.module.sys.constant.controller;
 
+import cn.tr.module.sys.user.dto.SysMenuDTO;
+import cn.tr.module.sys.user.dto.SysMenuQueryDTO;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.tr.core.validation.Insert;
@@ -35,6 +37,13 @@ public class SysConstantMenuController extends BaseController{
 
     private final SysConstantMenuService sysConstantMenuService;
 
+    @PostMapping("/query/tree")
+    @ApiOperationSupport(author = "lf")
+    @ApiOperation(value = "菜单树",notes = "权限: 无")
+    public CommonResult<List<SysConstantMenuDTO>> selectTree(@RequestBody SysConstantMenuQueryDTO query){
+        return CommonResult.success(sysConstantMenuService.selectSysMenuTree(query));
+    }
+
     @ApiOperationSupport(author = "zsl",order = 1)
     @ApiOperation(value="根据条件查询常量菜单",notes = "权限: 无")
     @PostMapping("/query/page")

+ 16 - 2
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/dto/SysConstantMenuDTO.java

@@ -1,6 +1,7 @@
 package cn.tr.module.sys.constant.dto;
 
-import cn.tr.plugin.mybatis.pojo.BaseDTO;
+import cn.tr.core.tree.TreeNode;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
 import cn.tr.core.validation.Update;
@@ -8,6 +9,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import javax.validation.constraints.*;
+import java.util.Date;
 
 /**
  * 常量菜单传输对象
@@ -19,7 +21,7 @@ import javax.validation.constraints.*;
 @ApiModel("常量菜单传输对象")
 @EqualsAndHashCode(callSuper = true)
 @ToString
-public class SysConstantMenuDTO extends BaseDTO  {
+public class SysConstantMenuDTO  extends TreeNode<String>  {
     private static final long serialVersionUID = 1L;
     @ApiModelProperty(value = "主键", position = 1)
      @NotBlank  (message = "主键不能为空",groups = {Update.class})
@@ -49,4 +51,16 @@ public class SysConstantMenuDTO extends BaseDTO  {
     @ApiModelProperty(value = "备注", position = 11)
     private String remark;
 
+    /**
+     * 创建时间
+     */
+    @JsonIgnoreProperties(allowGetters = true)
+    private Date createTime;
+
+    /**
+     * 最后更新时间
+     */
+    @JsonIgnoreProperties(allowGetters = true)
+    private Date updateTime;
+
 }

+ 24 - 1
tr-modules/tr-module-system/src/main/java/cn/tr/module/sys/constant/service/SysConstantMenuService.java

@@ -2,6 +2,10 @@ package cn.tr.module.sys.constant.service;
 
 import cn.tr.module.sys.constant.dto.SysConstantMenuDTO;
 import cn.tr.module.sys.constant.dto.SysConstantMenuQueryDTO;
+import cn.tr.module.sys.user.dto.SysMenuDTO;
+import cn.tr.module.sys.user.dto.SysMenuQueryDTO;
+import cn.tr.plugin.mybatis.service.ITreeService;
+
 import java.util.*;
 
 /**
@@ -10,7 +14,26 @@ import java.util.*;
  * @author zsl
  * @date  2023/05/04 16:29
  **/
-public interface SysConstantMenuService{
+public interface SysConstantMenuService  extends ITreeService{
+
+    /**
+     * 根据条件查询构造树结构
+     * @param query 查询参数
+     * @return
+     */
+    default List<SysConstantMenuDTO> selectSysMenuTree(SysConstantMenuQueryDTO query){
+        return buildTree(selectSysConstantMenuList(query));
+    };
+
+    /* 根据条件查询构造树结构
+     * @param query 查询参数
+     * @param excludeIds 构造树时排除的节点id
+     * @return
+     */
+    default List<SysConstantMenuDTO> selectSysMenuTree(SysConstantMenuQueryDTO query,List<String> excludeIds){
+        return buildTree(selectSysConstantMenuList(query),excludeIds);
+    };
+
 
     /**
      * 根据条件查询常量菜单