From 01a2fb597c49d76dc0511c9eab6f91ece136daf8 Mon Sep 17 00:00:00 2001 From: zhangchenbiao Date: Tue, 25 Jul 2023 16:58:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=B8=B4=E6=97=B6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/dao/SysRoleMenuDAO.java | 1 + .../src/main/resources/mapper/SysRoleMapper.xml | 2 +- .../main/java/com/cool/store/dto/menu/AddMenuDTO.java | 3 +-- .../src/main/java/com/cool/store/vo/role/RolePageVO.java | 2 +- .../com/cool/store/config/swagger/Swagger2Config.java | 2 +- .../java/com/cool/store/controller/MenuController.java | 9 +++++++++ 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java index 84d33a0b4..aa053af5a 100644 --- a/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java +++ b/coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java @@ -43,6 +43,7 @@ public class SysRoleMenuDAO { SysRoleMenuDO insert = new SysRoleMenuDO(); insert.setMenuId(menuId); insert.setRoleId(roleId); + insert.setPlatform(PlatFormTypeEnum.PC.getCode()); insertList.add(insert); } return sysRoleMenuMapper.batchInsert(insertList); diff --git a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml index 78487b147..27ddf12c0 100644 --- a/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml +++ b/coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml @@ -152,6 +152,6 @@ from sys_role where - role_id = #{roleId} deleted = 0 + role_id = #{roleId} and deleted = 0 \ No newline at end of file diff --git a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java index 64a47bd55..b682b164f 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java @@ -34,7 +34,6 @@ public class AddMenuDTO { private String env; public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){ - SysMenuDO menu = new SysMenuDO(); SysMenuDO sysMenuDO = new SysMenuDO(); sysMenuDO.setParentId(param.getParentId()); sysMenuDO.setName(param.getName()); @@ -48,7 +47,7 @@ public class AddMenuDTO { sysMenuDO.setTarget(param.getTarget()); sysMenuDO.setIcon(param.getIcon()); sysMenuDO.setMenuType(menuTypeEnum.getCode()); - return menu; + return sysMenuDO; } diff --git a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java b/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java index d59e3f8c4..290b92750 100644 --- a/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java +++ b/coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java @@ -29,7 +29,7 @@ public class RolePageVO { for (SysRoleDO sysRole : roleList) { RolePageVO role = new RolePageVO(); role.setRoleId(sysRole.getRoleId()); - role.setRoleName(role.getRoleName()); + role.setRoleName(sysRole.getRoleName()); resultList.add(role); } return resultList; diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java index 7c1c35efc..3fd37a621 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java @@ -52,7 +52,7 @@ public class Swagger2Config { .groupName(groupName) .select() .apis(this.scanBasePackage(packages)) - //.paths(PathSelectors.regex(".*/inspection/setting/.*|.*getRegionUserAndSubRegion")) + .paths(PathSelectors.regex(".*/menu/getAllMenus|.*/menu/add|.*/menu/auth/add|.*/role.*")) .build() .globalOperationParameters(pars); } diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java index d510d5e5d..bef7d0854 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java @@ -5,6 +5,9 @@ import com.cool.store.dto.menu.AddMenuDTO; import com.cool.store.enums.MenuTypeEnum; import com.cool.store.response.ResponseResult; import com.cool.store.service.MenuService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -19,26 +22,32 @@ import javax.annotation.Resource; * @date 2023-06-08 16:58 */ @RestController +@Slf4j +@Api(tags = "菜单") public class MenuController { @Resource private MenuService menuService; + @ApiOperation("获取用户权限菜单") @GetMapping("/menu/getUserMenus") public ResponseResult getUserMenus(){ return ResponseResult.success(menuService.getUserMenus(CurrentUserHolder.getUserId(), CurrentUserHolder.getRoleId())); } + @ApiOperation("获取所有菜单") @GetMapping("/menu/getAllMenus") public ResponseResult getAllMenus(){ return ResponseResult.success(menuService.getAllMenus()); } + @ApiOperation("新增菜单") @PostMapping(path = "/menu/add") public ResponseResult addMenu(@RequestBody AddMenuDTO param){ return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.MENU)); } + @ApiOperation("新增权限") @PostMapping(path = "/menu/auth/add") public ResponseResult addMenuAuth(@RequestBody AddMenuDTO param){ return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.AUTH));