From 4d314c8b1232773cb5c8288ea6ed6ff6fe8ee4b9 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Sat, 07 Mar 2026 10:35:25 +0800
Subject: [PATCH] 1. 增加查询未选择点云文件列表接口。
---
ard-admin/src/main/java/com/ard/web/controller/inspection/ArdPointCloudController.java | 25 ++++++++++++-------------
ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml | 5 +++++
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 8 ++++++--
3 files changed, 23 insertions(+), 15 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 9c6d2b0..06920f7 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
@@ -53,19 +53,6 @@
}
/**
- * 导出点云文件列表
- */
- @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, "点云文件数据");
- }
-
- /**
* 获取点云文件详细信息
*/
@ApiOperation("获取点云文件详细信息")
@@ -110,4 +97,16 @@
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);
+ }
+
}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 933fe99..5fd36fa 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -97,7 +97,9 @@
if (ardRouteInfo != null) {
if (ardRouteInfo.getRouteData() != null){
ardRouteInfo.setUavRouteReq((UavRouteReq) deserialize(ardRouteInfo.getRouteData()));
- ardRouteInfo.setArdPointCloudList(deserializeLs(ardRouteInfo.getCloudData()));
+ if (ardRouteInfo.getCloudData() != null){
+ ardRouteInfo.setArdPointCloudList(deserializeLs(ardRouteInfo.getCloudData()));
+ }
}
}
} catch (IOException | ClassNotFoundException e) {
@@ -455,7 +457,9 @@
ArdRouteInfo route = ardRouteInfoMapper.selectArdRouteInfoById(id);
try {
route.setUavRouteReq((UavRouteReq) deserialize(route.getRouteData()));
- route.setArdPointCloudList(deserializeLs(route.getRouteData()));
+ if (route.getCloudData() != null){
+ route.setArdPointCloudList(deserializeLs(route.getCloudData()));
+ }
} catch (IOException | ClassNotFoundException e) {
throw new RuntimeException(e);
}
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index 9fde058..cc91190 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -13,6 +13,7 @@
<result property="aircraft" column="aircraft" />
<result property="payload" column="payload" />
<result property="routeData" column="route_data" />
+ <result property="cloudData" column="cloud_data" />
<result property="readOnly" column="read_only" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
@@ -32,6 +33,7 @@
aircraft,
payload,
route_data,
+ cloud_data,
read_only,
create_by,
create_time,
@@ -79,6 +81,7 @@
<if test="aircraft != null">aircraft,</if>
<if test="payload != null">payload,</if>
<if test="routeData != null">route_data,</if>
+ <if test="cloudData != null">cloud_data,</if>
<if test="readOnly != null">read_only,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
@@ -97,6 +100,7 @@
<if test="aircraft != null">#{aircraft},</if>
<if test="payload != null">#{payload},</if>
<if test="routeData != null">#{routeData},</if>
+ <if test="cloudData != null">#{cloudData},</if>
<if test="readOnly != null">#{readOnly},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
@@ -118,6 +122,7 @@
<if test="aircraft != null">aircraft = #{aircraft},</if>
<if test="payload != null">payload = #{payload},</if>
<if test="routeData != null">route_data = #{routeData},</if>
+ <if test="cloudData != null">cloud_data = #{cloudData},</if>
<if test="readOnly != null">read_only = #{readOnly},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
--
Gitblit v1.9.3