From 8b3c09e2404002126a625ba07d89b0c6fb797712 Mon Sep 17 00:00:00 2001
From: liyj <15602261488@163.com>
Date: Thu, 17 Oct 2024 14:15:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/gzdyh_test' into gzdyh_test
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 28 ++++++++++++++++++++++++++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgUserRequestVo.java | 10 ++++++++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 6 ++++++
dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridOrgUsersVo.java | 8 ++++++++
4 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridOrgUsersVo.java b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridOrgUsersVo.java
new file mode 100644
index 0000000..bb49bd8
--- /dev/null
+++ b/dyh-service/dyh-base/src/main/java/cn/huge/module/sys/vo/GridOrgUsersVo.java
@@ -0,0 +1,8 @@
+package cn.huge.module.sys.vo;
+
+import lombok.Data;
+
+@Data
+public class GridOrgUsersVo {
+ private String orgId;
+}
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 dd675de..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
@@ -6,6 +6,7 @@
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;
@@ -35,6 +36,11 @@
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);
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgUserRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgUserRequestVo.java
new file mode 100644
index 0000000..6dd5c5f
--- /dev/null
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridOrgUserRequestVo.java
@@ -0,0 +1,10 @@
+package cn.huge.module.grid.domain.vo;
+
+import cn.huge.module.sys.vo.GridOrgUsersVo;
+import lombok.Data;
+
+@Data
+public class GridOrgUserRequestVo {
+ private HeadVo headVo;
+ private GridOrgUsersVo bodyVo;
+}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
index 23e0946..5cb6066 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java
@@ -7,6 +7,7 @@
import cn.huge.module.grid.domain.vo.*;
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 com.alibaba.fastjson.JSON;
@@ -146,4 +147,31 @@
//初始化完成用户信息，返回给前端登录
return R.fail();
}
+
+ public R<List<GridUserVo>> getUserListByOrg(GridOrgUsersVo gridOrgUsersVo) {
+ String s = null;
+ HeadVo headVo = initHeadVo();
+ GridOrgUserRequestVo requestVo = new GridOrgUserRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridOrgUsersVo);
+ try {
+// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
+ // 开发环境
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}",testUrl + "/api/thrid/grid/user/get-org-users");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/user/get-org-users", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }else {
+ log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/user/getUserListByOrg", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
+ log.info("xsd:{}",s);
+ } catch (Exception e) {
+ log.info("xsderror:{}",e.getLocalizedMessage());
+ throw new RuntimeException(e);
+ }
+ JSONArray data = JSONObject.parseObject(s).getJSONArray("data");
+ List<GridUserVo> gridUserVos = data.toJavaList(GridUserVo.class);
+ return R.ok(gridUserVos);
+
+ }
}
--
Gitblit v1.8.0