From 5925ed6013dd33cbb610fbd90fc0194881a72a75 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 22 Jan 2026 15:30:13 +0800
Subject: [PATCH] 2026-01-22 zwy 执行任务成功后，更新由4.2执行的任务航线的计划任务的状态为1
---
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/FlightTaskServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 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 2d3e6a2..43c1c96 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,6 +1,9 @@
package com.ard.sample.wayline.service.impl;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.route.domain.route.ArdRouteInfo;
+import com.ard.route.service.IArdRouteInfoService;
+import com.ard.route.service.IArdRouteMissionService;
import com.ard.sample.common.error.CommonErrorEnum;
import com.ard.sample.common.model.ResponseResult;
import com.ard.sample.component.mqtt.model.*;
@@ -15,12 +18,15 @@
import com.ard.sample.component.websocket.service.IWebSocketManageService;
import com.ard.sample.manage.model.dto.DeviceDTO;
import com.ard.sample.manage.model.enums.UserTypeEnum;
+import com.ard.sample.manage.service.IWaylineTrajectoryService;
import com.ard.sample.media.model.MediaFileCountDTO;
import com.ard.sample.wayline.model.dto.WaylineJobDTO;
import com.ard.sample.wayline.model.dto.WaylineTaskProgressExt;
import com.ard.sample.wayline.model.dto.WaylineTaskProgressReceiver;
+import com.ard.sample.wayline.model.entity.WaylineJobHistoryEntity;
import com.ard.sample.wayline.model.enums.WaylineJobStatusEnum;
import com.ard.sample.wayline.service.IFlightTaskService;
+import com.ard.sample.wayline.service.IWaylineJobHistoryService;
import com.ard.sample.wayline.service.IWaylineJobService;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -66,6 +72,18 @@
@Autowired
private IWaylineJobService waylineJobService;
+
+ @Autowired
+ private IWaylineTrajectoryService _waylineTrajectoryService;
+
+ @Autowired
+ private IWaylineJobHistoryService _waylineJobHistoryService;
+
+ @Autowired
+ private IArdRouteMissionService _ardRouteMissionService;
+
+ @Autowired
+ private IArdRouteInfoService _ardRouteInfoService;
@Override
@ServiceActivator(inputChannel = ChannelName.INBOUND_EVENTS_FLIGHT_TASK_PROGRESS, outputChannel = ChannelName.OUTBOUND)
@@ -143,6 +161,9 @@
// if (eventsReceiver.getOutput().getProgress().getPercent() >= 95) {
// return;
// }
+
+
+
String json = "";
try {
json = mapper.writeValueAsString(eventsReceiver);
@@ -150,6 +171,32 @@
e.printStackTrace();
}
_dockWebSocketHandler.sendMessageToSubscribers(dockSn, MessageType.STATUS.getType(), json, "");
+
+ _waylineTrajectoryService.setList(dockSn,"1",json);
+
+ // 计划任务成功后，保存计划任务到历史记录
+ String status = eventsReceiver.getOutput().getStatus();
+ String jobId = eventsReceiver.getOutput().getExt().getFlightId();
+ if(status.equals("ok") && jobId != null) {
+ Optional<WaylineJobDTO> job = waylineJobService.getJobByJobId(jobId);
+ if(job.isPresent()) {
+ if (_waylineJobHistoryService.getJobByJobId(jobId).isPresent()) {
+ return;
+ }
+ WaylineJobHistoryEntity waylineJobHistoryEntity = _waylineJobHistoryService.dto2Entity(job.get());
+ Optional<WaylineJobDTO> jobHistory = _waylineJobHistoryService.createWaylineJob(waylineJobHistoryEntity);
+ if(jobHistory.isPresent()) {
+ log.info("任务执行成功，保存到历史记录。 {}", jobHistory);
+ }
+ // 同步更新4.2的计划任务的状态；等待夏吉建的接口。1:已执行 0:未执行
+ // 在任务中查找航线文件id，取航线文件信息中的状态，是3的修改状态
+ ArdRouteInfo ardRouteInfo = _ardRouteInfoService.selectArdRouteInfoById(job.get().getFileId());
+ if(ardRouteInfo != null && ardRouteInfo.getType().equals("3")) {
+ _ardRouteMissionService.updateArdRouteMissionStatus(jobId, "1");
+ }
+ }
+
+ }
}
/**
--
Gitblit v1.9.3