zjyr
/
PlatformServer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

统一任务执行中的状态

This commit is contained in:
chenlinghy 2023-08-26 22:01:37 +08:00
parent 20e29e5b02
commit 6c8f67be1c
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zjyr/beidouservice/common/impl/TaskStatusName.java
View File

@ -9,7 +9,7 @@ public enum TaskStatusName implements EnumerationBase {
TASK_TIMEOUT(2, "TASK_TIMEOUT"), TASK_TIMEOUT(2, "TASK_TIMEOUT"),
TASK_UNRESPONSE(3, "TASK_UNRESPONSE"), //TASK_UNRESPONSE(3, "TASK_UNRESPONSE"),
TASK_EXECUTING(4, "TASK_EXECUTING") TASK_EXECUTING(4, "TASK_EXECUTING")
; ;

2
src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
View File

@ -139,12 +139,14 @@ public class AlarmTaskServiceImpl implements AlarmTaskService {
.recodeTime(s.getSendTime()) .recodeTime(s.getSendTime())
.build()) .build())
.toList(); .toList();
//聚合控制通道
List<AlarmDeviceTaskDO> deviceTaskList = getAggregatedAlarmDeviceTaskDOS( List<AlarmDeviceTaskDO> deviceTaskList = getAggregatedAlarmDeviceTaskDOS(
alarmTaskDOList.stream() alarmTaskDOList.stream()
.map(AlarmTaskListRespDTO.AlarmTaskRespDTO::getTaskIdStr) .map(AlarmTaskListRespDTO.AlarmTaskRespDTO::getTaskIdStr)
.distinct() .distinct()
.toList() .toList()
); );
Map<Long, List<AlarmDeviceTaskDO>> deviceTaskMap = deviceTaskList.stream().collect(Collectors.groupingBy(AlarmDeviceTaskDO::getTaskId)); Map<Long, List<AlarmDeviceTaskDO>> deviceTaskMap = deviceTaskList.stream().collect(Collectors.groupingBy(AlarmDeviceTaskDO::getTaskId));
for (AlarmTaskListRespDTO.AlarmTaskRespDTO task : alarmTaskDOList) { for (AlarmTaskListRespDTO.AlarmTaskRespDTO task : alarmTaskDOList) {
Long taskId = task.getId(); Long taskId = task.getId();

2
src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
View File

@ -66,7 +66,7 @@ public class SensorTaskServiceImpl implements SensorTaskService {
TaskStatusName respStatus = System.currentTimeMillis() > timeOut ? TaskStatusName.TASK_TIMEOUT : TaskStatusName respStatus = System.currentTimeMillis() > timeOut ? TaskStatusName.TASK_TIMEOUT :
TaskStatusName.TASK_UNRESPONSE; TaskStatusName.TASK_EXECUTING;
List<SensorTask> allTask = sensorTaskMapper.selectAllByTaskId(taskId); List<SensorTask> allTask = sensorTaskMapper.selectAllByTaskId(taskId);
List<SensorTask> successedTask = List<SensorTask> successedTask =