libingkun/skyeyesystem
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/main' into dev_20260130_RemoveRedis

Browse Source
This commit is contained in:
longguancheng 2026-02-02 15:50:15 +08:00
commit b0e3347d6b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/dto/JmJobStatusWsDTO.java
View File

@ -32,6 +32,8 @@ public class JmJobStatusWsDTO {
/** 航线状态 */ /** 航线状态 */
private Integer airlineStatus; private Integer airlineStatus;
private JmSarStatusDTO sarStatus;
public JmJobStatusWsDTO setPayload(Long payloadId, ExecStatusEnum payloadStatus) { public JmJobStatusWsDTO setPayload(Long payloadId, ExecStatusEnum payloadStatus) {
this.payloadId = payloadId; this.payloadId = payloadId;
this.payloadStatus = payloadStatus.getValue(); this.payloadStatus = payloadStatus.getValue();
@ -44,6 +46,11 @@ public class JmJobStatusWsDTO {
return this; return this;
} }
public JmJobStatusWsDTO setSarStatus(JmSarStatusDTO sarStatus) {
this.sarStatus = sarStatus;
return this;
}
// 默认任务是执行中的 // 默认任务是执行中的
public JmJobStatusWsDTO(Long jobId, Long uavId) { public JmJobStatusWsDTO(Long jobId, Long uavId) {
this.jobId = jobId; this.jobId = jobId;

4
backend/Skyeye-sys-dev/skyeye-service-manager/src/main/java/com/zhangy/skyeye/jm/service/impl/JmJobStatusServiceImpl.java
View File

@ -292,8 +292,8 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
} }
} }
// simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo); wsVo.setSarStatus(curr);
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, curr); simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
} else { } else {
return; return;
} }