From 08bae4808c1cc00ab4ef1bf5254b3d712228be4d Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Sat, 12 Oct 2024 09:27:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
index a8c6501..1b0ae7d 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java
@@ -2,9 +2,10 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.ReturnSucUtils;
-import cn.huge.module.grid.domain.vo.GridTokenVo;
-import cn.huge.module.grid.domain.vo.GridUserRequestVo;
-import cn.huge.module.grid.domain.vo.GridUserVo;
+import cn.huge.module.grid.domain.dto.GridRoleMenuDTO;
+import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
+import cn.huge.module.grid.domain.dto.GridUserRoleDTO;
+import cn.huge.module.grid.domain.vo.*;
import cn.huge.module.grid.service.GridUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
@@ -13,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@RestController
@@ -28,7 +30,22 @@
* @return
*/
@PostMapping("/get-userinfo")
- public Object getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
- return ReturnSucUtils.getRepInfo(gridUserService.getUserInfo(gridTokenVo));
+ public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
+ return gridUserService.getUserInfo(gridTokenVo);
+ }
+
+ @PostMapping("/get-user-role")
+ public R<List<GridUserRoleDTO>> getUserRoleList(@RequestBody GridUserRoleVo gridUserRoleVo) {
+ return gridUserService.getUserRoleList(gridUserRoleVo);
+ }
+
+ @PostMapping("/get-sys-role")
+ public R<GridSysRoleDTO> getSysRoleList(@RequestBody GridOrgVo gridOrgVo) {
+ return gridUserService.getSysRoleList(gridOrgVo);
+ }
+
+ @PostMapping("/get-role-menu")
+ public R<List<GridRoleMenuDTO>> getRoleMenu(@RequestBody GridRoleMenuVo gridRoleMenuVo) {
+ return gridUserService.getRoleMenu(gridRoleMenuVo);
}
}
--
Gitblit v1.8.0