From 6cfbcfbae1acf55076ac163facfce462123a701d Mon Sep 17 00:00:00 2001
From: liyj <1003249715@qq.com>
Date: Fri, 13 Sep 2024 15:44:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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..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);
--
Gitblit v1.8.0