From 208731a6c41b644186bb68c93c19ef7026284e3b Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 12 Mar 2026 16:04:43 +0800
Subject: [PATCH] 2026-03-09 优化标注功能 增加GeoCalculator计算工具类,算出面、圆的水平面积和水平周长,线的水平距离和直线距离。在调取按标注id获取标注详细信息接口给出,不入库。

---
 ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java b/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java
index f341ba5..2a553af 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java
@@ -1,6 +1,7 @@
 package com.ard.sample.annotation.model.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -12,6 +13,7 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnnotationDTO {
 
     private String id;
@@ -31,7 +33,7 @@
     private String drawer;
 
     /**
-     * 是否可见:0=可见,1=不可见(默认0)
+     * 是否可见:true(1)=可见,false(0)=不可见(默认true)
      */
     private Boolean isTrue; // 显式设置默认值,避免空值
 
@@ -40,4 +42,16 @@
     private Long createTime;
 
     private Long updateTime;
+
+    // 线相关
+    private Double lineHorizontalDistance; // 线的水平距离(米)
+    private Double lineStraightDistance;   // 线的直线距离(米)
+
+    // 面相关
+    private Double polygonHorizontalArea;   // 面的水平面积(平方米)
+    private Double polygonHorizontalPerimeter; // 面的水平周长(米)
+
+    // 圆相关
+    private Double circleHorizontalArea;    // 圆的水平面积(平方米)
+    private Double circleHorizontalPerimeter; // 圆的水平周长(米)
 }

--
Gitblit v1.9.3