From 4fafee90e483bb10e092186a9b07b8cc356dbdb2 Mon Sep 17 00:00:00 2001
From: liusuyi <1951119284@qq.com>
Date: Thu, 11 Jun 2026 14:49:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://59.110.226.79:18000/r/uav/ard-uav-server into dev
---
ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
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..ee16970 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
@@ -35,8 +35,8 @@
* 新增：修改标注显示状态
*/
@Override
- public boolean updateAnnotationVisible(String id, Integer isTrue) {
- if (id == null || id.isEmpty() || isTrue == null || (isTrue != 0 && isTrue != 1)) {
+ public boolean updateAnnotationVisible(String id, Boolean isTrue) {
+ if (id == null || id.isEmpty() || isTrue == null) {
log.error("修改标注显示状态失败：参数非法，id={}, isTrue={}", id, isTrue);
return false;
}
@@ -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,11 +69,25 @@
}
@Override
- public List<AnnotationEntity> listByDirectoryId(Integer directoryId) {
+ public List<AnnotationEntity> listByDirectoryId(String directoryId) {
if (directoryId == null) {
log.error("按目录查询标记失败：目录ID为空");
return List.of();
}
return lambdaQuery().eq(AnnotationEntity::getDirectoryId, directoryId).list();
}
+
+ /**
+ * 按标注ID获取详细信息（核心实现）
+ */
+ @Override
+ public AnnotationEntity getAnnotationById(String id) {
+ // 1. 参数校验
+ if (id == null || id.isEmpty()) {
+ log.error("按ID查询标注失败：标注ID为空");
+ return null;
+ }
+ // 2. MyBatis-Plus通用查询（根据主键ID查询）
+ return getById(id);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3