From df35513a888cd03f2a3e2eacdf9f1d9dc1f0c135 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 22 Jan 2026 09:41:06 +0800
Subject: [PATCH] 1. 修改航点编号名称。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 1bc4a7a..77cff7d 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -21,8 +21,10 @@
import com.ard.route.domain.djuav.UavRouteReq;
import com.ard.route.domain.dto.ArdNoflyDto;
import com.ard.route.domain.route.ArdRouteInfo;
+import com.ard.route.domain.route.ArdRouteMission;
import com.ard.route.domain.vo.KmzResultVo;
import com.ard.route.mapper.ArdRouteInfoMapper;
+import com.ard.route.mapper.ArdRouteMissionMapper;
import com.ard.route.service.IArdRouteInfoService;
import com.ard.route.service.UavRouteService;
import com.ard.work.domain.cache.UavTelemetryDataCache;
@@ -39,6 +41,7 @@
import javax.annotation.Resource;
+import static com.ard.common.utils.SecurityUtils.getUsername;
import static com.ard.route.enums.kml.DroneEnumValueEnums.M350_RTK;
import static com.ard.route.util.InitializationUtils.divided_23;
import static com.ard.route.util.ToolUtils.*;
@@ -61,9 +64,11 @@
@Autowired
private OssServiceContext ossService;
-
@Autowired
private UavRouteService routeService;
+
+ @Autowired
+ private ArdRouteMissionMapper ardRouteMissionMapper;
@Resource
private IArdNoFlyZoneService ardNoFlyZoneService;
@@ -138,6 +143,7 @@
*/
@Override
public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo) {
+ processRouteMission(ardRouteInfo);
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
ardRouteInfo.setUpdateTime(DateUtils.getNowDate()); // 修改时间，用于排序
@@ -151,6 +157,19 @@
ardRouteInfo.setReadOnly("0");
ardRouteInfoMapper.insertArdRouteInfo(dataProcessing(ardRouteInfo));
return kmzResult.getPath();
+ }
+
+ // 航线任务数据加工校验
+ private void processRouteMission(ArdRouteInfo ardRouteInfo){
+ if ("3".equals(ardRouteInfo.getType())) {
+ ArdRouteMission ardRouteMission = ardRouteMissionMapper.selectArdRouteMissionById(ardRouteInfo.getMissionId());
+ if ("0".equals(ardRouteMission.getRouteId())) {
+ ardRouteMission.setRouteId(ardRouteInfo.getId());
+ ardRouteMissionMapper.updateArdRouteMission(ardRouteMission);
+ }else {
+ throw new RuntimeException("航线任务下已绑定航线，不可创建新航线信息！！！");
+ }
+ }
}
/**
@@ -424,12 +443,27 @@
// 判断是否循环航线
if (null != route && "0".equals(route.getIsLoop())){
deleteArdRouteInfoById(id);
+ updateMissionStatus(route);
}
WayLineBeginDTO wayLineBeginDTO = new WayLineBeginDTO(boxSn);
tyService.wayLineBegin(wayLineBeginDTO);
return true;
}
+ // 执行航线的时候修改航线任务表执行状态
+ private void updateMissionStatus(ArdRouteInfo route){
+ if ("3".equals(route.getType())) {
+ ArdRouteMission ardRouteMission = ardRouteMissionMapper.selectArdRouteMissionById(route.getMissionId());
+ if ("0".equals(ardRouteMission.getExecuteStatus())) {
+ ardRouteMission.setExecuteStatus("1");
+ ardRouteMission.setExecuteBy(getUsername());
+ ardRouteMission.setExecuteTime(DateUtils.getNowDate());
+ ardRouteMission.setUpdateTime(DateUtils.getNowDate());
+ ardRouteMissionMapper.updateArdRouteMission(ardRouteMission);
+ }
+ }
+ }
+
/**
* 暂停航线
*
--
Gitblit v1.9.3