From f33bb23ebe6ea8e805c84fa3020a9cc307a29a00 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 22 Oct 2024 15:14:27 +0800
Subject: [PATCH] feature:本地环境能提交到亿迅环境兼容
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
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..a677523 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;
@@ -16,6 +17,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.UUID;
@@ -146,4 +148,37 @@
//初始化完成用户信息，返回给前端登录
return R.fail();
}
+
+ public R<List<GridUserVo>> getUserListByOrg(GridOrgUsersVo gridOrgUsersVo) {
+ String s = null;
+ HeadVo headVo = initHeadVo();
+ GridOrgUserRequestVo requestVo = new GridOrgUserRequestVo();
+ requestVo.setHeadVo(headVo);
+ List<String> roleIds = new ArrayList<>();
+ roleIds.add("43fc22e6-7276-11ef-a6d1-005056820c5f");
+ roleIds.add("442be8dd-7276-11ef-a6d1-005056820c5f");
+ roleIds.add("679b1846-71c5-11ef-a6d1-005056820c5f");
+ roleIds.add("67affc74-71c5-11ef-a6d1-005056820c5f");
+ gridOrgUsersVo.setRoleIds(roleIds);
+ 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/user/getUserListByOrg");
+ 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