diff --git a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java index fc825ab..85f68df 100644 --- a/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java +++ b/src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java @@ -77,7 +77,8 @@ public class SprayTaskExecutor { webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.START, "喷涂任务开始执行")); //计算剩余时间 List> finishTimeMap = estimateCompletionTimePerSlide(); - webSocketService.pushMsg(WebSocketMessageType.SPRAY_TASK_FINISH_TIME, finishTimeMap);//向前端推送当前路径 + FinishTimeWsPushBO finishTimeWsPushBO = new FinishTimeWsPushBO(sprayTask.getCmdId(), sprayTask.getCmdCode(), finishTimeMap); + webSocketService.pushMsg(WebSocketMessageType.SPRAY_TASK_FINISH_TIME, finishTimeWsPushBO);//向前端推送当前路径 sprayTask.setFinishTimeMap(finishTimeMap); List sprayTaskParams = sprayTask.getSprayTaskParams(); for (SprayTaskParams sprayTaskParam : sprayTaskParams) {//循环玻片 diff --git a/src/main/java/com/qyft/ms/app/model/bo/FinishTimeWsPushBO.java b/src/main/java/com/qyft/ms/app/model/bo/FinishTimeWsPushBO.java new file mode 100644 index 0000000..79ccd96 --- /dev/null +++ b/src/main/java/com/qyft/ms/app/model/bo/FinishTimeWsPushBO.java @@ -0,0 +1,27 @@ +package com.qyft.ms.app.model.bo; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +@Data +public class FinishTimeWsPushBO { + /** + * 指令id + */ + String cmdId; + /** + * 指令code + */ + String cmdCode; + + + List> finishTime; + + public FinishTimeWsPushBO(String cmdId, String cmdCode, List> finishTime) { + this.cmdId = cmdId; + this.cmdCode = cmdCode; + this.finishTime = finishTime; + } +}