From fc7ee73b5f804116ada59048fdf6fb9265856a3f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 04 Feb 2026 09:45:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java
index ea5facc..f3e54d2 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteMissionServiceImpl.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.ard.common.utils.DateUtils;
+import com.ard.common.utils.SecurityUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.route.ArdRouteMission;
import com.ard.route.domain.route.ArdRoutePoint;
@@ -109,6 +110,8 @@
*/
@Override
public int deleteArdRouteMissionByIds(String[] ids) {
+ // 删除航线任务航点
+ ardRoutePointMapper.deleteArdRoutePointByMissionId(ids[0]);
return ardRouteMissionMapper.deleteArdRouteMissionByIds(ids);
}
@@ -120,6 +123,7 @@
*/
@Override
public int deleteArdRouteMissionById(String id) {
+ ardRoutePointMapper.deleteArdRoutePointByMissionId(id);
return ardRouteMissionMapper.deleteArdRouteMissionById(id);
}
@@ -135,7 +139,7 @@
ArdRouteMission ardRouteMission = new ArdRouteMission();
ardRouteMission.setId(id);
ardRouteMission.setExecuteStatus(status);
- ardRouteMission.setExecuteBy(getUsername());
+ ardRouteMission.setExecuteBy(SecurityUtils.getUsername());
ardRouteMission.setExecuteTime(DateUtils.getNowDate());
ardRouteMission.setUpdateTime(DateUtils.getNowDate());
return ardRouteMissionMapper.updateArdRouteMission(ardRouteMission);
--
Gitblit v1.9.3