From 9051d6194b11a2151bd62b9be731689524a32d5a Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 12:58:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java b/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java
index 06920f7..e3d7f5c 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java
@@ -1,18 +1,17 @@
package com.ard.web.controller.inspection;
import java.util.List;
-import javax.servlet.http.HttpServletResponse;
import com.ard.common.annotation.Log;
import com.ard.common.core.controller.BaseController;
import com.ard.common.core.domain.AjaxResult;
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
-import com.ard.common.utils.poi.ExcelUtil;
+import com.ard.inspection.domain.ArdPointCloudRoute;
+import com.ard.inspection.domain.NotCould;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -102,10 +101,22 @@
*/
@ApiOperation("查询未选择点云文件列表")
//@PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
- @GetMapping("/notList/{ids}")
- public TableDataInfo notList(@PathVariable String[] ids) {
+ @GetMapping("/notList")
+ public TableDataInfo notList(NotCould notCould) {
startPage();
- List<ArdPointCloud> list = ardPointCloudService.selectArdPointCloudNotList(ids);
+ List<ArdPointCloud> list = ardPointCloudService.selectArdPointCloudNotList(notCould);
+ return getDataTable(list);
+ }
+
+ /**
+ * 根据点云ID查询航线名称
+ */
+ @ApiOperation("根据点云ID查询航线名称")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
+ @GetMapping("/listRoute/{id}")
+ public TableDataInfo listRoute(@PathVariable("id") String id) {
+ startPage();
+ List<ArdPointCloudRoute> list = ardPointCloudService.selectPointCloudRoute(id);
return getDataTable(list);
}
--
Gitblit v1.9.3