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 | 41 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 40 insertions(+), 1 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 7a3a888..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
@@ -3,11 +3,18 @@
import java.util.List;
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;
import com.ard.inspection.service.IArdPointCloudService;
+
+import javax.annotation.Resource;
/**
* 点云文件Service业务层处理
@@ -18,8 +25,14 @@
@Service
public class ArdPointCloudServiceImpl implements IArdPointCloudService {
+ @Value(value = "${pointCloud.folder}")
+ private String cloudFolder;
+
@Autowired
private ArdPointCloudMapper ardPointCloudMapper;
+
+ @Resource
+ private ZipFileUtils zipFileUtils;
/**
* 查询点云文件
@@ -51,7 +64,9 @@
*/
@Override
public int insertArdPointCloud(ArdPointCloud ardPointCloud) {
+ ardPointCloud.setId(IdUtils.simpleUUID());
ardPointCloud.setCreateTime(DateUtils.getNowDate());
+ ardPointCloud.setAssociatedState("0");
return ardPointCloudMapper.insertArdPointCloud(ardPointCloud);
}
@@ -75,7 +90,16 @@
*/
@Override
public int deleteArdPointCloudByIds(String[] ids) {
- return ardPointCloudMapper.deleteArdPointCloudByIds(ids);
+ // 删除点云文件
+ int count = 0;
+ for (String id : ids) {
+ ArdPointCloud ardPointCloud = ardPointCloudMapper.selectArdPointCloudById(id);
+ if (zipFileUtils.deleteZipFile(cloudFolder + ardPointCloud.getFolderName())){
+ ardPointCloudMapper.deleteArdPointCloudById(id);
+ count++;
+ }
+ }
+ return count;
}
/**
@@ -89,4 +113,19 @@
return ardPointCloudMapper.deleteArdPointCloudById(id);
}
+ @Override
+ public ArdPointCloud selectArdPointCloudByFileName(String filename) {
+ 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