新增周任务

xieb

2023-11-14 e25630083c3afe7b615e32d99eef0cf0cb905c74

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/feign/PatrolTaskImplClient.java

@@ -24,6 +24,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;
@@ -76,11 +79,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;
   }

@@ -184,8 +185,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 +222,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 +234,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);