From 578d3bb0659811d39c1a989260062114fb110e1e Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 01 Apr 2026 13:11:09 +0800
Subject: [PATCH] 1. 统一修改配置文件。
---
ard-inspection/src/main/java/com/ard/inspection/service/impl/BigFileUploadServiceImpl.java | 4 +---
ard-admin/src/main/resources/application-daqing.yml | 10 +++++++---
ard-admin/src/main/resources/application-dev.yml | 21 ++++++++++-----------
ard-admin/src/main/resources/application.yml | 4 ++--
ard-admin/src/main/resources/application-prod.yml | 12 ++++++------
ard-inspection/src/main/java/com/ard/inspection/service/impl/ArdPointCloudServiceImpl.java | 4 +---
6 files changed, 27 insertions(+), 28 deletions(-)
diff --git a/ard-admin/src/main/resources/application-daqing.yml b/ard-admin/src/main/resources/application-daqing.yml
index 503f160..7343c42 100644
--- a/ard-admin/src/main/resources/application-daqing.yml
+++ b/ard-admin/src/main/resources/application-daqing.yml
@@ -62,6 +62,11 @@
rtspPort: 8554
webrtcPort: 28889
+#六合流媒体外网映射
+mediamtx-sixhe:
+ enable: true
+ playHost: 112.98.104.134 # 大庆外网地址
+ webrtcPort: 38889
# mqtt配置
mqtt:
@@ -90,7 +95,6 @@
endpoint: http://192.168.10.103:9011
bucket: dockfile
+# 点云文件夹路径配置
pointCloud:
- url : https://192.168.10.103:3001/tileset/
- type : /tileset.json
- folder : /home/inspection/uploadPath/zip/
\ No newline at end of file
+ url : https://192.168.10.103:3001/tileset/
\ No newline at end of file
diff --git a/ard-admin/src/main/resources/application-dev.yml b/ard-admin/src/main/resources/application-dev.yml
index 3548002..5754283 100644
--- a/ard-admin/src/main/resources/application-dev.yml
+++ b/ard-admin/src/main/resources/application-dev.yml
@@ -73,6 +73,12 @@
rtspPort: 8554
webrtcPort: 8889
+#六合流媒体外网映射
+mediamtx-sixhe:
+ enable: false
+ playHost: 112.98.104.134 # 大庆外网地址
+ webrtcPort: 38889
+
# mqtt配置
mqtt:
protocol: tcp
@@ -95,18 +101,11 @@
region: us-east-1
object-dir-prefix: wayline
+# 机场单独用的oss配置，要http地址
dock:
- enable: true
- provider: minio
- endpoint: http://127.0.0.1:9011
- access-key: admin
- secret-key: ard12345
+ endpoint: http://192.168.10.103:9011
bucket: dockfile
- expire: 3600
- region: us-east-1
- object-dir-prefix: wayline
+# 点云文件夹路径配置
pointCloud:
- url : https://127.0.10.1:3001/tileset/
- type : /tileset.json
- folder : /home/inspection/uploadPath/zip/
\ No newline at end of file
+ url : https://127.0.10.1:3001/tileset/
\ No newline at end of file
diff --git a/ard-admin/src/main/resources/application-prod.yml b/ard-admin/src/main/resources/application-prod.yml
index ce8aa27..ee04d6c 100644
--- a/ard-admin/src/main/resources/application-prod.yml
+++ b/ard-admin/src/main/resources/application-prod.yml
@@ -62,10 +62,10 @@
rtspPort: 8554
webrtcPort: 8889
-#六合流媒体映射
+#六合流媒体外网映射
mediamtx-sixhe:
enable: true
- playHost: 112.98.104.134
+ playHost: 112.98.104.134 # 大庆外网地址
webrtcPort: 38889
# mqtt配置
@@ -78,7 +78,7 @@
client-id: ard-uav
inbound-topic: sys/product/+/status,thing/product/+/requests
-# oss配置 https://192.168.1.3:9001
+# oss配置
oss:
enable: true
provider: minio
@@ -90,11 +90,11 @@
region: us-east-1
object-dir-prefix: wayline
+# 机场单独用的oss配置，要http地址
dock:
endpoint: http://111.40.46.199:9011
bucket: dockfile
+# 点云文件夹路径配置
pointCloud:
- url : https://192.168.1.3:3001/tileset/
- type : /tileset.json
- folder : /home/inspection/uploadPath/zip/
\ No newline at end of file
+ url : https://192.168.1.3:3001/tileset/
\ No newline at end of file
diff --git a/ard-admin/src/main/resources/application.yml b/ard-admin/src/main/resources/application.yml
index e7dcb72..c895aff 100644
--- a/ard-admin/src/main/resources/application.yml
+++ b/ard-admin/src/main/resources/application.yml
@@ -134,8 +134,8 @@
port: 6379
# 数据库索引
database: 0
- # 密码
- password:
+ # 发版密码
+ password: Ardkj.2025
# 连接超时时间
timeout: 10s
lettuce:
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 fb553be..6b9cd48 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
@@ -25,9 +25,6 @@
@Service
public class ArdPointCloudServiceImpl implements IArdPointCloudService {
- @Value(value = "${pointCloud.folder}")
- private String cloudFolder;
-
@Autowired
private ArdPointCloudMapper ardPointCloudMapper;
@@ -94,6 +91,7 @@
int count = 0;
for (String id : ids) {
ArdPointCloud ardPointCloud = ardPointCloudMapper.selectArdPointCloudById(id);
+ String cloudFolder = "/home/inspection/uploadPath/zip/";
if (zipFileUtils.deleteZipFile(cloudFolder + ardPointCloud.getFolderName())){
ardPointCloudMapper.deleteArdPointCloudById(id);
count++;
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 17ebfc4..c9187aa 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
@@ -31,9 +31,6 @@
@Value(value = "${pointCloud.url}")
private String cloudUrl;
- @Value(value = "${pointCloud.type}")
- private String cloudType;
-
@Autowired
private IArdPointCloudService ardPointCloudService;
@@ -260,6 +257,7 @@
ardPointCloud.setFileSize(formatFileSize(file.getSize()));
int dotIndex = originalFilename.lastIndexOf('.');
String folderName = (dotIndex > 0) ? originalFilename.substring(0, dotIndex) : originalFilename;
+ String cloudType = "/tileset.json";
String zipP = cloudUrl + folderName + cloudType;
ardPointCloud.setFilePath(zipP);
ardPointCloud.setFolderName(folderName);
--
Gitblit v1.9.3