From 76ec88ee2dc570deeab75c05cebc6e92254e069b Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Fri, 13 Sep 2024 15:04:15 +0800
Subject: [PATCH] 亿迅对接接口增加
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRequestVo.java | 9 ++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridUserService.java | 22 +++++++++--
dyh-service/dyh-sys/src/main/resources/config/application.yml | 4 +-
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java | 15 ++++---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridTokenVo.java | 8 ++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridUserInfoController.java | 6 ++-
6 files changed, 50 insertions(+), 14 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 093050e..3844603 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,6 +1,8 @@
package cn.huge.module.grid.controller;
import cn.huge.base.common.bo.R;
+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.service.GridUserService;
import lombok.extern.slf4j.Slf4j;
@@ -24,7 +26,7 @@
* @return
*/
@PostMapping("/get-userinfo")
- public R<GridUserVo> getUserInfo(@RequestBody String token) {
- return gridUserService.getUserInfo(token);
+ public R<GridUserVo> getUserInfo(@RequestBody GridTokenVo gridTokenVo) {
+ return gridUserService.getUserInfo(gridTokenVo);
}
}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridTokenVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridTokenVo.java
new file mode 100644
index 0000000..d9998e5
--- /dev/null
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridTokenVo.java
@@ -0,0 +1,8 @@
+package cn.huge.module.grid.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class GridTokenVo {
+ private String token;
+}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRequestVo.java
new file mode 100644
index 0000000..b499dde
--- /dev/null
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridUserRequestVo.java
@@ -0,0 +1,9 @@
+package cn.huge.module.grid.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class GridUserRequestVo {
+ private HeadVo headVo;
+ private GridTokenVo bodyVo;
+}
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..6484a52 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
@@ -19,7 +19,7 @@
private String gridUrl = "http://219.137.166.84:8061";
public R<GridToDoVo> createToDo(GridToDoVo gridToDoVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoRequestVo requestVo = new GridToDoRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridToDoVo);
@@ -38,23 +38,26 @@
}
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);
+ log.info("xsd:{}", s);
+ gridToDoVo = JSONObject.parseObject(s).getObject("data", GridToDoVo.class);
return R.ok(gridToDoVo);
}
public R<String> deleteToDo(GridIdsVo gridIdsVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridIdsVo);
@@ -77,7 +80,7 @@
}
- public HeadVo iniHeadVo() {
+ public HeadVo initHeadVo() {
HeadVo headVo = new HeadVo();
headVo.setUsername("mtxt001");
headVo.setPassword("aek8CdcaM");
@@ -87,7 +90,7 @@
}
public R<List<GridToDoVo>> getToDo(GridGetToDoVo gridGetToDoVo) {
- HeadVo headVo = iniHeadVo();
+ HeadVo headVo = initHeadVo();
GridToDoGetRequestVo requestVo = new GridToDoGetRequestVo();
gridGetToDoVo.setCurrent(1);
gridGetToDoVo.setSize(10);
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 182bdd1..8e4f76f 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
@@ -2,25 +2,30 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
-import cn.huge.module.grid.domain.vo.GridUserVo;
+import cn.huge.module.grid.domain.vo.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.HashMap;
+import java.util.UUID;
@Slf4j
@Service
public class GridUserService {
private String gridUrl = "http://219.137.166.84:8061";
- public R<GridUserVo> getUserInfo(String token) {
+ public R<GridUserVo> getUserInfo(GridTokenVo gridTokenVo) {
String s = null;
+ HeadVo headVo = initHeadVo();
+ GridUserRequestVo requestVo = new GridUserRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridTokenVo);
try {
- log.info("xsd:{}",JSON.toJSONString(token));
+ log.info("xsdobject:{}",JSON.toJSONString(requestVo));
log.info("xsdurl:{}",gridUrl + "/sys/getUserByToken");
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(token), new HashMap<>(), "utf-8");
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sys/getUserByToken", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
log.info("xsd:{}",s);
} catch (Exception e) {
log.info("xsderror:{}",e.getLocalizedMessage());
@@ -29,4 +34,13 @@
GridUserVo gridUserVo = JSONObject.parseObject(s).getObject("data", GridUserVo.class);
return R.ok(gridUserVo);
}
+
+ public HeadVo initHeadVo() {
+ HeadVo headVo = new HeadVo();
+ headVo.setUsername("mtxt001");
+ headVo.setPassword("aek8CdcaM");
+ headVo.setRequestId(UUID.randomUUID().toString());
+ headVo.setSource("string");
+ return headVo;
+ }
}
diff --git a/dyh-service/dyh-sys/src/main/resources/config/application.yml b/dyh-service/dyh-sys/src/main/resources/config/application.yml
index 1f89e91..26b9434 100644
--- a/dyh-service/dyh-sys/src/main/resources/config/application.yml
+++ b/dyh-service/dyh-sys/src/main/resources/config/application.yml
@@ -2,8 +2,8 @@
spring:
profiles:
active:
- - dev
- # - test
+# - dev
+ - test
# - prod
devtools:
--
Gitblit v1.8.0