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 | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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 6b4d719..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
@@ -71,8 +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();
@@ -119,15 +122,6 @@
.bizCode(BizCodeEnum.FLIGHT_TASK_PROGRESS.getCode())
.build());
- String json="";
- try {
- json = mapper.writeValueAsString(eventsReceiver);
- }
- catch (Exception e){
- e.printStackTrace();
- }
- _dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(),json);
-
if (receiver.getNeedReply()!=null &&receiver.getNeedReply() == 1) {
messageSender.publish(receivedTopic + TopicConst._REPLY_SUF,
CommonTopicResponse.builder()
@@ -138,7 +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