Compare commits
No commits in common. "b0e3347d6b037b8770bb15c5c2b36f1500d8a4d9" and "b2f61137a9e9d62cb3deb9258379bb3f8bd51e9b" have entirely different histories.
b0e3347d6b
...
b2f61137a9
@ -32,8 +32,6 @@ 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();
|
||||||
@ -46,11 +44,6 @@ 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;
|
||||||
|
|||||||
@ -292,8 +292,8 @@ public class JmJobStatusServiceImpl implements JmJobStatusService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
wsVo.setSarStatus(curr);
|
// simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
||||||
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, wsVo);
|
simpMessageingTemplate.convertAndSend(WebSocketKey.JM_JOB_STATUS, curr);
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user