From ba967da3b2d0d2f277113602e1d67ef848b7bb9a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 25 Nov 2025 14:33:52 +0800
Subject: [PATCH] 2025-11-25 zwy 增加rth_mode字段,默认为1;实体和DTO中增加@JsonInclude(JsonInclude.Include.NON_NULL)序列化时忽略所有 null 字段

---
 ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
index 0b746f5..1b88dd3 100644
--- a/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
+++ b/ard-system/src/main/java/com/ard/data/noflyzone/domain/ArdNoFlyZone.java
@@ -1,11 +1,12 @@
 package com.ard.data.noflyzone.domain;
 
-import com.ard.data.noflyzone.utils.GeoUtils;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import com.ard.common.annotation.Excel;
 import com.ard.common.core.domain.BaseEntity;
+import com.ard.data.noflyzone.utils.NoFlyZoneUtils;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 import java.util.List;
 
@@ -15,6 +16,7 @@
  * @author ard
  * @date 2025-10-14
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -41,14 +43,14 @@
     // 懒加载 / 动态计算
     public ArdNoFlyBox getArdNoFlyBox() {
         if (ardNoFlyBox == null && geojson != null) {
-            ardNoFlyBox = GeoUtils.getArdNoFlyBox(geojson);
+            ardNoFlyBox = NoFlyZoneUtils.getArdNoFlyBox(geojson);
         }
         return ardNoFlyBox;
     }
 
     public List<Vertex> getVertices() {
         if (vertices == null && geojson != null) {
-            vertices = GeoUtils.toVertexes(geojson);
+            vertices = NoFlyZoneUtils.toVertexes(geojson);
         }
         return vertices;
     }

--
Gitblit v1.9.3