From b2912466a9249ed7fb3e7e849d55ad2a6e45cafc Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Tue, 25 Jun 2024 17:41:41 +0800 Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/SysMenusController.java | 25 ++-- .../auth/controller/SysOrgController.java | 4 +- .../auth/domain/dto/SysMenuQueryDto.java | 2 + .../das/modules/auth/domain/vo/SysMenuVo.java | 116 ++++++++++++++++++ .../modules/auth/mapper/SysMenuMapper.java | 10 +- .../modules/auth/service/SysMenuService.java | 5 +- .../auth/service/impl/SysMenuServiceImpl.java | 14 ++- .../auth/service/impl/SysOrgServiceImpl.java | 11 +- .../main/resources/mapper/SysMenuMapper.xml | 32 +++++ .../main/resources/mapper/SysRoleMapper.xml | 2 +- 10 files changed, 189 insertions(+), 32 deletions(-) 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 6b474fb1..251885fa 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 @@ -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 queryMenuList(@RequestBody SysMenuQueryDto sysMenuQueryDto) { - return sysMenuService.queryMenuList(sysMenuQueryDto); - } - - /** - * 构建菜单树结构 - * @return 返回菜单树 - */ @PostMapping("/tree") - public SysMenuVo createTree() { - return sysMenuService.createTree(); + public List createTree(@RequestBody SysMenuQueryDto sysMenuQueryDto) { + return sysMenuService.createTree(sysMenuQueryDto); } } diff --git a/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java b/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java index cdf35988..e3fafee0 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysOrgController.java @@ -65,7 +65,7 @@ public class SysOrgController { * @return 返回机构树 */ @PostMapping("/list") - public List queryAllOrgTree(@RequestBody SysOrgQueryDto sysOrgQueryDto) { - return sysOrgService.queryAllOrgTree(sysOrgQueryDto); + public R queryAllOrgTree(@RequestBody SysOrgQueryDto sysOrgQueryDto) { + return R.success(sysOrgService.queryAllOrgTree(sysOrgQueryDto)); } } diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java index 8e2a4c78..d90f187d 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java +++ b/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 ; } 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 index 319dffab..40d4042a 100644 --- 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 @@ -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 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 getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } } diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java index 3a0a4fe2..52eae7b9 100644 --- a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java +++ b/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; + /** *

* 菜单信息 Mapper 接口 @@ -12,7 +16,11 @@ import org.apache.ibatis.annotations.Param; * * @author chenhaojie */ -public interface SysMenuMapper extends BaseMapperPlus { +public interface SysMenuMapper extends BaseMapper { IPage queryMenuList(IPage page, @Param("sysMenu") SysMenuQueryDto sysMenuQueryDto); + + List queryAllMenuList(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto); + + List createTree(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto); } 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 df989276..45e5fd5f 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 @@ -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 queryMenuList(SysMenuQueryDto sysMenuQueryDto); + List queryAllMenuList(SysMenuQueryDto sysMenuQueryDto); /** * 构建菜单树结构 * @return 返回菜单树 */ - SysMenuVo createTree(); + List createTree(SysMenuQueryDto sysMenuQueryDto); } 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 2fd109b7..e59eca4a 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 @@ -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 queryMenuList(SysMenuQueryDto sysMenuQueryDto) { - //TODO : 待实现 - return null; + public List queryAllMenuList(SysMenuQueryDto sysMenuQueryDto) { + // 根据角色id获取权限id权限绑定的菜单 + List list = sysMenuMapper.queryAllMenuList(sysMenuQueryDto); + return list; } @Override - public SysMenuVo createTree() { - //TODO : 待实现 - return null; + public List createTree(SysMenuQueryDto sysMenuQueryDto) { + return sysMenuMapper.createTree(sysMenuQueryDto); } } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java index 4f6d490a..50bad5c6 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java @@ -53,19 +53,14 @@ public class SysOrgServiceImpl implements SysOrgService { } public List queryAllOrgTree(SysOrgQueryDto sysOrgQueryDto) { - QueryWrapper sysOrgQueryWrapper = new QueryWrapper<>(); - sysOrgQueryWrapper.eq("id", sysOrgQueryDto.getParentOrgId()); - // 查出登录账号所属的机构信息，再构建机构信息下的子机构信息 - List rootOrgList = sysOrgMapper.selectList(sysOrgQueryWrapper); -// List rootOrgList = sysOrgMapper.queryAllOrgTree(sysOrgQueryDto.getParentOrgId()); - List list = getChildNode(rootOrgList); - return list; + List rootOrgList = sysOrgMapper.queryAllOrgTree(sysOrgQueryDto.getParentOrgId()); + return rootOrgList; } public List getChildNode(List identifyObjectList) { for (SysOrg identifyObject : identifyObjectList) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("id", identifyObject.getId()); + queryWrapper.eq("org_id", identifyObject.getId()); List childOrgList = sysOrgMapper.queryAllOrgTree(identifyObject.getId()); identifyObject.setChildren(childOrgList); getChildNode(childOrgList); diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml index c2cf9038..1b2b4f9f 100644 --- a/das/src/main/resources/mapper/SysMenuMapper.xml +++ b/das/src/main/resources/mapper/SysMenuMapper.xml @@ -18,6 +18,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/das/src/main/resources/mapper/SysRoleMapper.xml b/das/src/main/resources/mapper/SysRoleMapper.xml index 8087f1bb..0a1ccd7d 100644 --- a/das/src/main/resources/mapper/SysRoleMapper.xml +++ b/das/src/main/resources/mapper/SysRoleMapper.xml @@ -2,7 +2,7 @@ - +