From 842c0049ea8498ea4adb3ca119157561b4d7df4f Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 08 Dec 2025 17:26:37 +0800
Subject: [PATCH] 2025-12-08 zwy 整理设备属性设置无人机不在线时返回前端错误提示代码为自定义代码，设备已离线和机场代码共用一个，无法区分机场和无人机设备。
---
ard-admin/src/main/java/com/ard/web/controller/device/ArdCameraController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 d017422..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;
@@ -24,7 +25,7 @@
/**
* 相机设备Controller
*
- * @author ruoyi
+ * @author ard
* @date 2023-01-31
*/
@Slf4j
@@ -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