From aa2004ef65a3d8c8e15ec1689fc4f8e1b8d91c59 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 24 Jan 2024 17:05:41 +0800
Subject: [PATCH] 巡检申报增加水库字段
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
index c3120e2..d611412 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -5,6 +5,7 @@
import cn.gistack.flow.core.feign.IFlowClient;
import cn.gistack.flow.core.utils.FlowUtil;
import cn.gistack.flow.core.utils.TaskUtil;
+import cn.gistack.nky.fegin.INkyClient;
import cn.gistack.sm.patrol.entity.PatrolRecord;
import cn.gistack.sm.patrol.entity.PatrolReport;
import cn.gistack.sm.patrol.entity.PatrolTask;
@@ -18,6 +19,7 @@
import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import cn.gistack.sm.patrol.vo.TaskStatusCount;
+import cn.gistack.sm.sjztmd.service.IYwTermitesTaskService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
import org.springblade.core.log.exception.ServiceException;
@@ -26,16 +28,12 @@
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.StringUtil;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.net.http.HttpRequest;
import java.util.*;
-import java.util.stream.Collectors;
import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
@@ -46,6 +44,8 @@
private final IFlowClient flowClient;
private final IPatrolRecordService patrolRecordService;
private final IPatrolReportService patrolReportService;
+ private final INkyClient nkyClient;
+ private final IYwTermitesTaskService waterDataTermitesService;
/**
* 自定义分页查询
@@ -113,7 +113,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean startProcess(PatrolTask patrolTask) {
+ public PatrolTask startProcess(PatrolTask patrolTask) {
String businessTable = FlowUtil.getBusinessTable(ProcessConstant.PATROL_KEY);
if (Func.isEmpty(patrolTask.getId())) {
save(patrolTask);
@@ -133,7 +133,7 @@
} else {
updateById(patrolTask);
}
- return true;
+ return patrolTask;
}
@Override
@@ -160,6 +160,15 @@
//保存上报
//停用
// saveReport(patrolTask);
+
+
+ //查监测预警表，看是否有这个任务，有的话修改任务状态
+ Boolean finishDamTask = nkyClient.finishTask(patrolTask.getId().toString());
+ if (!finishDamTask){
+ //查白蚁表，看是否有这个任务，有的话修改任务状态
+ Boolean finishTermitesTask = waterDataTermitesService.finishTask(patrolTask.getId().toString());
+ }
+
return baseMapper.updateById(patrolTask) >0;
}else {
return false;
--
Gitblit v1.9.3