From 4e8a1c02b45f72f6377603778e8c8746ed82f374 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 06 Jan 2026 10:04:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
index b1aa9a4..8e8b4ae 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdNoFlyZoneController.java
@@ -1,6 +1,7 @@
 package com.ard.web.controller.data;
 
 import com.alibaba.fastjson2.JSON;
+import com.ard.common.constant.DeviceConstants;
 import com.ard.common.utils.uuid.IdUtils;
 import com.ard.data.noflyzone.domain.FeatureCollection;
 import io.swagger.annotations.Api;
@@ -82,6 +83,9 @@
     @PostMapping
     public AjaxResult add(@RequestBody ArdNoFlyZone ardNoFlyZone)
     {
+        if (DeviceConstants.NOT_UNIQUE.equals(ardNoFlyZoneService.checkArdNoFlyZoneNameUnique(ardNoFlyZone))) {
+            return error("新增禁飞区'" + ardNoFlyZone.getName() + "'失败,已存在");
+        }
         return toAjax(ardNoFlyZoneService.insertArdNoFlyZone(ardNoFlyZone));
     }
 
@@ -94,6 +98,9 @@
     @PutMapping
     public AjaxResult edit(@RequestBody ArdNoFlyZone ardNoFlyZone)
     {
+        if (DeviceConstants.NOT_UNIQUE.equals(ardNoFlyZoneService.checkArdNoFlyZoneNameUnique(ardNoFlyZone))) {
+            return error("修改禁飞区'" + ardNoFlyZone.getName() + "'失败,已存在");
+        }
         return toAjax(ardNoFlyZoneService.updateArdNoFlyZone(ardNoFlyZone));
     }
 

--
Gitblit v1.9.3