From 4d07c1c65427f6ba3cb968ddf0d0b2b669187575 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 May 2023 15:59:10 +0800
Subject: [PATCH] 添加巡逻路线
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 65 +++++++++++++++++++++++++++++---
1 files changed, 59 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 00a5245..9172a71 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
@@ -15,6 +15,7 @@
import cn.gistack.sm.patrol.util.EnhancementServicesTool;
import cn.gistack.sm.patrol.util.IdWorker;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
+import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -32,10 +33,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.net.http.HttpRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
@@ -155,8 +153,8 @@
variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
// 完成任务
flowClient.completeTask(taskId,processInstanceId,comment,variables);
- saveReport(patrolTask);
patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
+ saveReport(patrolTask);
return baseMapper.updateById(patrolTask) >0;
}else {
return false;
@@ -201,7 +199,7 @@
}
@Override
- public PatrolTask customizeGetById(String businessId) {
+ public PatrolTaskVO customizeGetById(String businessId) {
return baseMapper.customizeGetById(businessId);
}
@@ -210,6 +208,61 @@
return baseMapper.getAll(patrolTaskVO);
}
+ @Override
+ public IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
+ List<PatrolTaskReport> list = new ArrayList();
+ if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
+ //省 返回市
+ list = baseMapper.getTaskReportProvincePage(page,patrolTaskReport);
+ }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
+ //市 返回区
+ list = baseMapper.getTaskReportRegionPage(page,patrolTaskReport);
+ }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
+ //区 返回水库
+ list = baseMapper.getTaskReportReservoirPage(page,patrolTaskReport);
+ }
+ return page.setRecords(list);
+ }
+
+ @Override
+ public List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport) {
+ List<PatrolTaskReport> list = new ArrayList();
+ if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
+ //省 返回市
+ list = baseMapper.getTaskReportProvinceList(patrolTaskReport);
+ }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
+ //市 返回区
+ list = baseMapper.getTaskReportRegionList(patrolTaskReport);
+ }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
+ //区 返回水库
+ list = baseMapper.getTaskReportReservoirList(patrolTaskReport);
+ }
+ return list;
+ }
+
+ @Override
+ public IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport) {
+
+ List<PatrolTaskReport> list = new ArrayList();
+ if (Func.isNotEmpty(patrolTaskReport.getReservoirId())){
+ //获取该水库的巡查
+ list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
+ }else {
+ String code = patrolTaskReport.getAdCode();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ //前4位包含00 =》省
+ patrolTaskReport.setAdCode(code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ //前六位包含00 =》市
+ patrolTaskReport.setAdCode(code.substring(0,4));
+ }
+ list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
+ }
+ return page.setRecords(list);
+ }
+
+
+
public void saveReport(PatrolTask patrolTask){
//拿到当前任务下的异常巡查记录
PatrolRecord patrolRecord = new PatrolRecord();
--
Gitblit v1.9.3