From 44127187247ab653f2bb2d542a2e08e8994774a5 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:28:46 +0800
Subject: [PATCH] Merge branch 'sanshuohuitang_dev' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java | 83 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
index f56170c..973c718 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/api/RoleApi.java
@@ -1,14 +1,16 @@
package com.panzhihua.service_user.api;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.web.bind.annotation.*;
+
import com.panzhihua.common.model.vos.MenuVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.user.MenuRoleVO;
import com.panzhihua.common.model.vos.user.RoleVO;
import com.panzhihua.service_user.service.RoleService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -24,80 +26,119 @@
/**
* 获取平台所有权限url
+ *
* @return 所有权限url
*/
@PostMapping("getAllMenu")
- public R<List<MenuVO>> getAllMenu(){
+ public R<List<MenuVO>> getAllMenu() {
return roleService.getAllMenu();
}
/**
* 获取某个人的所有角色
- * @param username 用户ID
+ *
+ * @param username
+ * 用户ID
* @return 所有角色
*/
@PostMapping("getUserRoles")
- public R<List<String>> getUserRoles(@RequestParam("username") String username){
+ public R<List<String>> getUserRoles(@RequestParam("username") String username) {
return roleService.getUserRoles(username);
}
/**
* 查询社区的党委角色
- * @param communityId 社区id
+ *
+ * @param communityId
+ * 社区id
* @return 党委角色列表
*/
@PostMapping("listidentity")
- public R listIdentity(@RequestParam("communityId")Integer communityId){
+ public R listIdentity(@RequestParam("communityId") Integer communityId) {
return roleService.listIdentity(communityId);
}
/**
* 角色下拉列表
- * @param communityId 对应社区 0 表示运营后台
+ *
+ * @param communityId
+ * 对应社区 0 表示运营后台
* @return 角色集合
*/
@PostMapping("listrolebackstage")
- public R listRoleBackstage(@RequestParam("communityId") Long communityId){
- return roleService.listRoleBackstage(communityId);
+ public R listRoleBackstage(@RequestParam("communityId") Long communityId,@RequestParam("pageNum")Integer pageNum,@RequestParam("pageSize")Integer pageSize,@RequestParam("areaCode")String areaCode) {
+ return roleService.listRoleBackstage(communityId,pageNum,pageSize,areaCode);
}
/**
* 新增角色
- * @param roleVO 角色信息
+ *
+ * @param roleVO
+ * 角色信息
* @return 新增结果
*/
@PostMapping("addrolebackstage")
- public R addRoleBackstage(@RequestBody RoleVO roleVO){
+ public R addRoleBackstage(@RequestBody RoleVO roleVO) {
return roleService.addRoleBackstage(roleVO);
}
/**
* 删除角色
- * @param roleVO 角色主键
+ *
+ * @param roleVO
+ * 角色主键
* @return 删除结果
*/
@PostMapping("deleterolebackstage")
- public R deleteRoleBackstage(@RequestBody RoleVO roleVO){
+ public R deleteRoleBackstage(@RequestBody RoleVO roleVO) {
return roleService.deleteRoleBackstage(roleVO);
}
/**
* 平台菜单列表
- * @param type 1 运营平台 2 社区平台
+ *
+ * @param communityId
+ * 社区id 0 运营平台
* @return 菜单集合
*/
@PostMapping("listmenubackstage")
- public R listMenuBackstage(@RequestParam("type")int type){
- return roleService.listMenuBackstage(type);
+ public R listMenuBackstage(@RequestParam("communityId") Long communityId) {
+ return roleService.listMenuBackstage(communityId);
}
/**
* 设置角色的权限
- * @param menuRoleVO 用户设置的权限id
+ *
+ * @param menuRoleVO
+ * 用户设置的权限id
* @return 设置结果
*/
@PostMapping("putmenurole")
- public R putMenuRole(@RequestBody MenuRoleVO menuRoleVO){
+ public R putMenuRole(@RequestBody MenuRoleVO menuRoleVO) {
return roleService.putMenuRole(menuRoleVO);
}
+
+ /**
+ * 用户菜单获取
+ *
+ * @param userId
+ * 登录用户id
+ * @return 用户菜单
+ */
+ @PostMapping("listmenu")
+ public R listmenu(@RequestParam("userId") Long userId) {
+ return roleService.listmenu(userId);
+ }
+
+ /**
+ * 获取角色的权限配置列表
+ *
+ * @param roleId
+ * 角色id
+ * @return 菜单列表
+ */
+ @PostMapping("listmenubackstagebyrole")
+ public R listMenuBackstageByRole(@RequestParam("roleId") Long roleId) {
+ return roleService.listMenuBackstageByRole(roleId);
+ }
}
--
Gitblit v1.7.1