diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java index e0aa5ab..59a9474 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/IndexController.java @@ -1,18 +1,22 @@ package com.atguigu.spzx.manger.controller; import com.atguigu.context.BaseContext; +import com.atguigu.spzx.manger.service.SysMenuService; import com.atguigu.spzx.manger.service.SysUserService; import com.atguigu.spzx.manger.service.ValidateCodeService; import com.atguigu.spzx.model.dto.system.LoginDto; import com.atguigu.spzx.model.entity.system.SysUser; import com.atguigu.spzx.model.vo.result.Result; import com.atguigu.spzx.model.vo.system.LoginVo; +import com.atguigu.spzx.model.vo.system.SysMenuVo; import com.atguigu.spzx.model.vo.system.ValidateCodeVo; 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.List; + @Tag(name = "用户相关接口") @RestController @RequestMapping("/admin/system/index") @@ -20,6 +24,8 @@ public class IndexController { @Autowired private SysUserService sysUserService; @Autowired + private SysMenuService sysMenuService; + @Autowired private ValidateCodeService validateCodeService; @Operation(summary = "生成验证码", description = "生成验证码信息") @@ -49,4 +55,11 @@ public class IndexController { sysUserService.logout(token); return Result.success(); } + + @Operation(summary = "动态菜单", description = "动态菜单") + @GetMapping("menus") + public Result> menus() { + List sysMenuVoList = sysMenuService.findUserMenuList(); + return Result.success(sysMenuVoList); + } } \ No newline at end of file diff --git a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java index 36a09c5..ea04746 100644 --- a/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java +++ b/spzx-manager/src/main/java/com/atguigu/spzx/manger/controller/SysUserController.java @@ -28,21 +28,21 @@ public class SysUserController { @Operation(summary = "添加用户", description = "添加用户信息") @PostMapping(value = "saveSysUser") - public Result saveSysUser(@RequestBody SysUser sysUser) { + public Result saveSysUser(@RequestBody SysUser sysUser) { sysUserService.saveSysUser(sysUser); return Result.success(); } @Operation(summary = "修改用户", description = "修改用户信息") @PutMapping("updateSysUser") - public Result updateSysUser(@RequestBody SysUser sysUser) { + public Result updateSysUser(@RequestBody SysUser sysUser) { sysUserService.updateSysUser(sysUser); return Result.success(); } @Operation(summary = "根据id删除用户", description = "删除用户信息") @DeleteMapping(value = "deleteById/{userId}") - public Result deleteById(@PathVariable(value = "userId") Long userId) { + public Result deleteById(@PathVariable(value = "userId") Long userId) { sysUserService.deleteById(userId); return Result.success(); } diff --git a/spzx-manager/src/main/resources/mapper/SysUserMapper.xml b/spzx-manager/src/main/resources/mapper/SysUserMapper.xml index bf7041d..5974c4e 100644 --- a/spzx-manager/src/main/resources/mapper/SysUserMapper.xml +++ b/spzx-manager/src/main/resources/mapper/SysUserMapper.xml @@ -16,6 +16,9 @@ update sys_user set + + avatar = #{avatar}, + username = #{userName},