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

zhaowenyu

2026-03-09 3339af3ec5d084083d27ac03f978687ad026b0a5

 ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java

@@ -10,6 +10,7 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
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;
@@ -42,7 +43,8 @@
    /**
     * 查询点云文件列表
     */
    @PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
    @ApiOperation("查询点云文件列表")
    //@PreAuthorize("@ss.hasPermi('inspection:cloud:list')")
    @GetMapping("/list")
    public TableDataInfo list(ArdPointCloud ardPointCloud) {
        startPage();
@@ -51,21 +53,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 +65,48 @@
    /**
     * 新增点云文件
     */
    @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/{ids}")
    public TableDataInfo notList(@PathVariable String[] ids) {
        startPage();
        List<ArdPointCloud> list = ardPointCloudService.selectArdPointCloudNotList(ids);
        return getDataTable(list);
    }

}