From ae830f0421032b415ab505e8fbd82d257d01f1d5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 05 Dec 2023 17:24:31 +0800
Subject: [PATCH] 大坝安全预警任务下发
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java | 61 +++++++++++++++++++++++++-----
1 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java
index 1ed0cf6..abde6fa 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java
@@ -4,7 +4,9 @@
import cn.gistack.sm.intelligentCall.service.CallService;
import cn.gistack.sm.patrol.entity.PatrolTask;
import cn.gistack.sm.patrol.service.IPatrolTaskService;
+import cn.gistack.sm.sjztmd.entity.AttResBase;
import cn.gistack.sm.sjztmd.entity.PatrolResponsiblePerson;
+import cn.gistack.sm.sjztmd.service.IAttResBaseService;
import cn.gistack.sm.sjztmd.service.IAttResManagePersonService;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
@@ -24,6 +26,9 @@
import org.springframework.web.client.RestTemplate;
import springfox.documentation.annotations.ApiIgnore;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.time.temporal.ChronoField;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -49,6 +54,7 @@
private static final String ONLINE = "http://10.42.6.192";
private final IPatrolTaskService patrolTaskService;
private final IAttResManagePersonService attResManagePersonService;
+ private final IAttResBaseService attResBaseService;
@Autowired
private RestTemplate restTemplate;
@@ -76,11 +82,9 @@
public List<Integer> createTaskJobHandler(String processDefinitionId,
String taskType,
String title,
- String startTime,
- String endTime,
- String content) {
+ String content, int type) {
List<PatrolResponsiblePerson> patrolResponsiblePersonList = attResManagePersonService.getPatrolResponsiblePersonAll();
- List<Integer> taskJob = createTaskJob(processDefinitionId, taskType, title, content, startTime, endTime, patrolResponsiblePersonList);
+ List<Integer> taskJob = createTaskJob(processDefinitionId, taskType, title, content, type, patrolResponsiblePersonList);
return taskJob;
}
@@ -108,6 +112,32 @@
List<Integer> taskJob = createTaskJob(processDefinitionId, taskType, title, content, patrolResponsiblePersonList);
return taskJob;
+ }
+
+ @Override
+ public String createTask(String processDefinitionId, String taskType, String title, String content, String resCd) {
+ //根据水库id获取巡查责任人
+ List<String> resList = new ArrayList<>();
+ resList.add(resCd);
+
+ List<PatrolResponsiblePerson> patrolResponsiblePersonByResCdList = attResManagePersonService.getPatrolResponsiblePersonByResCdList(resList);
+ PatrolResponsiblePerson patrolResponsiblePerson = patrolResponsiblePersonByResCdList.get(0);
+ //不确定是否有多个，循环下发
+ PatrolTask patrolTask = new PatrolTask();
+ patrolTask.setProcessDefinitionId(processDefinitionId);
+ patrolTask.setToUserId(patrolResponsiblePerson.getUserId());
+ patrolTask.setProjectId(resCd);
+
+ patrolTask.setReservoirName(patrolResponsiblePerson.getName());
+ patrolTask.setStartTime(DateUtil.format(new Date(),"yyyy-MM-dd 00:00:00"));
+ patrolTask.setEndTime(DateUtil.format(new Date(),"yyyy-MM-dd 23:59:59"));
+
+ patrolTask.setTitle(title);
+ patrolTask.setContent(content);
+ patrolTask.setTaskType(taskType);
+ patrolTaskService.startProcess(patrolTask);
+ String taskId = patrolTask.getId().toString();
+ return taskId;
}
@@ -184,8 +214,7 @@
public List<Integer> createTaskJob(String processDefinitionId,
String taskType,
String title,
- String content,
- List<PatrolResponsiblePerson> patrolResponsiblePersonList){
+ String content,List<PatrolResponsiblePerson> patrolResponsiblePersonList){
AtomicInteger failureCount = new AtomicInteger();
patrolResponsiblePersonList.forEach(item -> {
log.info("当前创建任务对象:" + JSON.toJSONString(item));
@@ -222,8 +251,7 @@
String taskType,
String title,
String content,
- String startTime,
- String endTime,
+ int type,
List<PatrolResponsiblePerson> patrolResponsiblePersonList){
AtomicInteger failureCount = new AtomicInteger();
patrolResponsiblePersonList.forEach(item -> {
@@ -235,8 +263,21 @@
patrolTask.setProjectId(item.getResGuid());
patrolTask.setReservoirName(item.getName());
// 开始时间-结束时间
- patrolTask.setStartTime(startTime);
- patrolTask.setEndTime(endTime);
+ if (type == 1) { //周任务
+ LocalDate today = LocalDate.now();
+ LocalDate firstDayOfWeek = today.with(ChronoField.DAY_OF_WEEK, 1);
+ LocalDate lastDayOfWeek = today.with(ChronoField.DAY_OF_WEEK, 7);
+
+ String firstDayOfWeekString = firstDayOfWeek.format(DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00"));
+ String lastDayOfWeekString = lastDayOfWeek.format(DateTimeFormatter.ofPattern("yyyy-MM-dd 23:59:59"));
+
+ patrolTask.setStartTime(firstDayOfWeekString);
+ patrolTask.setEndTime(lastDayOfWeekString);
+ } else { // 默认天任务
+ patrolTask.setStartTime(DateUtil.format(new Date(),"yyyy-MM-dd 00:00:00"));
+ patrolTask.setEndTime(DateUtil.format(new Date(),"yyyy-MM-dd 23:59:59"));
+ }
+
// 标题格式 月-日 水库名称 每日巡检任务
patrolTask.setTitle(DateUtil.format(new Date(),"MM-dd") + item.getName() + "-" + title);
patrolTask.setContent(DateUtil.format(new Date(),"yyyyMMdd") +content);
--
Gitblit v1.9.3