From 6c8f67be1c20b22c6eb860f622bfcff1bbae4ddf Mon Sep 17 00:00:00 2001
From: chenlinghy <chenlinghy@cmhi.chinamobile.com>
Date: Sat, 26 Aug 2023 22:01:37 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BB=BB=E5=8A=A1=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=AD=E7=9A=84=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zjyr/beidouservice/common/impl/TaskStatusName.java | 2 +-
 .../zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java   | 2 ++
 .../zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zjyr/beidouservice/common/impl/TaskStatusName.java b/src/main/java/com/zjyr/beidouservice/common/impl/TaskStatusName.java
index e53f6ff..5501e9c 100644
--- a/src/main/java/com/zjyr/beidouservice/common/impl/TaskStatusName.java
+++ b/src/main/java/com/zjyr/beidouservice/common/impl/TaskStatusName.java
@@ -9,7 +9,7 @@ public enum TaskStatusName implements EnumerationBase  {
 
     TASK_TIMEOUT(2, "TASK_TIMEOUT"),
 
-    TASK_UNRESPONSE(3, "TASK_UNRESPONSE"),
+    //TASK_UNRESPONSE(3, "TASK_UNRESPONSE"),
 
     TASK_EXECUTING(4, "TASK_EXECUTING")
     ;
diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
index 2ef56ee..f473ec8 100644
--- a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
+++ b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
@@ -139,12 +139,14 @@ public class AlarmTaskServiceImpl implements AlarmTaskService {
                         .recodeTime(s.getSendTime())
                         .build())
                 .toList();
+        //聚合控制通道
         List<AlarmDeviceTaskDO> deviceTaskList = getAggregatedAlarmDeviceTaskDOS(
                 alarmTaskDOList.stream()
                         .map(AlarmTaskListRespDTO.AlarmTaskRespDTO::getTaskIdStr)
                         .distinct()
                         .toList()
         );
+
         Map<Long, List<AlarmDeviceTaskDO>> deviceTaskMap = deviceTaskList.stream().collect(Collectors.groupingBy(AlarmDeviceTaskDO::getTaskId));
         for (AlarmTaskListRespDTO.AlarmTaskRespDTO task : alarmTaskDOList) {
             Long taskId = task.getId();
diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
index 3bca0cc..3d750f7 100644
--- a/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
+++ b/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
@@ -66,7 +66,7 @@ public class SensorTaskServiceImpl implements SensorTaskService {
 
 
         TaskStatusName respStatus = System.currentTimeMillis() > timeOut ? TaskStatusName.TASK_TIMEOUT :
-                TaskStatusName.TASK_UNRESPONSE;
+                TaskStatusName.TASK_EXECUTING;
 
         List<SensorTask> allTask = sensorTaskMapper.selectAllByTaskId(taskId);
         List<SensorTask> successedTask =