From a0d8bc14edfc7a49f8fe050dadec22a173247504 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 22 Oct 2024 20:04:55 +0800
Subject: [PATCH] fix:本地环境能提交到亿迅环境兼容
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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..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,11 +1,14 @@
package cn.huge.module.grid.controller;
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.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;
@@ -13,6 +16,7 @@
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import java.util.List;
@Slf4j
@RestController
@@ -28,7 +32,32 @@
* @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-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