From 239f9f389ba2771a5ec3a14f5ff4ed1e08af6a75 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Tue, 14 Nov 2023 15:46:40 +0800
Subject: [PATCH] 回滚
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java | 46 ++--------------------------------------------
1 files changed, 2 insertions(+), 44 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..1d0bb6e 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
@@ -76,11 +76,9 @@
public List<Integer> createTaskJobHandler(String processDefinitionId,
String taskType,
String title,
- String startTime,
- String endTime,
String content) {
List<PatrolResponsiblePerson> patrolResponsiblePersonList = attResManagePersonService.getPatrolResponsiblePersonAll();
- List<Integer> taskJob = createTaskJob(processDefinitionId, taskType, title, content, startTime, endTime, patrolResponsiblePersonList);
+ List<Integer> taskJob = createTaskJob(processDefinitionId, taskType, title, content, patrolResponsiblePersonList);
return taskJob;
}
@@ -184,8 +182,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));
@@ -198,45 +195,6 @@
// 开始时间-结束时间
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);
- patrolTask.setTaskType(taskType);
- // 创建任务
- patrolTaskService.startProcess(patrolTask);
- } catch (Exception e) {
- log.error("创建任务失败：" + e.getMessage());
- log.error("创建任务失败对象：" + JSON.toJSONString(item));
- failureCount.getAndIncrement();
- }
-
- });
- List<Integer> list = new ArrayList<>();
- list.add(patrolResponsiblePersonList.size());
- list.add(failureCount.get());
- // 返回
- return list;
- }
-
- public List<Integer> createTaskJob(String processDefinitionId,
- String taskType,
- String title,
- String content,
- String startTime,
- String endTime,
- List<PatrolResponsiblePerson> patrolResponsiblePersonList){
- AtomicInteger failureCount = new AtomicInteger();
- patrolResponsiblePersonList.forEach(item -> {
- log.info("当前创建任务对象:" + JSON.toJSONString(item));
- try {
- PatrolTask patrolTask = new PatrolTask();
- patrolTask.setProcessDefinitionId(processDefinitionId);
- patrolTask.setToUserId(item.getUserId());
- patrolTask.setProjectId(item.getResGuid());
- patrolTask.setReservoirName(item.getName());
- // 开始时间-结束时间
- patrolTask.setStartTime(startTime);
- patrolTask.setEndTime(endTime);
// 标题格式 月-日 水库名称 每日巡检任务
patrolTask.setTitle(DateUtil.format(new Date(),"MM-dd") + item.getName() + "-" + title);
patrolTask.setContent(DateUtil.format(new Date(),"yyyyMMdd") +content);
--
Gitblit v1.9.3