From db21e707868d3b98860c236201fe5d344d3b6bd1 Mon Sep 17 00:00:00 2001 From: bunny <1319900154@qq.com> Date: Mon, 25 Mar 2024 08:58:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=96=B0=E5=A2=9E):=20=E5=88=86=E9=85=8D?= =?UTF-8?q?=E8=8F=9C=E5=8D=95,=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- pom.xml | 2 +- spzx-common/pom.xml | 52 +++++++++---------- spzx-manager/pom.xml | 2 +- .../controller/SysRoleMenuController.java | 19 +++---- .../manger/service/SysRoleMenuService.java | 16 ++++-- .../service/impl/SysRoleMenuServiceImpl.java | 24 +++++---- spzx-model/pom.xml | 2 +- .../spzx/model/vo/system/SysRoleMenuVo.java | 22 ++++++++ 9 files changed, 89 insertions(+), 52 deletions(-) create mode 100644 spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/SysRoleMenuVo.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 133a0e4..e095495 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,7 +9,7 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index c18fb6a..c9816e8 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 4.0.0 com.atguigu - spzx-parent + spzx-parent-v2 1.0-SNAPSHOT pom diff --git a/spzx-common/pom.xml b/spzx-common/pom.xml index 3f05c1c..ed2d9df 100644 --- a/spzx-common/pom.xml +++ b/spzx-common/pom.xml @@ -1,32 +1,32 @@ - - 4.0.0 - - com.atguigu - spzx-parent - 1.0-SNAPSHOT - + 4.0.0 + + com.atguigu + spzx-parent-v2 + 1.0-SNAPSHOT + - spzx-common - pom + spzx-common + pom - spzx-common - https://maven.apache.org - - common-util - common-service - + spzx-common + https://maven.apache.org + + common-util + common-service + - - UTF-8 - + + UTF-8 + - - - - cn.hutool - hutool-all - 5.8.25 - - + + + + cn.hutool + hutool-all + 5.8.25 + + diff --git a/spzx-manager/pom.xml b/spzx-manager/pom.xml index c02a751..78a98e0 100644 --- a/spzx-manager/pom.xml +++ b/spzx-manager/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.atguigu - spzx-parent + spzx-parent-v2 1.0-SNAPSHOT diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleMenuController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleMenuController.java index b7e3d0d..21872ce 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleMenuController.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysRoleMenuController.java @@ -3,13 +3,12 @@ package com.atguigu.spzx.manger.controller; import com.atguigu.spzx.manger.service.SysRoleMenuService; import com.atguigu.spzx.model.dto.system.AssginMenuDto; import com.atguigu.spzx.model.vo.result.Result; -import com.atguigu.spzx.model.vo.result.ResultCodeEnum; +import com.atguigu.spzx.model.vo.system.SysRoleMenuVo; +import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Map; - @Tag(name = "分配菜单") @RestController @RequestMapping(value = "/admin/system/sysRoleMenu") @@ -17,15 +16,17 @@ public class SysRoleMenuController { @Autowired private SysRoleMenuService sysRoleMenuService; - @GetMapping(value = "/findSysRoleMenuByRoleId/{roleId}") - public Result> findSysRoleMenuByRoleId(@PathVariable(value = "roleId") Long roleId) { - Map sysRoleMenuList = sysRoleMenuService.findSysRoleMenuByRoleId(roleId); - return Result.build(sysRoleMenuList, ResultCodeEnum.SUCCESS); + @Operation(summary = "查询菜单", description = "查询菜单") + @GetMapping(value = "findSysRoleMenuByRoleId/{roleId}") + public Result findSysRoleMenuByRoleId(@PathVariable(value = "roleId") Long roleId) { + SysRoleMenuVo sysRoleMenuList = sysRoleMenuService.findSysRoleMenuByRoleId(roleId); + return Result.success(sysRoleMenuList); } - @PostMapping("/doAssign") + @Operation(summary = "保存菜单", description = "保存菜单") + @PostMapping("doAssign") public Result doAssign(@RequestBody AssginMenuDto assginMenuDto) { sysRoleMenuService.doAssign(assginMenuDto); - return Result.build(null, ResultCodeEnum.SUCCESS); + return Result.success(); } } \ No newline at end of file diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleMenuService.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleMenuService.java index 1329e8d..ba9b204 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleMenuService.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/SysRoleMenuService.java @@ -1,11 +1,21 @@ package com.atguigu.spzx.manger.service; import com.atguigu.spzx.model.dto.system.AssginMenuDto; - -import java.util.Map; +import com.atguigu.spzx.model.vo.system.SysRoleMenuVo; public interface SysRoleMenuService { - Map findSysRoleMenuByRoleId(Long roleId); + /** + * 查询菜单 + * + * @param roleId 角色id + * @return 查询菜单返回实体类 + */ + SysRoleMenuVo findSysRoleMenuByRoleId(Long roleId); + /** + * 保存菜单 + * + * @param assginMenuDto 请求参数实体类 + */ void doAssign(AssginMenuDto assginMenuDto); } diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleMenuServiceImpl.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleMenuServiceImpl.java index 3767e38..d800857 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleMenuServiceImpl.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/service/impl/SysRoleMenuServiceImpl.java @@ -5,11 +5,11 @@ import com.atguigu.spzx.manger.service.SysMenuService; import com.atguigu.spzx.manger.service.SysRoleMenuService; import com.atguigu.spzx.model.dto.system.AssginMenuDto; import com.atguigu.spzx.model.entity.system.SysMenu; +import com.atguigu.spzx.model.vo.system.SysRoleMenuVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -21,9 +21,14 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService { @Autowired private SysRoleMenuMapper sysRoleMenuMapper; + /** + * 查询菜单 + * + * @param roleId 角色id + * @return 查询菜单返回实体类 + */ @Override - public Map findSysRoleMenuByRoleId(Long roleId) { - + public SysRoleMenuVo findSysRoleMenuByRoleId(Long roleId) { // 查询所有的菜单数据 List sysMenuList = sysMenuService.findNodes(); @@ -31,18 +36,17 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService { List roleMenuIds = sysRoleMenuMapper.findSysRoleMenuByRoleId(roleId); // 将数据存储到Map中进行返回 - Map result = new HashMap<>(); - result.put("sysMenuList", sysMenuList); - result.put("roleMenuIds", roleMenuIds); - - // 返回 - return result; + return SysRoleMenuVo.builder().roleMenuIds(roleMenuIds).sysMenuList(sysMenuList).build(); } + /** + * 保存菜单 + * + * @param assginMenuDto 请求参数实体类 + */ @Transactional @Override public void doAssign(AssginMenuDto assginMenuDto) { - // 根据角色的id删除其所对应的菜单数据 sysRoleMenuMapper.deleteByRoleId(assginMenuDto.getRoleId()); diff --git a/spzx-model/pom.xml b/spzx-model/pom.xml index 073c582..b2f489d 100644 --- a/spzx-model/pom.xml +++ b/spzx-model/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.atguigu - spzx-parent + spzx-parent-v2 1.0-SNAPSHOT diff --git a/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/SysRoleMenuVo.java b/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/SysRoleMenuVo.java new file mode 100644 index 0000000..7b0db9c --- /dev/null +++ b/spzx-model/src/main/java/com/atguigu/spzx/model/vo/system/SysRoleMenuVo.java @@ -0,0 +1,22 @@ +package com.atguigu.spzx.model.vo.system; + +import com.atguigu.spzx.model.entity.system.SysMenu; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Schema(description = "查询菜单返回实体类") +public class SysRoleMenuVo { + @Schema(description = "所有的菜单数据") + List sysMenuList; + @Schema(description = "角色的菜单数据") + List roleMenuIds; +}