From 643dcda41bdbf3a7882a34c9a486d112b2f9095f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=87=A4=E5=90=89?= Date: Thu, 17 Jul 2025 21:19:57 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8E=A8=E9=80=81=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E8=AE=A1=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?cmdid=E4=B8=8Ecmdcode?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ms/app/device/spray/SprayTaskExecutor.java | 3 ++- .../qyft/ms/app/model/bo/FinishTimeWsPushBO.java | 27 ++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/qyft/ms/app/model/bo/FinishTimeWsPushBO.java 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; + } +}