From f33bb23ebe6ea8e805c84fa3020a9cc307a29a00 Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Tue, 22 Oct 2024 15:14:27 +0800
Subject: [PATCH] feature:本地环境能提交到亿迅环境兼容
---
dyh-service/dyh-sys/src/main/java/cn/huge/module/grid/service/GridToDoService.java | 35 +++++++++++++++++++++++++----------
1 files changed, 25 insertions(+), 10 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 55e7353..8aa169c 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
@@ -3,6 +3,7 @@
import cn.huge.base.common.bo.R;
import cn.huge.base.common.utils.HttpClientUtils;
import cn.huge.base.common.utils.ObjectUtils;
+import cn.huge.base.common.utils.SpringContextUtil;
import cn.huge.module.grid.domain.po.GridCaseTask;
import cn.huge.module.sys.vo.*;
import cn.huge.module.grid.domain.vo.*;
@@ -30,7 +31,7 @@
private String userName;
@Value("${grid.password}")
private String passWord;
-
+ private String testUrl = "http://183.2.142.21:9007";
@Autowired
private GridCaseTaskService gridCaseTaskService;
@Autowired
@@ -52,7 +53,7 @@
}
log.info("xsd:{}", s);
GridToDoVo gridToDoDto = JSONObject.parseObject(s).getObject("data", GridToDoVo.class);
- if(ObjectUtils.isNotEmpty(gridToDoDto)){
+ if (ObjectUtils.isNotEmpty(gridToDoDto)) {
GridCaseTask gridCaseTask = new GridCaseTask();
BeanUtils.copyProperties(gridToDoDto, gridCaseTask);
gridCaseTaskService.save(gridCaseTask);
@@ -69,7 +70,12 @@
log.info("xsd:{}", gridUrl + "/sysUserTodo/saveBatch");
String s = null;
try {
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}", testUrl + "/api/thrid/grid/todo/batch-create-todo");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-create-todo", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ } else {
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/saveBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
} catch (Exception e) {
log.info("xsderror:{}", e);
throw new RuntimeException(e);
@@ -84,7 +90,6 @@
return R.fail("获取失败");
}
}
-
public R<GridToDoVo> updateToDo(GridToDoVo gridToDoVo) {
@@ -120,7 +125,12 @@
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");
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}", testUrl + "/api/thrid/grid/todo/batch-update-todo");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/batch-update-todo", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ } else {
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/updateBatch", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
} catch (Exception e) {
log.info("xsderror:{}", e);
throw new RuntimeException(e);
@@ -145,7 +155,12 @@
log.info("xsd:{}", gridUrl + "/sysUserTodo/batchDel");
String s = null;
try {
- s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ if (SpringContextUtil.checkDev()) {
+ log.info("xsdurl:{}", testUrl + "/api/thrid/grid/todo/delete-todo");
+ s = HttpClientUtils.httpPostRaw(testUrl + "/api/thrid/grid/todo/delete-todo", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ } else {
+ s = HttpClientUtils.httpPostRaw(gridUrl + "/sysUserTodo/batchDel", JSON.toJSONString(requestVo), new HashMap<>(), "utf-8");
+ }
} catch (Exception e) {
log.info("xsderror:{}", e);
throw new RuntimeException(e);
@@ -202,7 +217,7 @@
//修改网格系统工单
List<GridToDoVo> gridToDoVoList = new ArrayList<>();
List<GridCaseTask> gridCaseTaskList = gridCaseTaskService.listGridCaseTask(gridToDoVo.getCaseId(), previousTaskId);
- for(GridCaseTask gridCaseTask: gridCaseTaskList){
+ for (GridCaseTask gridCaseTask : gridCaseTaskList) {
gridToDoVo.setId(gridCaseTask.getId());
gridToDoVo.setMobile(gridCaseTask.getMobile());
gridToDoVoList.add(gridToDoVo);
@@ -211,7 +226,7 @@
//修改保存的待办工单
List<GridToDoVo> GridToDoVoResult = resultData.getData();
List<GridCaseTask> gridCaseTaskListNew = new ArrayList<>();
- for(GridToDoVo gridToDoVoResult: GridToDoVoResult){
+ for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
GridCaseTask gridCaseTask = new GridCaseTask();
BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
gridCaseTaskListNew.add(gridCaseTask);
@@ -224,13 +239,13 @@
GridOrgUsersVo gridOrgUsersVo = new GridOrgUsersVo();
gridOrgUsersVo.setCurrOrgId(unitId);
List<GridUserVo> gridUserVoList = gridUserService.getUserListByOrg(gridOrgUsersVo).getData();
- List<String> userIdList = gridUserVoList.stream().map(GridUserVo:: getId).collect(Collectors.toList());
+ List<String> userIdList = gridUserVoList.stream().map(GridUserVo::getId).collect(Collectors.toList());
gridToDoBacthVo.setUserIdList(userIdList);
R<List<GridToDoVo>> resultData = this.batchCreateToDo(gridToDoBacthVo);
//保存待办工单
List<GridToDoVo> GridToDoVoResult = resultData.getData();
List<GridCaseTask> gridCaseTaskListNew = new ArrayList<>();
- for(GridToDoVo gridToDoVoResult: GridToDoVoResult){
+ for (GridToDoVo gridToDoVoResult : GridToDoVoResult) {
GridCaseTask gridCaseTask = new GridCaseTask();
BeanUtils.copyProperties(gridToDoVoResult, gridCaseTask);
gridCaseTaskListNew.add(gridCaseTask);
--
Gitblit v1.8.0