From f65fc84efd8f746afe0403631c93e238fe753430 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Thu, 17 Oct 2024 11:02:13 +0800
Subject: [PATCH] feature:配合待办逻辑，新增根据机构获取机构用户接口
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java | 40 +++++++++++++++++++++++++++-------------
1 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
index f792cf3..73f73db 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java
@@ -7,6 +7,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@@ -16,15 +17,20 @@
@Slf4j
@Service
public class GridToDoService {
- private String gridUrl = "http://219.137.166.84:8061";
+ @Value("${grid.url:http://219.137.166.84:8061}")
+ private String gridUrl;
+ @Value("${grid.username:mtxt0011}")
+ private String userName;
+ @Value("${grid.password}")
+ private String passWord;
public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoRequestVo requestVo = new GridToDoRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridToDoVo);
log.info("xsd:{}", JSON.toJSONString(requestVo));
- log.info("xsd:{}",gridUrl + "/sysUserTodo/save");
+ log.info("xsd:{}", gridUrl + "/sysUserTodo/save");
String s = null;
try {
s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/save", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
@@ -38,23 +44,31 @@
}
public R<GridToDoVo> updateToDo(GridToDoVo gridToDoVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoRequestVo requestVo = new GridToDoRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridToDoVo);
String s = null;
+ log.info("xsd:{}", JSON.toJSONString(requestVo));
+ log.info("xsd:{}", gridUrl + "/sysUserTodo/update");
try {
s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/update", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
} catch (Exception e) {
log.info("xsderror:{}", e);
throw new RuntimeException(e);
}
- gridToDoVo = JSONObject.parseObject(s, GridToDoVo.class);
- return R.ok(gridToDoVo);
+ log.info("xsd:{}", s);
+ JSONObject object = JSONObject.parseObject(s);
+ if (object.getInteger("code") != null && object.getInteger("code") == 0) {
+ gridToDoVo = object.getObject("data", GridToDoVo.class);
+ return R.ok(gridToDoVo, "创建待办成功");
+ } else {
+ return R.fail("创建待办失败");
+ }
}
public R<String> deleteToDo(GridIdsVo gridIdsVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridIdsVo);
@@ -62,7 +76,7 @@
log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel");
String s = null;
try {
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
} catch (Exception e) {
log.info("xsderror:{}", e);
throw new RuntimeException(e);
@@ -77,17 +91,17 @@
}
- public HeadVo iniHeadVo() {
+ public HeadVo initHeadVo() {
HeadVo headVo = new HeadVo();
- headVo.setUsername("mtxt001");
- headVo.setPassword("aek8CdcaM");
+ headVo.setUsername(userName);
+ headVo.setPassword(passWord);
headVo.setRequestId(UUID.randomUUID().toString());
headVo.setSource("string");
return headVo;
}
public R<List<GridToDoVo>> getToDo(GridGetToDoVo gridGetToDoVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoGetRequestVo requestVo = new GridToDoGetRequestVo();
gridGetToDoVo.setCurrent(1);
gridGetToDoVo.setSize(10);
@@ -97,7 +111,7 @@
log.info("xsd:{}", gridUrl + "/sysUserTodo/page");
String s = null;
try {
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
} catch (Exception e) {
log.info("xsderror:{}", e);
throw new RuntimeException(e);
--
Gitblit v1.8.0