From 19f4474cc4e619d72e479cc2cde62d4974cb3b66 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Mon, 21 Oct 2024 16:01:42 +0800
Subject: [PATCH] feature:新增批量待办操作接口
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java | 52 +++++++++++++++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchRequestVo.java | 9 +++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBacthVo.java | 57 +++++++++++++++++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/utils/BaiduOcrUtils.java | 1
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java | 12 ++++
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchUpdateRequestVo.java | 11 +++
6 files changed, 142 insertions(+), 0 deletions(-)
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java
index dffbb1b..0908e0e 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/controller/GridToDoController.java
@@ -3,6 +3,7 @@
import cn.huge.base.common.bo.R;
import cn.huge.module.grid.domain.vo.GridGetToDoVo;
import cn.huge.module.grid.domain.vo.GridIdsVo;
+import cn.huge.module.grid.domain.vo.GridToDoBacthVo;
import cn.huge.module.grid.domain.vo.GridToDoVo;
import cn.huge.module.grid.service.GridToDoService;
import lombok.extern.slf4j.Slf4j;
@@ -32,8 +33,14 @@
return gridToDoService.createToDo(gridToDoVo);
}
+ @PostMapping("/batch-create-todo")
+ public R<List<GridToDoVo>> batchCreateToDo(@RequestBody GridToDoBacthVo gridToDoVo) {
+ return gridToDoService.batchCreateToDo(gridToDoVo);
+ }
+
/**
* 查询待办
+ *
* @param gridGetToDoVo
* @return
*/
@@ -53,6 +60,11 @@
return gridToDoService.updateToDo(gridToDoVo);
}
+ @PostMapping("/batch-update-todo")
+ public R<List<GridToDoVo>> batchUpdateToDo(@RequestBody List<GridToDoVo> gridToDoVos) {
+ return gridToDoService.batchUpdateToDo(gridToDoVos);
+ }
+
/**
* 删除待办
*
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBacthVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBacthVo.java
new file mode 100644
index 0000000..b8678c5
--- /dev/null
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBacthVo.java
@@ -0,0 +1,57 @@
+package cn.huge.module.grid.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GridToDoBacthVo {
+ /**
+ * 亿迅那边的的主键i，创建成功后返回
+ */
+ private String id;
+ /**
+ * 待办任务id
+ */
+ private String objId;
+ /**
+ 11 待分派矛调工单
+ 12 待签收矛调工单
+ 13 待受理矛调工单
+ 14 待审核矛调工单
+
+ */
+ private String objType;
+
+ /**
+ * 1 事件工单
+ * 2 任务交办
+ * 3 预警线索
+ * 4 群众问题
+ * 5： 矛盾纠纷 基本上我们就填5
+ */
+ private String todoType;
+
+ private String sysContent;
+
+ private String yzyContent;
+
+ private String objTag;
+
+ private String title;
+ /**
+ * 2024-08-27 15:34:51
+ */
+ private String limitTime;
+
+ /**
+ * 用户id
+ */
+ private List<String> userIdList;
+
+ /**
+ * 接收用户手机号
+ */
+ private String mobile;
+
+}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchRequestVo.java
new file mode 100644
index 0000000..492f80d
--- /dev/null
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchRequestVo.java
@@ -0,0 +1,9 @@
+package cn.huge.module.grid.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class GridToDoBatchRequestVo {
+ private HeadVo headVo;
+ private GridToDoBacthVo bodyVo;
+}
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchUpdateRequestVo.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchUpdateRequestVo.java
new file mode 100644
index 0000000..8b6a4d3
--- /dev/null
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/domain/vo/GridToDoBatchUpdateRequestVo.java
@@ -0,0 +1,11 @@
+package cn.huge.module.grid.domain.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GridToDoBatchUpdateRequestVo {
+ private HeadVo headVo;
+ private List<GridToDoVo> 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 73f73db..64af9c7 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
@@ -43,6 +43,33 @@
return R.ok(gridToDoDto);
}
+ public R<List<GridToDoVo>> batchCreateToDo(GridToDoBacthVo gridToDoVo) {
+ HeadVo headVo = initHeadVo();
+ GridToDoBatchRequestVo requestVo = new GridToDoBatchRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridToDoVo);
+ log.info("xsd:{}", JSON.toJSONString(requestVo));
+ log.info("xsd:{}", gridUrl + "/sysUserTodo/saveBatch");
+ String s = null;
+ try {
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ } catch (Exception e) {
+ log.info("xsderror:{}", e);
+ throw new RuntimeException(e);
+ }
+ log.info("xsd:{}", s);
+ JSONObject object = JSONObject.parseObject(s);
+ if (object.getInteger("code") != null && object.getInteger("code") == 0) {
+ JSONArray data = object.getJSONArray("data");
+ List<GridToDoVo> gridToDoVos = data.toJavaList(GridToDoVo.class);
+ return R.ok(gridToDoVos);
+ } else {
+ return R.fail("获取失败");
+ }
+ }
+
+
+
public R<GridToDoVo> updateToDo(GridToDoVo gridToDoVo) {
HeadVo headVo = initHeadVo();
GridToDoRequestVo requestVo = new GridToDoRequestVo();
@@ -67,6 +94,31 @@
}
}
+ public R<List<GridToDoVo>> batchUpdateToDo(List<GridToDoVo> gridToDoVos) {
+ HeadVo headVo = initHeadVo();
+ GridToDoBatchUpdateRequestVo requestVo = new GridToDoBatchUpdateRequestVo();
+ requestVo.setHeadVo(headVo);
+ requestVo.setBodyVo(gridToDoVos);
+ String s = null;
+ log.info("xsd:{}", JSON.toJSONString(requestVo));
+ log.info("xsd:{}", gridUrl + "/sysUserTodo/updateBatch");
+ try {
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/updateBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ } catch (Exception e) {
+ log.info("xsderror:{}", e);
+ throw new RuntimeException(e);
+ }
+ log.info("xsd:{}", s);
+ JSONObject object = JSONObject.parseObject(s);
+ if (object.getInteger("code") != null && object.getInteger("code") == 0) {
+ JSONArray data = object.getJSONArray("data");
+ List<GridToDoVo> list = data.toJavaList(GridToDoVo.class);
+ return R.ok(list);
+ } else {
+ return R.fail("获取失败");
+ }
+ }
+
public R<String> deleteToDo(GridIdsVo gridIdsVo) {
HeadVo headVo = initHeadVo();
GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
diff --git a/dyh-service/dyh-sys/src/main/java/cn/huge/module/utils/BaiduOcrUtils.java b/dyh-service/dyh-sys/src/main/java/cn/huge/module/utils/BaiduOcrUtils.java
index 00d8834..11bba2f 100644
--- a/dyh-service/dyh-sys/src/main/java/cn/huge/module/utils/BaiduOcrUtils.java
+++ b/dyh-service/dyh-sys/src/main/java/cn/huge/module/utils/BaiduOcrUtils.java
@@ -57,6 +57,7 @@
options.put("detect_direction", "true");
options.put("detect_risk", "true");
JSONObject json = client.idcard(images, idCardSide, options);
+ log.info("xsd:{}",json);
JSONObject result = json.getJSONObject("words_result");
// 解析识别结果
IdcardOcrResultDTO idcardOcrResultDTO = new IdcardOcrResultDTO();
--
Gitblit v1.8.0