From f7fea3eb2a6fe2b91d83ecee30304d6d0f6b9877 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:03 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整： 1、ID改为UUID； 2、点、线、面、圆数据增加索引字段sort，以标注各点的顺序； 3、增加is_true字段，用于标记是否在地图上可见；
---
ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java | 6 +++---
ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationDirectoryService.java | 2 +-
ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationService.java | 6 +++---
ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationDirectoryServiceImpl.java | 2 +-
ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java b/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java
index c80bf7a..674b7bf 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java
@@ -84,7 +84,7 @@
@ApiOperation("删除目录及子项")
@DeleteMapping("/directory/{id}")
- public ResponseEntity<Map<String, Object>> deleteDirectory(@PathVariable Integer id) {
+ public ResponseEntity<Map<String, Object>> deleteDirectory(@PathVariable String id) {
Map<String, Object> result = new HashMap<>();
try {
boolean success = directoryService.deleteDirectory(id);
@@ -156,7 +156,7 @@
@ApiOperation("删除标记")
@DeleteMapping("/{id}")
- public ResponseEntity<Map<String, Object>> deleteAnnotation(@PathVariable Integer id) {
+ public ResponseEntity<Map<String, Object>> deleteAnnotation(@PathVariable String id) {
Map<String, Object> result = new HashMap<>();
try {
boolean success = annotationService.deleteAnnotation(id);
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationDirectoryService.java b/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationDirectoryService.java
index abd1529..3ebb91e 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationDirectoryService.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationDirectoryService.java
@@ -16,7 +16,7 @@
boolean updateDirectoryVisible(String id, Integer isTrue);
// 删除目录（级联删除标记）
- boolean deleteDirectory(Integer id);
+ boolean deleteDirectory(String id);
// 新增：查询全部目录（含下属标注数据）
List<AnnotationDirectoryDTO> listAllDirectoryWithAnnotations();
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationService.java b/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationService.java
index f04e2df..670730b 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationService.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationService.java
@@ -12,9 +12,9 @@
// 修改标记可见性
boolean updateAnnotationVisible(String id, Integer isTrue);
// 删除标记
- boolean deleteAnnotation(Integer id);
+ boolean deleteAnnotation(String id);
// 批量删除标记
- boolean batchDeleteAnnotation(List<Integer> ids);
+ boolean batchDeleteAnnotation(List<String> ids);
// 按目录ID查询标记
- List<AnnotationEntity> listByDirectoryId(Integer directoryId);
+ List<AnnotationEntity> listByDirectoryId(String directoryId);
}
\ No newline at end of file
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationDirectoryServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationDirectoryServiceImpl.java
index 68a30f6..459e6c7 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationDirectoryServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationDirectoryServiceImpl.java
@@ -62,7 +62,7 @@
@Override
@Transactional(rollbackFor = Exception.class) // 事务保证级联删除
- public boolean deleteDirectory(Integer id) {
+ public boolean deleteDirectory(String id) {
if (id == null) {
log.error("删除目录失败：ID为空");
return false;
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java
index 5c1151f..be76dbe 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java
@@ -47,7 +47,7 @@
}
@Override
- public boolean deleteAnnotation(Integer id) {
+ public boolean deleteAnnotation(String id) {
if (id == null) {
log.error("删除标记失败：ID为空");
return false;
@@ -58,7 +58,7 @@
}
@Override
- public boolean batchDeleteAnnotation(List<Integer> ids) {
+ public boolean batchDeleteAnnotation(List<String> ids) {
if (CollectionUtils.isEmpty(ids)) {
log.error("批量删除标记失败：ID列表为空");
return false;
@@ -69,7 +69,7 @@
}
@Override
- public List<AnnotationEntity> listByDirectoryId(Integer directoryId) {
+ public List<AnnotationEntity> listByDirectoryId(String directoryId) {
if (directoryId == null) {
log.error("按目录查询标记失败：目录ID为空");
return List.of();
--
Gitblit v1.9.3