Merge remote-tracking branch 'origin/dev' into dev

zhaowenyu

2026-03-09 9051d6194b11a2151bd62b9be731689524a32d5a

 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;
@@ -50,19 +49,6 @@
        startPage();
        List<ArdPointCloud> list = ardPointCloudService.selectArdPointCloudList(ardPointCloud);
        return getDataTable(list);
    }

    /**
     * 导出点云文件列表
     */
    @ApiOperation("导出点云文件列表")
    //@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, "点云文件数据");
    }

    /**
@@ -110,4 +96,28 @@
        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);
    }

}