diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/dto/JmJobStatusWsDTO.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/dto/JmJobStatusWsDTO.java index c2e6e8f..1ebcbc5 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/dto/JmJobStatusWsDTO.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/dto/JmJobStatusWsDTO.java @@ -32,6 +32,8 @@ public class JmJobStatusWsDTO { /** 航线状态 */ private Integer airlineStatus; + private JmSarStatusDTO sarStatus; + public JmJobStatusWsDTO setPayload(Long payloadId, ExecStatusEnum payloadStatus) { this.payloadId = payloadId; this.payloadStatus = payloadStatus.getValue(); @@ -44,6 +46,11 @@ public class JmJobStatusWsDTO { return this; } + public JmJobStatusWsDTO setSarStatus(JmSarStatusDTO sarStatus) { + this.sarStatus = sarStatus; + return this; + } + // 默认任务是执行中的 public JmJobStatusWsDTO(Long jobId, Long uavId) { this.jobId = jobId; diff --git a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java index ed52b92..dfa974d 100644 --- a/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java +++ b/backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java @@ -292,8 +292,8 @@ public class JmJobStatusServiceImpl implements JmJobStatusService { } } - // simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); - simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, curr); + wsVo.setSarStatus(curr); + simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); } else { return; }