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/BigFileUploadServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java b/ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java
index 225b013..17ebfc4 100644
--- a/ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java
+++ b/ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java
@@ -1,7 +1,6 @@
package com.ard.inspection.service.impl;
import com.ard.common.core.domain.AjaxResult;
-import com.ard.common.utils.uuid.IdUtils;
import com.ard.inspection.domain.ArdPointCloud;
import com.ard.inspection.domain.UploadFileEntity;
import com.ard.inspection.service.IArdPointCloudService;
@@ -9,6 +8,7 @@
import com.ard.inspection.utils.ZipFileUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@@ -28,7 +28,11 @@
@Slf4j
public class BigFileUploadServiceImpl implements IBigFileUploadService {
- public static final String CLOUD_FILE_PATH = "https://192.168.1.3:3001/tileset/";
+ @Value(value = "${pointCloud.url}")
+ private String cloudUrl;
+
+ @Value(value = "${pointCloud.type}")
+ private String cloudType;
@Autowired
private IArdPointCloudService ardPointCloudService;
@@ -256,7 +260,7 @@
ardPointCloud.setFileSize(formatFileSize(file.getSize()));
int dotIndex = originalFilename.lastIndexOf('.');
String folderName = (dotIndex > 0) ? originalFilename.substring(0, dotIndex) : originalFilename;
- String zipP = CLOUD_FILE_PATH + folderName + "/tileset.json";
+ String zipP = cloudUrl + folderName + cloudType;
ardPointCloud.setFilePath(zipP);
ardPointCloud.setFolderName(folderName);
return AjaxResult.success("文件上传并解压成功", ardPointCloud);
--
Gitblit v1.9.3