From 1837824a37c1a9e6c77280862abed282e7ca61b9 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 24 Dec 2025 13:51:09 +0800
Subject: [PATCH] 1. 开始航线增肌航线id用于判断是否是单次执行航线业务。 2. 增加判断无人机,禁飞区逻辑。

---
 ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java b/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java
index 573305c..7a49d70 100644
--- a/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java
+++ b/ard-work/src/main/java/com/ard/work/component/forest/MyAddressSource.java
@@ -1,23 +1,33 @@
 package com.ard.work.component.forest;
 
 import com.ard.work.domain.entity.ArdServerInfo;
-import com.ard.work.service.IArdServerService;
+import com.ard.work.service.IArdServerInfoService;
 import com.dtflys.forest.callback.AddressSource;
 import com.dtflys.forest.http.ForestAddress;
 import com.dtflys.forest.http.ForestRequest;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 
+@Slf4j
 @Component
 public class MyAddressSource implements AddressSource {
 
     @Resource
-    private IArdServerService ardServerService;
+    private IArdServerInfoService ardServerService;
     @Override
     public ForestAddress getAddress(ForestRequest request) {
         String serverKey = request.varAsString("serverId");
-        ArdServerInfo serverInfo = ardServerService.selectArdServerManagementById(serverKey);
+        if(serverKey == null){
+            log.warn("请求属性serverId为空");
+            return null;
+        }
+        ArdServerInfo serverInfo = ardServerService.selectArdServerInfoById(serverKey);
+        if(serverInfo == null){
+            log.warn("边缘服务器不存在");
+            return null;
+        }
         // 返回 Forest 地址对象
         return new ForestAddress(serverInfo.getHost(), serverInfo.getHttpPort());
     }

--
Gitblit v1.9.3