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 | 59 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 39 insertions(+), 20 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 4250fb1..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,17 +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;
@@ -42,7 +42,8 @@
/**
* 查询点云文件列表
*/
- @PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
+ @ApiOperation("查询点云文件列表")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
@GetMapping("/list")
public TableDataInfo list(ArdPointCloud ardPointCloud) {
startPage();
@@ -51,21 +52,10 @@
}
/**
- * 导出点云文件列表
- */
- @PreAuthorize("@ss.hasPermi('inspection:cloud:export')")
- @Log(title = "点云文件", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, ArdPointCloud ardPointCloud) {
- List<ArdPointCloud> list = ardPointCloudService.selectArdPointCloudList(ardPointCloud);
- ExcelUtil<ArdPointCloud> util = new ExcelUtil<ArdPointCloud>(ArdPointCloud.class);
- util.exportExcel(response, list, "点云文件数据");
- }
-
- /**
* 获取点云文件详细信息
*/
- @PreAuthorize("@ss.hasPermi('inspection:cloud:query')")
+ @ApiOperation("获取点云文件详细信息")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
return success(ardPointCloudService.selectArdPointCloudById(id));
@@ -74,31 +64,60 @@
/**
* 新增点云文件
*/
- @PreAuthorize("@ss.hasPermi('inspection:cloud:add')")
+ @ApiOperation("新增点云文件")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:add')")
@Log(title = "点云文件", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdPointCloud ardPointCloud) {
+ ardPointCloud.setCreateBy(getUsername());
return toAjax(ardPointCloudService.insertArdPointCloud(ardPointCloud));
}
/**
* 修改点云文件
*/
- @PreAuthorize("@ss.hasPermi('inspection:cloud:edit')")
+ @ApiOperation("修改点云文件")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:edit')")
@Log(title = "点云文件", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdPointCloud ardPointCloud) {
+ ardPointCloud.setUpdateBy(getUsername());
return toAjax(ardPointCloudService.updateArdPointCloud(ardPointCloud));
}
/**
* 删除点云文件
*/
- @PreAuthorize("@ss.hasPermi('inspection:cloud:remove')")
+ @ApiOperation("删除点云文件")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:remove')")
@Log(title = "点云文件", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
return toAjax(ardPointCloudService.deleteArdPointCloudByIds(ids));
}
+ /**
+ * 查询未选择点云文件列表
+ */
+ @ApiOperation("查询未选择点云文件列表")
+ //@PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
+ @GetMapping("/notList")
+ public TableDataInfo notList(NotCould notCould) {
+ startPage();
+ 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