From bcd0a5be94d339d937413e5f829823b22715aa0d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Tue, 10 Mar 2026 09:27:21 +0800
Subject: [PATCH] 2026-03-09 优化 查询全部目录（含下属标注数据） 1. 默认文件夹固定置顶，其余目录按createTime降序排序 2. 目录下的标注按createTime降序排序
---
ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java
index d9e6612..3db3520 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/data/ArdModelController.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ard.common.constant.DeviceConstants;
import com.ard.data.model.domain.ArdModel;
import com.ard.data.model.service.IArdModelService;
import io.swagger.annotations.Api;
@@ -81,6 +82,9 @@
@Log(title = "模型管理", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdModel ardModel) {
+ if (DeviceConstants.NOT_UNIQUE.equals(ardModelService.checkArdModelNameUnique(ardModel))) {
+ return error("新增模型'" + ardModel.getModelName() + "'失败，已存在");
+ }
return toAjax(ardModelService.insertArdModel(ardModel));
}
@@ -92,6 +96,9 @@
@Log(title = "模型管理", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdModel ardModel) {
+ if (DeviceConstants.NOT_UNIQUE.equals(ardModelService.checkArdModelNameUnique(ardModel))) {
+ return error("修改模型'" + ardModel.getModelName() + "'失败，已存在");
+ }
return toAjax(ardModelService.updateArdModel(ardModel));
}
--
Gitblit v1.9.3