From 0ab71d4f9154dc2a0306ea57ec08659f4e28e449 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Mon, 16 Mar 2026 16:04:06 +0800
Subject: [PATCH] 1. 智云3.0业务优化,优化类型获取。

---
 ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java |   26 ++++++++++++++++++++++++--
 1 files changed, 24 insertions(+), 2 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 66ea70c..79365c6 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,5 +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;
@@ -11,11 +13,12 @@
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AnnotationDTO {
 
-    private Integer id;
+    private String id;
 
-    private Integer directoryId;
+    private String directoryId;
 
     private String name;
 
@@ -29,9 +32,28 @@
 
     private String drawer;
 
+    /**
+     * 是否可见:true(1)=可见,false(0)=不可见(默认true)
+     */
+    private Boolean isTrue; // 显式设置默认值,避免空值
+
+    private Boolean isTransparent;
+
     private String description;
 
     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