Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

波形文件调整

Browse Source
This commit is contained in:
hongawen
2023-09-12 11:26:12 +08:00
parent fb6a469e68
commit 453fff16c1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-common/common-core/src/main/java/com/njcn/common/config/GeneralInfo.java
View File

@@ -45,4 +45,14 @@ public class GeneralInfo {
@Value("${business.file.storage}") @Value("${business.file.storage}")
private int businessFileStorage; private int businessFileStorage;
/***
* 波形文件存储方式
* 考虑到大部分文件都是采用文件服务器，波形文件需要前置组配合，如果没有上传，还是需要指定本地磁盘获取的方式来读取波形文件
* 1：本地磁盘
* 2：华为obs 目前就河北使用了华为obs上传文件的模式
* 3: minioss
*/
@Value("${business.wavefile.storage:2}")
private int businessWaveFileStorage;
} }

4
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java
View File

@@ -205,7 +205,7 @@ public class TransientServiceImpl implements TransientService {
System.out.println(eventDetail.getEventId()); System.out.println(eventDetail.getEventId());
String waveName = eventDetail.getWavePath(); String waveName = eventDetail.getWavePath();
String cfgPath, datPath; String cfgPath, datPath;
if (generalInfo.getBusinessFileStorage() == GeneralConstant.LOCAL_DISK) { if (generalInfo.getBusinessWaveFileStorage() == GeneralConstant.LOCAL_DISK) {
cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG; cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG;
datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT; datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT;
InputStream cfgStream = waveUtil.getFileInputStreamByFilePath(cfgPath); InputStream cfgStream = waveUtil.getFileInputStreamByFilePath(cfgPath);
@@ -432,7 +432,7 @@ public class TransientServiceImpl implements TransientService {
InputStream cfgStream = null; InputStream cfgStream = null;
InputStream datStream = null; InputStream datStream = null;
try { try {
if (generalInfo.getBusinessFileStorage() == GeneralConstant.LOCAL_DISK) { if (generalInfo.getBusinessWaveFileStorage() == GeneralConstant.LOCAL_DISK) {
cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG; cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG;
datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT; datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT;
cfgStream = waveUtil.getFileInputStreamByFilePath(cfgPath); cfgStream = waveUtil.getFileInputStreamByFilePath(cfgPath);