feat(新增): 分配菜单,修改pom文件

2024-03-25 08:58:16 +08:00 · 2024-03-25 08:58:16 +08:00 · db21e70786
parent 04559a57b2
commit db21e70786
9 changed files with 89 additions and 52 deletions
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -9,7 +9,7 @@
      </list>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-17" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/out" />
  </component>
 </project>
--- a/pom.xml
+++ b/pom.xml
@ -9,7 +9,7 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.atguigu</groupId>
-    <artifactId>spzx-parent</artifactId>
+    <artifactId>spzx-parent-v2</artifactId>
    <version>1.0-SNAPSHOT</version>
    <packaging>pom</packaging>

--- a/spzx-common/pom.xml
+++ b/spzx-common/pom.xml
@ -1,32 +1,32 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.atguigu</groupId>
-    <artifactId>spzx-parent</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.atguigu</groupId>
+        <artifactId>spzx-parent-v2</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>

-  <artifactId>spzx-common</artifactId>
-  <packaging>pom</packaging>
+    <artifactId>spzx-common</artifactId>
+    <packaging>pom</packaging>

-  <name>spzx-common</name>
-  <url>https://maven.apache.org</url>
-  <modules>
-    <module>common-util</module>
-    <module>common-service</module>
-  </modules>
+    <name>spzx-common</name>
+    <url>https://maven.apache.org</url>
+    <modules>
+        <module>common-util</module>
+        <module>common-service</module>
+    </modules>

-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>

-  <dependencies>
-    <!-- hutool工具包 -->
-    <dependency>
-      <groupId>cn.hutool</groupId>
-      <artifactId>hutool-all</artifactId>
-      <version>5.8.25</version>
-    </dependency>
-  </dependencies>
+    <dependencies>
+        <!-- hutool工具包 -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.8.25</version>
+        </dependency>
+    </dependencies>
 </project>
--- a/spzx-manager/pom.xml
+++ b/spzx-manager/pom.xml
@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.atguigu</groupId>
-        <artifactId>spzx-parent</artifactId>
+        <artifactId>spzx-parent-v2</artifactId>
        <version>1.0-SNAPSHOT</version>
    </parent>

--- 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<Map<String, Object>> findSysRoleMenuByRoleId(@PathVariable(value = "roleId") Long roleId) {
-        Map<String, Object> sysRoleMenuList = sysRoleMenuService.findSysRoleMenuByRoleId(roleId);
-        return Result.build(sysRoleMenuList, ResultCodeEnum.SUCCESS);
+    @Operation(summary = "查询菜单", description = "查询菜单")
+    @GetMapping(value = "findSysRoleMenuByRoleId/{roleId}")
+    public Result<SysRoleMenuVo> 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();
    }
 }
--- 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<String, Object> findSysRoleMenuByRoleId(Long roleId);
+    /**
+     * 查询菜单
+     *
+     * @param roleId 角色id
+     * @return 查询菜单返回实体类
+     */
+    SysRoleMenuVo findSysRoleMenuByRoleId(Long roleId);

+    /**
+     * 保存菜单
+     *
+     * @param assginMenuDto 请求参数实体类
+     */
    void doAssign(AssginMenuDto assginMenuDto);
 }
--- 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<String, Object> findSysRoleMenuByRoleId(Long roleId) {
-
+    public SysRoleMenuVo findSysRoleMenuByRoleId(Long roleId) {
        // 查询所有的菜单数据
        List<SysMenu> sysMenuList = sysMenuService.findNodes();

@ -31,18 +36,17 @@ public class SysRoleMenuServiceImpl implements SysRoleMenuService {
        List<Long> roleMenuIds = sysRoleMenuMapper.findSysRoleMenuByRoleId(roleId);

        // 将数据存储到Map中进行返回
-        Map<String, Object> 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());

--- a/spzx-model/pom.xml
+++ b/spzx-model/pom.xml
@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>com.atguigu</groupId>
-        <artifactId>spzx-parent</artifactId>
+        <artifactId>spzx-parent-v2</artifactId>
        <version>1.0-SNAPSHOT</version>
    </parent>

--- 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
@ -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<SysMenu> sysMenuList;
+    @Schema(description = "角色的菜单数据")
+    List<Long> roleMenuIds;
+}