From 97aed6e19bac0fefaaf0270ba94492228ebf0bb1 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 03 Dec 2025 18:43:59 +0800
Subject: [PATCH] 2025-12-03 zwy 删除任务失败时返回错误码，不返回异常。
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 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 9927dfc..7633d17 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
@@ -1,5 +1,6 @@
package com.ard.sample.wayline.service.impl;
+import com.ard.sample.common.error.CommonErrorEnum;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.*;
import com.ard.sample.component.mqtt.service.IMessageSenderService;
@@ -71,15 +72,19 @@
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();
log.info("Task progress: {}", output.getProgress().toString());
if (eventsReceiver.getResult() != ResponseResult.CODE_SUCCESS) {
- log.error("Task progress ===> Error code: " + eventsReceiver.getResult());
+ String errorMsg = CommonErrorEnum.getMsgByCode(eventsReceiver.getResult());
+ log.error("Task progress ===> Error code: {},Error Msg: {}", eventsReceiver.getResult(),errorMsg);
}
EventsResultStatusEnum statusEnum = EventsResultStatusEnum.find(output.getStatus());
@@ -119,15 +124,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() + "-flighttask_progress",json);
-
if (receiver.getNeedReply()!=null &&receiver.getNeedReply() == 1) {
messageSender.publish(receivedTopic + TopicConst._REPLY_SUF,
CommonTopicResponse.builder()
@@ -138,7 +134,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