From 3cd13607fe569164f6ab5284558ab8e258852940 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:38:19 +0800
Subject: [PATCH] 2025-11-15 zwy 航线任务模块更改； 1、航线文件从夏吉建航线表中取； 2、修改增加循环任务功能； 3、增加字段及字段注释，对应JSON字段； 4、航线任务列表，增加筛选功能；根据不同条件查询结果。
---
ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java b/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
index c24b65e..cbbfddf 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java
@@ -14,6 +14,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.jdbc.Null;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -83,6 +84,10 @@
if (DeviceConstants.NOT_UNIQUE.equals(ardCameraService.checkCameraIpAndPortUnique(camera))) {
return error("新增相机'" + camera.getIp() + ":" + camera.getPort() + "'失败，相机已存在");
}
+ ArdCamera existingCamera = ardCameraService.checkAirportHasCamera(camera);
+ if (existingCamera != null) {
+ return error("该机场已被相机【" + existingCamera.getName() + "】(" + existingCamera.getIp() + ") 关联");
+ }
return success(ardCameraService.insertArdCamera(camera));
}
@@ -97,6 +102,10 @@
if (DeviceConstants.NOT_UNIQUE.equals(ardCameraService.checkCameraIpAndPortUnique(camera))) {
return error("修改相机'" + camera.getIp() + ":" + camera.getPort() + "'失败，相机已存在");
}
+ ArdCamera existingCamera = ardCameraService.checkAirportHasCamera(camera);
+ if (existingCamera != null) {
+ return error("该机场已被相机【" + existingCamera.getName() + "】(" + existingCamera.getIp() + ") 关联");
+ }
return success(ardCameraService.updateArdCamera(camera));
}
--
Gitblit v1.9.3