suzhuhong/zxjp-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复角色菜单临时接口

Browse Source
This commit is contained in:
zhangchenbiao
2023-07-25 16:58:02 +08:00
parent fe6b6f1ebb
commit 01a2fb597c
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
coolstore-partner-dao/src/main/java/com/cool/store/dao/SysRoleMenuDAO.java
View File

@@ -43,6 +43,7 @@ public class SysRoleMenuDAO {
SysRoleMenuDO insert = new SysRoleMenuDO(); SysRoleMenuDO insert = new SysRoleMenuDO();
insert.setMenuId(menuId); insert.setMenuId(menuId);
insert.setRoleId(roleId); insert.setRoleId(roleId);
insert.setPlatform(PlatFormTypeEnum.PC.getCode());
insertList.add(insert); insertList.add(insert);
} }
return sysRoleMenuMapper.batchInsert(insertList); return sysRoleMenuMapper.batchInsert(insertList);

2
coolstore-partner-dao/src/main/resources/mapper/SysRoleMapper.xml
View File

@@ -152,6 +152,6 @@
from from
sys_role sys_role
where where
role_id = #{roleId} deleted = 0 role_id = #{roleId} and deleted = 0
</select> </select>
</mapper> </mapper>

3
coolstore-partner-model/src/main/java/com/cool/store/dto/menu/AddMenuDTO.java
View File

@@ -34,7 +34,6 @@ public class AddMenuDTO {
private String env; private String env;
public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){ public static SysMenuDO convertDO(AddMenuDTO param, MenuTypeEnum menuTypeEnum){
SysMenuDO menu = new SysMenuDO();
SysMenuDO sysMenuDO = new SysMenuDO(); SysMenuDO sysMenuDO = new SysMenuDO();
sysMenuDO.setParentId(param.getParentId()); sysMenuDO.setParentId(param.getParentId());
sysMenuDO.setName(param.getName()); sysMenuDO.setName(param.getName());
@@ -48,7 +47,7 @@ public class AddMenuDTO {
sysMenuDO.setTarget(param.getTarget()); sysMenuDO.setTarget(param.getTarget());
sysMenuDO.setIcon(param.getIcon()); sysMenuDO.setIcon(param.getIcon());
sysMenuDO.setMenuType(menuTypeEnum.getCode()); sysMenuDO.setMenuType(menuTypeEnum.getCode());
return menu; return sysMenuDO;
} }

2
coolstore-partner-model/src/main/java/com/cool/store/vo/role/RolePageVO.java
View File

@@ -29,7 +29,7 @@ public class RolePageVO {
for (SysRoleDO sysRole : roleList) { for (SysRoleDO sysRole : roleList) {
RolePageVO role = new RolePageVO(); RolePageVO role = new RolePageVO();
role.setRoleId(sysRole.getRoleId()); role.setRoleId(sysRole.getRoleId());
role.setRoleName(role.getRoleName()); role.setRoleName(sysRole.getRoleName());
resultList.add(role); resultList.add(role);
} }
return resultList; return resultList;

2
coolstore-partner-webb/src/main/java/com/cool/store/config/swagger/Swagger2Config.java
View File

@@ -52,7 +52,7 @@ public class Swagger2Config {
.groupName(groupName) .groupName(groupName)
.select() .select()
.apis(this.scanBasePackage(packages)) .apis(this.scanBasePackage(packages))
//.paths(PathSelectors.regex(".*/inspection/setting/.*|.*getRegionUserAndSubRegion")) .paths(PathSelectors.regex(".*/menu/getAllMenus|.*/menu/add|.*/menu/auth/add|.*/role.*"))
.build() .build()
.globalOperationParameters(pars); .globalOperationParameters(pars);
} }

9
coolstore-partner-webb/src/main/java/com/cool/store/controller/MenuController.java
View File

@@ -5,6 +5,9 @@ import com.cool.store.dto.menu.AddMenuDTO;
import com.cool.store.enums.MenuTypeEnum; import com.cool.store.enums.MenuTypeEnum;
import com.cool.store.response.ResponseResult; import com.cool.store.response.ResponseResult;
import com.cool.store.service.MenuService; 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.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
@@ -19,26 +22,32 @@ import javax.annotation.Resource;
* @date 2023-06-08 16:58 * @date 2023-06-08 16:58
*/ */
@RestController @RestController
@Slf4j
@Api(tags = "菜单")
public class MenuController { public class MenuController {
@Resource @Resource
private MenuService menuService; private MenuService menuService;
@ApiOperation("获取用户权限菜单")
@GetMapping("/menu/getUserMenus") @GetMapping("/menu/getUserMenus")
public ResponseResult getUserMenus(){ public ResponseResult getUserMenus(){
return ResponseResult.success(menuService.getUserMenus(CurrentUserHolder.getUserId(), CurrentUserHolder.getRoleId())); return ResponseResult.success(menuService.getUserMenus(CurrentUserHolder.getUserId(), CurrentUserHolder.getRoleId()));
} }
@ApiOperation("获取所有菜单")
@GetMapping("/menu/getAllMenus") @GetMapping("/menu/getAllMenus")
public ResponseResult getAllMenus(){ public ResponseResult getAllMenus(){
return ResponseResult.success(menuService.getAllMenus()); return ResponseResult.success(menuService.getAllMenus());
} }
@ApiOperation("新增菜单")
@PostMapping(path = "/menu/add") @PostMapping(path = "/menu/add")
public ResponseResult addMenu(@RequestBody AddMenuDTO param){ public ResponseResult addMenu(@RequestBody AddMenuDTO param){
return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.MENU)); return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.MENU));
} }
@ApiOperation("新增权限")
@PostMapping(path = "/menu/auth/add") @PostMapping(path = "/menu/auth/add")
public ResponseResult addMenuAuth(@RequestBody AddMenuDTO param){ public ResponseResult addMenuAuth(@RequestBody AddMenuDTO param){
return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.AUTH)); return ResponseResult.success(menuService.addMenu(param, MenuTypeEnum.AUTH));