From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java b/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java
index 161c734..fb553be 100644
--- a/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java
+++ b/ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java
@@ -4,8 +4,11 @@
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.inspection.domain.ArdPointCloudRoute;
+import com.ard.inspection.domain.NotCould;
import com.ard.inspection.utils.ZipFileUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import com.ard.inspection.mapper.ArdPointCloudMapper;
import com.ard.inspection.domain.ArdPointCloud;
@@ -21,6 +24,9 @@
*/
@Service
public class ArdPointCloudServiceImpl implements IArdPointCloudService {
+
+ @Value(value = "${pointCloud.folder}")
+ private String cloudFolder;
@Autowired
private ArdPointCloudMapper ardPointCloudMapper;
@@ -85,11 +91,10 @@
@Override
public int deleteArdPointCloudByIds(String[] ids) {
// 删除点云文件
- String folderPath = "/home/inspection/uploadPath/zip/";
int count = 0;
for (String id : ids) {
ArdPointCloud ardPointCloud = ardPointCloudMapper.selectArdPointCloudById(id);
- if (zipFileUtils.deleteZipFile(folderPath + ardPointCloud.getFolderName())){
+ if (zipFileUtils.deleteZipFile(cloudFolder + ardPointCloud.getFolderName())){
ardPointCloudMapper.deleteArdPointCloudById(id);
count++;
}
@@ -113,4 +118,14 @@
return ardPointCloudMapper.selectArdPointCloudByFileName(filename);
}
+ @Override
+ public List<ArdPointCloud> selectArdPointCloudNotList(NotCould notCould) {
+ return ardPointCloudMapper.selectArdPointCloudNotList(notCould.getIds(),notCould.getCloudName(),notCould.getGroupId());
+ }
+
+ @Override
+ public List<ArdPointCloudRoute> selectPointCloudRoute(String id) {
+ return ardPointCloudMapper.selectPointCloudRoute(id);
+ }
+
}
--
Gitblit v1.9.3