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/GridToDoService.java | 70 +++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 28 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 b44ac1e..b88d4af 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
@@ -6,6 +6,7 @@
import cn.huge.module.grid.domain.po.GridCaseTask;
import cn.huge.module.sys.vo.*;
import cn.huge.module.grid.domain.vo.*;
+import com.alibaba.druid.support.logging.Log;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -66,16 +67,16 @@
GridToDoBatchRequestVo requestVo = new GridToDoBatchRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridToDoVo);
- log.info("xsd:{}", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
- log.info("xsd:{}", gridUrl + "/api/thrid/grid/todo/batch-create-todo" + JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
+
String s = null;
try {
if (SpringContextUtil.checkDev()) {
- Map<String, String> header = new HashMap<>();
- String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcyOTI1MCwiaWF0IjoxNzI5Njg2MDUwLCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.pPZsj-PpKD0m9SynBlL4KTiLVMx_r1rdDDX5wpEGwuY";
- header.put("Authorization", authorizationValue);
- s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-create-todo", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty), header, "utf-8");
+ log.info("xsd:{}", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
+ log.info("xsd:{}", testUrl + "/api/thrid/grid/todo/batch-create-todo" + JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-create-todo", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
} else {
+ log.info("xsd:{}", JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
+ log.info("xsd:{}", gridUrl + "/sysUserTodo/saveBatch" + JSON.toJSONString(gridToDoVo, SerializerFeature.WriteNullStringAsEmpty));
s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
}
} catch (Exception e) {
@@ -153,16 +154,14 @@
GridToDoDeleteRequestVo requestVo = new GridToDoDeleteRequestVo();
requestVo.setHeadVo(headVo);
requestVo.setBodyVo(gridIdsVo);
- log.info("xsd:{}", requestVo);
- log.info("xsd:{}", testUrl + "/sysUserTodo/batchDel" + JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty));
String s = null;
try {
if (SpringContextUtil.checkDev()) {
- Map<String, String> header = new HashMap<>();
- String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcyOTI1MCwiaWF0IjoxNzI5Njg2MDUwLCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.pPZsj-PpKD0m9SynBlL4KTiLVMx_r1rdDDX5wpEGwuY";
- header.put("Authorization", authorizationValue);
- s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/delete-todo", JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty), header, "utf-8");
+ log.info("xsd:{}", requestVo);
+ log.info("xsd:{}", testUrl + "/api/thrid/grid/todo/delete-todo" + JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty));
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/delete-todo", JSON.toJSONString(gridIdsVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
} else {
+ log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel" + JSON.toJSONString(requestVo, SerializerFeature.WriteNullStringAsEmpty));
s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
}
} catch (Exception e) {
@@ -199,10 +198,7 @@
String s = null;
try {
if (SpringContextUtil.checkDev()) {
- Map<String, String> header = new HashMap<>();
- String authorizationValue = "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJIVUdFSU5GTyIsImV4cCI6MTcyOTcyOTI1MCwiaWF0IjoxNzI5Njg2MDUwLCJ1c2VySWQiOiJkNjY2ZTUzZGMwMjU0NjNkYTllZTkwOTUyNjk5MTljNCYyMl8wMDAyNC0zIn0.pPZsj-PpKD0m9SynBlL4KTiLVMx_r1rdDDX5wpEGwuY";
- header.put("Authorization", authorizationValue);
- s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/get-todo", JSON.toJSONString(gridGetToDoVo, SerializerFeature.WriteNullStringAsEmpty), header, "utf-8");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/get-todo", JSON.toJSONString(gridGetToDoVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
} else {
s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/page", JSON.toJSONString(gridGetToDoVo, SerializerFeature.WriteNullStringAsEmpty), new HashMap<>(), "utf-8");
}
@@ -225,7 +221,7 @@
public R<List<GridToDoVo>> updateTaskToDo(GridToDoVo gridToDoVo, String previousTaskId) {
//修改网格系统工单
List<GridToDoVo> gridToDoVoList = new ArrayList<>();
- List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridToDoVo.getCaseId(), previousTaskId);
+ List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridToDoVo.getObjId(), previousTaskId);
for (GridCaseTask gridCaseTask : gridCaseTaskList) {
gridToDoVo.setId(gridCaseTask.getId());
gridToDoVo.setMobile(gridCaseTask.getMobile());
@@ -238,8 +234,8 @@
for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
GridCaseTask gridCaseTask = new GridCaseTask();
BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
- gridCaseTask.setCaseId(gridToDoVo.getCaseId());
- gridCaseTask.setCaseTaskId(gridToDoVo.getObjId());
+ gridCaseTask.setCaseId(gridToDoVo.getObjId());
+ gridCaseTask.setCaseTaskId(gridToDoVo.getCaseTaskId());
gridCaseTaskListNew.add(gridCaseTask);
}
gridCaseTaskService.updateBatchById(gridCaseTaskListNew);
@@ -247,18 +243,22 @@
}
public R<List<GridToDoVo>> createTaskToDo(GridToDoBacthVo gridToDoBacthVo, String unitId) {
+ Date now = DateUtils.getNowDate();
//查询网格组织编号
String gridUnitId = gridCaseTaskMapper.getGridUnitIdByUnitId(unitId);
+ log.info("caseId:" + gridToDoBacthVo.getObjId() + "查询到网格组织编号为：" + gridUnitId);
if(org.apache.commons.lang3.StringUtils.isNotBlank(gridUnitId)){
//查询组织下用户
GridOrgUsersVo gridOrgUsersVo = new GridOrgUsersVo();
gridOrgUsersVo.setCurrOrgId(gridUnitId);
List<GridUserVo> gridUserVoList = gridUserService.getUserListByOrg(gridOrgUsersVo).getData();
+ log.info("caseId:" + gridToDoBacthVo.getObjId() + "查询到网格编号为："+gridUnitId+ "下的用户有："+ gridUserVoList.stream().map(GridUserVo:: getId).collect(Collectors.joining(",")));
if(CollectionUtils.isNotEmpty(gridUserVoList)){
//创建待办工单
List<String> userIdList = gridUserVoList.stream().map(GridUserVo::getId).collect(Collectors.toList());
gridToDoBacthVo.setUserIdList(userIdList);
R<List<GridToDoVo>> resultData = this.batchCreateToDo(gridToDoBacthVo);
+ log.info("caseId:" + gridToDoBacthVo.getObjId() + "批量添加网格任务成功");
//保存待办工单
List<GridToDoVo> GridToDoVoResult = resultData.getData();
if(CollectionUtils.isNotEmpty(GridToDoVoResult)) {
@@ -266,12 +266,15 @@
for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
GridCaseTask gridCaseTask = new GridCaseTask();
BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
- gridCaseTask.setCaseId(gridToDoBacthVo.getCaseId());
- gridCaseTask.setCaseTaskId(gridToDoBacthVo.getObjId());
+ gridCaseTask.setCaseId(gridToDoBacthVo.getObjId());
+ gridCaseTask.setCaseTaskId(gridToDoBacthVo.getCaseTaskId());
+ gridCaseTask.setCreateTime(now);
+ gridCaseTask.setUpdateTime(now);
gridCaseTaskListNew.add(gridCaseTask);
}
BeanUtils.copyProperties(GridToDoVoResult, gridCaseTaskListNew);
gridCaseTaskService.saveBatch(gridCaseTaskListNew);
+ log.info("caseId:" + gridToDoBacthVo.getObjId() + "成功在本系统添加网格待办信息");
}
return resultData;
}
@@ -280,12 +283,23 @@
}
public R<String> deleteTaskToDo(GridTaskVo gridTaskVo) {
- List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridTaskVo.getCaseId(), gridTaskVo.getCaseTaskId());
- List<String> idList = gridCaseTaskList.stream().map(GridCaseTask::getId).collect(Collectors.toList());
- GridIdsVo gridIdsVo = new GridIdsVo();
- gridIdsVo.setIds(idList);
- R<String> result = this.deleteToDo(gridIdsVo);
- gridCaseTaskService.removeByIds(idList);
- return result;
+ try {
+ List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridTaskVo.getCaseId(), gridTaskVo.getCaseTaskId());
+ List<String> idList = gridCaseTaskList.stream().map(GridCaseTask::getId).collect(Collectors.toList());
+ String ids = gridCaseTaskList.stream().map(GridCaseTask::getId).collect(Collectors.joining(","));
+ log.info("caseId:" + gridTaskVo.getCaseId() + "查询到本系统保存的编号" + ids);
+
+ GridIdsVo gridIdsVo = new GridIdsVo();
+ gridIdsVo.setIds(idList);
+ R<String> result = this.deleteToDo(gridIdsVo);
+ log.info("caseId:" + gridTaskVo.getCaseId() + "成功删除网格系统的待办任务，编号为：" + ids);
+ gridCaseTaskService.removeByIds(idList);
+ log.info("caseId:" + gridTaskVo.getCaseId() + "成功删除本系统保存的网格任务，编号为：" + ids);
+ return result;
+ }catch (Exception e){
+ log.info("xsderror:{}", e);
+ throw new RuntimeException(e);
+ }
+
}
}
--
Gitblit v1.8.0