Browse Source

fix:推送的预计完成时间增加cmdid与cmdcode

master
白凤吉 2 weeks ago
parent
commit
643dcda41b
  1. 3
      src/main/java/com/qyft/ms/app/device/spray/SprayTaskExecutor.java
  2. 27
      src/main/java/com/qyft/ms/app/model/bo/FinishTimeWsPushBO.java

3
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, "喷涂任务开始执行")); webSocketService.pushCMDResponseMsg(FrontResponseGenerator.generateJson(sprayTask.getCmdId(), sprayTask.getCmdCode(), CommandStatus.START, "喷涂任务开始执行"));
//计算剩余时间 //计算剩余时间
List<Map<String, Object>> finishTimeMap = estimateCompletionTimePerSlide(); List<Map<String, Object>> 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); sprayTask.setFinishTimeMap(finishTimeMap);
List<SprayTaskParams> sprayTaskParams = sprayTask.getSprayTaskParams(); List<SprayTaskParams> sprayTaskParams = sprayTask.getSprayTaskParams();
for (SprayTaskParams sprayTaskParam : sprayTaskParams) {//循环玻片 for (SprayTaskParams sprayTaskParam : sprayTaskParams) {//循环玻片

27
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<Map<String, Object>> finishTime;
public FinishTimeWsPushBO(String cmdId, String cmdCode, List<Map<String, Object>> finishTime) {
this.cmdId = cmdId;
this.cmdCode = cmdCode;
this.finishTime = finishTime;
}
}
Loading…
Cancel
Save