From e79d8c8f9679839bf983341fe2cf3212e1bb3001 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Mon, 28 Oct 2024 14:44:33 +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 | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 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 093050e..6f941ff 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
@@ -1,8 +1,14 @@
package cn.huge.module.grid.controller;
import cn.huge.base.common.bo.R;
-import cn.huge.module.grid.domain.vo.GridUserVo;
+import cn.huge.module.grid.domain.dto.GridSysRoleDTO;
+import cn.huge.module.grid.domain.vo.*;
import cn.huge.module.grid.service.GridUserService;
+import cn.huge.module.sys.dto.GridRoleMenuDTO;
+import cn.huge.module.sys.dto.GridUserRoleDTO;
+import cn.huge.module.sys.vo.GridOrgUsersVo;
+import cn.huge.module.sys.vo.GridRoleMenuVo;
+import cn.huge.module.sys.vo.GridUserRoleVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,6 +16,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@RestController
@@ -20,11 +27,37 @@
/**
* 根据用户token获取用户信息
- * @param token
+ * @url {ctx}/api/thrid/grid/user/get-userinfo
+ * @param gridTokenVo
* @return
*/
@PostMapping("/get-userinfo")
- public R<GridUserVo> getUserInfo(@RequestBody String token) {
- return gridUserService.getUserInfo(token);
+ public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
+ return gridUserService.getUserInfo(gridTokenVo);
+ }
+
+ @PostMapping("/get-org-users")
+ public R<List<GridUserVo>> getUserListByOrg(@RequestBody GridOrgUsersVo gridOrgUsersVo) {
+ return gridUserService.getUserListByOrg(gridOrgUsersVo);
+ }
+
+ @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);
+ }
+
+ public R<String> initNewUsers(@RequestBody GridUserRoleVo gridUserRoleVo){
+ return gridUserService.initNewUsers(gridUserRoleVo);
+
}
}
--
Gitblit v1.8.0