From bd19bb31512c2ab232e801d10fab9edacedf26ea Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 13:55:56 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整： 优化is_true字段，用于标记是否在地图上可见；只要true/false
---
ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationServiceImpl.java | 4 ++--
ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationDirectoryService.java | 2 +-
ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationDirectoryEntity.java | 4 ++--
ard-sample/src/main/java/com/ard/sample/annotation/service/IAnnotationService.java | 2 +-
ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDTO.java | 2 +-
ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDirectoryDTO.java | 2 +-
ard-sample/src/main/java/com/ard/sample/annotation/service/impl/AnnotationDirectoryServiceImpl.java | 4 ++--
ard-admin/src/main/java/com/ard/web/controller/sample/AnnotationController.java | 8 ++++----
ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationEntity.java | 4 ++--
9 files changed, 16 insertions(+), 16 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 674b7bf..196d6c5 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
@@ -67,7 +67,7 @@
// 新增：修改目录显示状态
@ApiOperation("修改目录是否可见")
@PutMapping("/dirvisible/{id}/{isTrue}")
- public ResponseEntity<Map<String, Object>> updateDirectoryVisible(@PathVariable String id, @PathVariable Integer isTrue) {
+ public ResponseEntity<Map<String, Object>> updateDirectoryVisible(@PathVariable String id, @PathVariable Boolean isTrue) {
Map<String, Object> result = new HashMap<>();
try{
boolean success = directoryService.updateDirectoryVisible(id, isTrue);
@@ -138,7 +138,7 @@
// 新增：修改标注显示状态
@ApiOperation("修改标记是否可见")
@PutMapping("/annvisible/{id}/{isTrue}")
- public ResponseEntity<Map<String, Object>> updateAnnotationVisible(@PathVariable String id, @PathVariable Integer isTrue) {
+ public ResponseEntity<Map<String, Object>> updateAnnotationVisible(@PathVariable String id, @PathVariable Boolean isTrue) {
Map<String, Object> result = new HashMap<>();
try{
boolean success = annotationService.updateAnnotationVisible(id, isTrue);
@@ -172,7 +172,7 @@
@ApiOperation("批量删除标记")
@DeleteMapping("/batch")
- public ResponseEntity<Map<String, Object>> batchDeleteAnnotation(@RequestBody List<Integer> ids) {
+ public ResponseEntity<Map<String, Object>> batchDeleteAnnotation(@RequestBody List<String> ids) {
Map<String, Object> result = new HashMap<>();
try {
boolean success = annotationService.batchDeleteAnnotation(ids);
@@ -189,7 +189,7 @@
// 层级查询：目录→标记→坐标
@ApiOperation("按目标id获取所有目录及子标记信息")
@GetMapping("/directory/{directoryId}")
- public ResponseEntity<Map<String, Object>> getDirectoryWithAnnotations(@PathVariable Integer directoryId) {
+ public ResponseEntity<Map<String, Object>> getDirectoryWithAnnotations(@PathVariable String directoryId) {
Map<String, Object> result = new HashMap<>();
try {
// 1. 查询目录
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 49d818d..f341ba5 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
@@ -33,7 +33,7 @@
/**
* 是否可见：0=可见，1=不可见（默认0）
*/
- private Integer isTrue; // 显式设置默认值，避免空值
+ private Boolean isTrue; // 显式设置默认值，避免空值
private String description;
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDirectoryDTO.java b/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDirectoryDTO.java
index 3077a69..618f958 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDirectoryDTO.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/model/dto/AnnotationDirectoryDTO.java
@@ -24,7 +24,7 @@
/**
* 是否可见：0=可见，1=不可见（默认0）
*/
- private Integer isTrue;
+ private Boolean isTrue;
private List<AnnotationDTO> annotations; // 层级返回用
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationDirectoryEntity.java b/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationDirectoryEntity.java
index e094afe..1cd1e9e 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationDirectoryEntity.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationDirectoryEntity.java
@@ -28,10 +28,10 @@
private String directoryName;
/**
- * 是否可见：0=可见，1=不可见（默认0）
+ * 是否可见：true=可见，false=不可见（默认true）
*/
@TableField(value = "is_true")
- private Integer isTrue = 0; // 显式设置默认值，避免空值
+ private Boolean isTrue = true; // 显式设置默认值，避免空值
/**
* 目录备注
diff --git a/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationEntity.java b/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationEntity.java
index 36a1fe2..ff8e91d 100644
--- a/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationEntity.java
+++ b/ard-sample/src/main/java/com/ard/sample/annotation/model/entity/AnnotationEntity.java
@@ -63,10 +63,10 @@
private String drawer;
/**
- * 是否可见：0=可见，1=不可见（默认0）
+ * 是否可见：true=可见，false=不可见（默认true）
*/
@TableField(value = "is_true")
- private Integer isTrue = 0; // 显式设置默认值，避免空值
+ private Boolean isTrue = true; // 显式设置默认值，避免空值
/**
* 标注简介
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 3ebb91e..c24d695 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
@@ -13,7 +13,7 @@
boolean editDirectory(AnnotationDirectoryEntity entity);
// 修改目录可见性（0=可见，1=不可见）
- boolean updateDirectoryVisible(String id, Integer isTrue);
+ boolean updateDirectoryVisible(String id, Boolean isTrue);
// 删除目录（级联删除标记）
boolean deleteDirectory(String id);
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 670730b..7ae06da 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
@@ -10,7 +10,7 @@
// 修改标记
boolean editAnnotation(AnnotationEntity entity);
// 修改标记可见性
- boolean updateAnnotationVisible(String id, Integer isTrue);
+ boolean updateAnnotationVisible(String id, Boolean isTrue);
// 删除标记
boolean deleteAnnotation(String id);
// 批量删除标记
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 459e6c7..ada036c 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
@@ -49,8 +49,8 @@
* 新增：修改目录显示状态
*/
@Override
- public boolean updateDirectoryVisible(String id, Integer isTrue) {
- if (id == null || id.isEmpty() || isTrue == null || (isTrue != 0 && isTrue != 1)) {
+ public boolean updateDirectoryVisible(String id, Boolean isTrue) {
+ if (id == null || id.isEmpty() || isTrue == null) {
log.error("修改目录显示状态失败：参数非法，id={}, isTrue={}", id, isTrue);
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 be76dbe..acafbf7 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;
}
--
Gitblit v1.9.3