From 236f80305991d3517c84e70b2645a80a52ad1294 Mon Sep 17 00:00:00 2001
From: wangwh <2397901735@qq.com>
Date: Mon, 28 Oct 2024 14:42:57 +0800
Subject: [PATCH] fix: 1、添加日志记录； 2、修改请求网格系统待办接口的传参objId值为本系统caseId； 3、添加办理中时联合处置申请的网格待办。
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 5cb6066..9b7ecbf 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
@@ -17,9 +17,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.util.HashMap;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
@Slf4j
@Service
@@ -30,7 +28,7 @@
private String userName;
@Value("${grid.password:aek8CdcaM}")
private String passWord;
- private String testUrl = "http://183.2.142.46:9007";
+ private String testUrl = "http://183.2.142.21:9007";
public R<GridUserVo> getUserInfo(GridTokenVo gridTokenVo) {
String s = null;
@@ -39,7 +37,6 @@
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridTokenVo);
try {
-// log.info("xsdobject:{}",JSON.toJSONString(requestVo));
// 开发环境
if (SpringContextUtil.checkDev()) {
log.info("xsdurl:{}",testUrl + "/sys/getUserByToken");
@@ -153,15 +150,21 @@
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");
+ log.info("xsdurl:{}",testUrl + "/api/thrid/grid/user/get-org-users"+JSON.toJSONString(gridOrgUsersVo));
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/user/get-org-users", JSON.toJSONString(gridOrgUsersVo), new HashMap<>(), "utf-8");
}else {
- log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
+ 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);
--
Gitblit v1.8.0