das接口新增

das/src/main/java/com/das/modules/auth/controller/SysMenusController.java

@@ -65,21 +65,22 @@ public class SysMenusController {
 
 
     /**
-     * 获取菜单列表
+     * 获取所有的菜单
+     * @return 返回菜单树
+     */
+    @PostMapping("/list")
+    public R<?> queryAllMenuList(@RequestBody SysMenuQueryDto sysMenuQueryDto) {
+        return R.success(sysMenuService.queryAllMenuList(sysMenuQueryDto));
+    }
+
+
+    /**
+     * 获取绑定的菜单列表
      * @param sysMenuQueryDto 查询条件
      * @return 返回菜单列表
      */
-    @PostMapping("/list")
-    public List<SysMenu> queryMenuList(@RequestBody SysMenuQueryDto sysMenuQueryDto) {
-        return sysMenuService.queryMenuList(sysMenuQueryDto);
-    }
-
-    /**
-     * 构建菜单树结构
-     * @return 返回菜单树
-     */
     @PostMapping("/tree")
-    public SysMenuVo createTree() {
+    public List<SysMenuVo> createTree(@RequestBody SysMenuQueryDto sysMenuQueryDto) {
-        return sysMenuService.createTree();
+        return sysMenuService.createTree(sysMenuQueryDto);
     }
 }

das/src/main/java/com/das/modules/auth/controller/SysOrgController.java

@@ -65,7 +65,7 @@ public class SysOrgController {
      * @return 返回机构树
      */
     @PostMapping("/list")
-    public List<SysOrg> queryAllOrgTree(@RequestBody SysOrgQueryDto sysOrgQueryDto) {
+    public R<?>  queryAllOrgTree(@RequestBody SysOrgQueryDto sysOrgQueryDto) {
-        return sysOrgService.queryAllOrgTree(sysOrgQueryDto);
+        return R.success(sysOrgService.queryAllOrgTree(sysOrgQueryDto));
     }
 }

das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java

@@ -10,4 +10,6 @@ public class SysMenuQueryDto implements Serializable {
     private Long id ;
     /** 上级菜单ID */
     private Long parentMenuId ;
+
+    private Long roleId ;
 }

das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java

@@ -1,10 +1,13 @@
 package com.das.modules.auth.domain.vo;
 
+import lombok.Data;
+
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
+@Data
 public class SysMenuVo implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
@@ -37,4 +40,117 @@ public class SysMenuVo implements Serializable {
     private Date updatedTime ;
 
     private List<SysMenuVo> children;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public Integer getMenuOrder() {
+        return menuOrder;
+    }
+
+    public void setMenuOrder(Integer menuOrder) {
+        this.menuOrder = menuOrder;
+    }
+
+    public String getMenuIcon() {
+        return menuIcon;
+    }
+
+    public void setMenuIcon(String menuIcon) {
+        this.menuIcon = menuIcon;
+    }
+
+    public Integer getFunType() {
+        return funType;
+    }
+
+    public void setFunType(Integer funType) {
+        this.funType = funType;
+    }
+
+    public String getFunParam() {
+        return funParam;
+    }
+
+    public void setFunParam(String funParam) {
+        this.funParam = funParam;
+    }
+
+    public Long getAuthorityId() {
+        return authorityId;
+    }
+
+    public void setAuthorityId(Long authorityId) {
+        this.authorityId = authorityId;
+    }
+
+    public Long getParentMenuId() {
+        return parentMenuId;
+    }
+
+    public void setParentMenuId(Long parentMenuId) {
+        this.parentMenuId = parentMenuId;
+    }
+
+    public Integer getRevision() {
+        return revision;
+    }
+
+    public void setRevision(Integer revision) {
+        this.revision = revision;
+    }
+
+    public String getCreatedBy() {
+        return createdBy;
+    }
+
+    public void setCreatedBy(String createdBy) {
+        this.createdBy = createdBy;
+    }
+
+    public Date getCreatedTime() {
+        return createdTime;
+    }
+
+    public void setCreatedTime(Date createdTime) {
+        this.createdTime = createdTime;
+    }
+
+    public String getUpdatedBy() {
+        return updatedBy;
+    }
+
+    public void setUpdatedBy(String updatedBy) {
+        this.updatedBy = updatedBy;
+    }
+
+    public Date getUpdatedTime() {
+        return updatedTime;
+    }
+
+    public void setUpdatedTime(Date updatedTime) {
+        this.updatedTime = updatedTime;
+    }
+
+    public List<SysMenuVo> getChildren() {
+        return children;
+    }
+
+    public void setChildren(List<SysMenuVo> children) {
+        this.children = children;
+    }
 }

das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java

@@ -1,10 +1,14 @@
 package com.das.modules.auth.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.das.modules.auth.domain.dto.SysMenuQueryDto;
+import com.das.modules.auth.domain.vo.SysMenuVo;
 import com.das.modules.auth.entity.SysMenu;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  * 菜单信息 Mapper 接口
@@ -12,7 +16,11 @@ import org.apache.ibatis.annotations.Param;
  *
  * @author chenhaojie
  */
-public interface SysMenuMapper extends BaseMapperPlus<SysMenu, SysMenu> {
+public interface SysMenuMapper extends BaseMapper<SysMenu> {
 
     IPage<SysMenu> queryMenuList(IPage<SysMenu> page, @Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
+
+    List<SysMenuVo> queryAllMenuList(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
+
+    List<SysMenuVo> createTree(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto);
 }

das/src/main/java/com/das/modules/auth/service/SysMenuService.java

@@ -7,6 +7,7 @@ import com.das.modules.auth.domain.dto.SysMenuDto;
 import com.das.modules.auth.domain.dto.SysMenuQueryDto;
 import com.das.modules.auth.domain.vo.SysMenuVo;
 import com.das.modules.auth.entity.SysMenu;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -25,11 +26,11 @@ public interface SysMenuService {
      * @param sysMenuQueryDto 查询条件
      * @return 返回查询列表 按菜单顺序排序
      */
-    List<SysMenu> queryMenuList(SysMenuQueryDto sysMenuQueryDto);
+    List<SysMenuVo> queryAllMenuList(SysMenuQueryDto sysMenuQueryDto);
 
     /**
      * 构建菜单树结构
      * @return 返回菜单树
      */
-    SysMenuVo createTree();
+    List<SysMenuVo> createTree(SysMenuQueryDto sysMenuQueryDto);
 }

das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java

@@ -1,5 +1,6 @@
 package com.das.modules.auth.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.das.common.utils.BeanCopyUtils;
 import com.das.common.utils.SequenceUtils;
@@ -14,6 +15,7 @@ import com.das.modules.auth.mapper.SysMenuMapper;
 import com.das.modules.auth.service.SysMenuService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Date;
 import java.util.List;
@@ -54,15 +56,15 @@ public class SysMenuServiceImpl implements SysMenuService {
     }
 
     @Override
-    public List<SysMenu> queryMenuList(SysMenuQueryDto sysMenuQueryDto) {
+    public List<SysMenuVo> queryAllMenuList(SysMenuQueryDto sysMenuQueryDto) {
-        //TODO : 待实现
+        // 根据角色id获取权限id权限绑定的菜单
-        return null;
+        List<SysMenuVo> list = sysMenuMapper.queryAllMenuList(sysMenuQueryDto);
+        return list;
     }
 
     @Override
-    public SysMenuVo createTree() {
+    public List<SysMenuVo> createTree(SysMenuQueryDto sysMenuQueryDto) {
-        //TODO : 待实现
+        return sysMenuMapper.createTree(sysMenuQueryDto);
-        return null;
     }
 
 }

das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java

@@ -53,19 +53,14 @@ public class SysOrgServiceImpl implements SysOrgService {
     }
 
     public List<SysOrg> queryAllOrgTree(SysOrgQueryDto sysOrgQueryDto) {
-        QueryWrapper<SysOrg> sysOrgQueryWrapper = new QueryWrapper<>();
+        List<SysOrg> rootOrgList = sysOrgMapper.queryAllOrgTree(sysOrgQueryDto.getParentOrgId());
-        sysOrgQueryWrapper.eq("id", sysOrgQueryDto.getParentOrgId());
+        return rootOrgList;
-        // 查出登录账号所属的机构信息，再构建机构信息下的子机构信息
-        List<SysOrg> rootOrgList = sysOrgMapper.selectList(sysOrgQueryWrapper);
-//        List<SysOrg> rootOrgList = sysOrgMapper.queryAllOrgTree(sysOrgQueryDto.getParentOrgId());
-        List<SysOrg> list = getChildNode(rootOrgList);
-        return list;
     }
 
     public List<SysOrg> getChildNode(List<SysOrg> identifyObjectList) {
         for (SysOrg identifyObject : identifyObjectList) {
             QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("id", identifyObject.getId());
+            queryWrapper.eq("org_id", identifyObject.getId());
             List<SysOrg> childOrgList = sysOrgMapper.queryAllOrgTree(identifyObject.getId());
             identifyObject.setChildren(childOrgList);
             getChildNode(childOrgList);

das/src/main/resources/mapper/SysMenuMapper.xml

@@ -18,6 +18,25 @@
         <result property="updatedTime" column="updated_time" jdbcType="VARCHAR"/>
     </resultMap>
 
+
+    <resultMap id="SysMenuChildMap" type="com.das.modules.auth.domain.vo.SysMenuVo">
+        <result property="id" column="id" jdbcType="BIGINT"/>
+        <result property="menuName" column="menu_name" jdbcType="VARCHAR"/>
+        <result property="menuOrder" column="menu_order" jdbcType="VARCHAR"/>
+        <result property="menuIcon" column="menu_icon" jdbcType="VARCHAR"/>
+        <result property="funType" column="fun_type" jdbcType="VARCHAR"/>
+        <result property="funParam" column="fun_param" jdbcType="VARCHAR"/>
+        <result property="authorityId" column="authority_id" jdbcType="VARCHAR"/>
+        <result property="parentMenuId" column="parent_menu_id" jdbcType="VARCHAR"/>
+        <result property="revision" column="revision" jdbcType="VARCHAR"/>
+        <result property="createdBy" column="created_by" jdbcType="VARCHAR"/>
+        <result property="createdTime" column="created_time" jdbcType="VARCHAR"/>
+        <result property="updatedBy" column="updated_by" jdbcType="VARCHAR"/>
+        <result property="updatedTime" column="updated_time" jdbcType="VARCHAR"/>
+        <collection property="children" column="id" ofType="com.das.modules.auth.domain.vo.SysMenuVo" select="queryChildMenus"/>
+    </resultMap>
+
+
     <select id="queryMenuList" resultMap="SysMenuMap">
         select * from sys_menu
         <where>
@@ -30,4 +49,17 @@
         </where>
     </select>
 
+    <select id="queryAllMenuList" resultMap="SysMenuMap">
+        select * from sys_menu where parent_menu_id = #{sysMenu.parentMenuId}
+    </select>
+
+
+    <select id="queryChildMenus" resultMap="SysMenuChildMap">
+        select * from sys_menu where parent_menu_id = #{id}
+    </select>
+
+    <select id="createTree" resultMap="SysMenuChildMap">
+        select * from sys_menu left join  where parent_menu_id = 0
+    </select>
+
 </mapper>

das/src/main/resources/mapper/SysRoleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.das.modules.auth.mapper.SysRoleMapper">
 
-    <resultMap type="com.das.modules.auth.entity.SysUser" id="SysRoleMap">
+    <resultMap type="com.das.modules.auth.entity.SysRole" id="SysRoleMap">
         <result property="id" column="id" jdbcType="BIGINT"/>
         <result property="roleCode" column="role_code" jdbcType="VARCHAR"/>
         <result property="roleName" column="role_name" jdbcType="VARCHAR"/>