diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java index e820d012..6b474fb1 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java @@ -6,6 +6,7 @@ import com.das.common.utils.PageQuery; import com.das.modules.auth.domain.dto.DeleteDto; 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 com.das.modules.auth.service.SysMenuService; import lombok.extern.slf4j.Slf4j; @@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author chenhaojie * @Description 菜单控制层 @@ -59,4 +62,24 @@ public class SysMenusController { public PageDataInfo queryMenuList(@RequestBody SysMenuQueryDto categoryBo, PageQuery pageQuery) { return sysMenuService.queryMenuList(categoryBo, pageQuery); } + + + /** + * 获取菜单列表 + * @param sysMenuQueryDto 查询条件 + * @return 返回菜单列表 + */ + @PostMapping("/list") + public List queryMenuList(@RequestBody SysMenuQueryDto sysMenuQueryDto) { + return sysMenuService.queryMenuList(sysMenuQueryDto); + } + + /** + * 构建菜单树结构 + * @return 返回菜单树 + */ + @PostMapping("/tree") + public SysMenuVo createTree() { + return sysMenuService.createTree(); + } } diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java new file mode 100644 index 00000000..34bff349 --- /dev/null +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java @@ -0,0 +1,36 @@ +package com.das.modules.auth.domain.vo; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +public class SysMenuVo implements Serializable { + /** 菜单ID */ + private Long id ; + /** 菜单名称 */ + private String menuName ; + /** 菜单排列顺序 */ + private Integer menuOrder ; + /** 菜单图标名称 */ + private String menuIcon ; + /** 菜单操作类型 */ + private Integer funType ; + /** 菜单操作参数 */ + private String funParam ; + /** 权限ID */ + private Long authorityId ; + /** 上级菜单ID */ + private Long parentMenuId ; + /** 乐观锁 */ + private Integer revision ; + /** 创建人 */ + private String createdBy ; + /** 创建时间 */ + private Date createdTime ; + /** 更新人 */ + private String updatedBy ; + /** 更新时间 */ + private Date updatedTime ; + + private List children; +} diff --git a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java index eb842c65..df989276 100644 --- a/das/src/main/java/com/das/modules/auth/service/SysMenuService.java +++ b/das/src/main/java/com/das/modules/auth/service/SysMenuService.java @@ -5,8 +5,11 @@ import com.das.common.utils.PageQuery; import com.das.modules.auth.domain.dto.DeleteDto; 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 java.util.List; + public interface SysMenuService { SysMenu createMenu(SysMenuDto sysMenuDto); @@ -16,4 +19,17 @@ public interface SysMenuService { int deleteMenu(DeleteDto deleteDto); PageDataInfo queryMenuList(SysMenuQueryDto sysMenuQueryDto, PageQuery pageQuery); + + /** + * 查询菜单列表 + * @param sysMenuQueryDto 查询条件 + * @return 返回查询列表 按菜单顺序排序 + */ + List queryMenuList(SysMenuQueryDto sysMenuQueryDto); + + /** + * 构建菜单树结构 + * @return 返回菜单树 + */ + SysMenuVo createTree(); } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java index 2f020a58..2fd109b7 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java @@ -8,6 +8,7 @@ import com.das.common.utils.PageQuery; import com.das.modules.auth.domain.dto.DeleteDto; 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 com.das.modules.auth.mapper.SysMenuMapper; import com.das.modules.auth.service.SysMenuService; @@ -15,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.Date; +import java.util.List; @Service public class SysMenuServiceImpl implements SysMenuService { @@ -51,4 +53,16 @@ public class SysMenuServiceImpl implements SysMenuService { return PageDataInfo.build(iPage.getRecords(), iPage.getTotal()); } + @Override + public List queryMenuList(SysMenuQueryDto sysMenuQueryDto) { + //TODO : 待实现 + return null; + } + + @Override + public SysMenuVo createTree() { + //TODO : 待实现 + return null; + } + }