From 019756ef28a43b3c65d2086438c784a5238c4e71 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 26 Nov 2025 17:13:55 +0800
Subject: [PATCH] 2025-11-26 zwy 任务进度大于等于95不返前端
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java
index a2f6126..ac55f2f 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java
@@ -5,6 +5,8 @@
import com.ard.sample.component.mqtt.service.IMessageSenderService;
import com.ard.common.core.redis.RedisConst;
import com.ard.common.core.redis.RedisOpsUtils;
+import com.ard.sample.component.websocket.enums.MessageType;
+import com.ard.sample.component.websocket.handler.DockWebSocketHandler;
import com.ard.sample.component.websocket.model.BizCodeEnum;
import com.ard.sample.component.websocket.model.CustomWebSocketMessage;
import com.ard.sample.component.websocket.service.ISendMessageService;
@@ -48,6 +50,9 @@
private ObjectMapper mapper;
@Autowired
+ private DockWebSocketHandler _dockWebSocketHandler;
+
+ @Autowired
private ISendMessageService websocketMessageService;
@Autowired
@@ -66,6 +71,11 @@
new TypeReference<EventsReceiver<WaylineTaskProgressReceiver>>(){});
eventsReceiver.setBid(receiver.getBid());
eventsReceiver.setSn(receiver.getGateway());
+ eventsReceiver.setGateway(receiver.getGateway());
+ eventsReceiver.setType(MessageType.STATUS.getType()+"-flighttask_progress");
+ eventsReceiver.setMethod(EventsMethodEnum.FLIGHT_TASK_PROGRESS.getMethod());
+
+
WaylineTaskProgressReceiver output = eventsReceiver.getOutput();
@@ -122,6 +132,18 @@
.data(RequestsReply.success())
.build());
}
+ // 进度
+ if(eventsReceiver.getOutput().getProgress().getPercent()>=95){
+ return;
+ }
+ String json="";
+ try {
+ json = mapper.writeValueAsString(eventsReceiver);
+ }
+ catch (Exception e){
+ e.printStackTrace();
+ }
+ _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(),json);
}
/**
--
Gitblit v1.9.3