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

Compare commits

base: libingkun:b0e3347d6b037b8770bb15c5c2b36f1500d8a4d9
Branches Tags
libingkun:main
libingkun:dev_20260130_RemoveRedis
libingkun:dev-i18n
libingkun:splicing_test
..
compare: libingkun:b2f61137a9e9d62cb3deb9258379bb3f8bd51e9b
Branches Tags
libingkun:dev_20260130_RemoveRedis
libingkun:main
libingkun:dev-i18n
libingkun:splicing_test

No commits in common. "b0e3347d6b037b8770bb15c5c2b36f1500d8a4d9" and "b2f61137a9e9d62cb3deb9258379bb3f8bd51e9b" have entirely different histories.
b0e3347d6b ... b2f61137a9

2 changed files with 2 additions and 9 deletions
Show Stats 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,8 +32,6 @@ public class JmJobStatusWsDTO {
/** 航线状态 */
private Integer airlineStatus;
private JmSarStatusDTO sarStatus;
public JmJobStatusWsDTO setPayload(Long payloadId, ExecStatusEnum payloadStatus) {
this.payloadId = payloadId;
this.payloadStatus = payloadStatus.getValue();
@ -46,11 +44,6 @@ public class JmJobStatusWsDTO {
return this;
}
public JmJobStatusWsDTO setSarStatus(JmSarStatusDTO sarStatus) {
this.sarStatus = sarStatus;
return this;
}
// 默认任务是执行中的
public JmJobStatusWsDTO(Long jobId, Long uavId) {
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 {
}
}
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 {
return;
}