xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

上传文件格式化文件名称代码修改增加正则表达式判断

Browse Source
This commit is contained in:
qiaoqinzheng 2023-10-19 18:55:26 +08:00
parent 06c2302a56
commit e2ac538042
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumFileServiceImpl.java
View File

@ -34,6 +34,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream; import java.util.zip.ZipInputStream;
@ -65,6 +66,10 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
String tempFilePath = System.getProperty("java.io.tmpdir") + username + slash; String tempFilePath = System.getProperty("java.io.tmpdir") + username + slash;
List<String> fileNames = new ArrayList<>(); List<String> fileNames = new ArrayList<>();
List<File> fileList = new ArrayList<>(); List<File> fileList = new ArrayList<>();
String sampleRx = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S_(FULL_|PREL_)\\d+\\.PHD";
Pattern regexPattern = Pattern.compile(sampleRx);
String sampleRx1 = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S_(FULL_|PREL_)\\d+\\.\\d+\\.PHD";
Pattern regexPattern1 = Pattern.compile(sampleRx1);
try{ try{
File tempDir = new File(tempFilePath); File tempDir = new File(tempFilePath);
if (!tempDir.exists()) tempDir.mkdir(); if (!tempDir.exists()) tempDir.mkdir();
@ -92,9 +97,12 @@ public class SpectrumFileServiceImpl implements ISpectrumFileService {
if (!created) return Result.error(Prompt.DIR_CREATE_FAIL + filePath); if (!created) return Result.error(Prompt.DIR_CREATE_FAIL + filePath);
// 上传所有文件 // 上传所有文件
for (File oneFile : fileList) { for (File oneFile : fileList) {
EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(oneFile); String fileName = oneFile.getName();
String suffix = nameStandUtil.GetSuffix(struct.data_type, struct.spectrum_quantity, String.valueOf(struct.acquisition_live_time)); if (!regexPattern.matcher(fileName).find() && !regexPattern1.matcher(fileName).find()) {
String fileName = oneFile.getName().substring(0, 23)+suffix; EnergySpectrumStruct struct = phdFileUtil.analyzeFileSourceData(oneFile);
String suffix = nameStandUtil.GetSuffix(struct.data_type, struct.spectrum_quantity, String.valueOf(struct.acquisition_live_time));
fileName = oneFile.getName().substring(0, 23)+suffix;
}
String fullFilePath = filePath + slash + fileName; String fullFilePath = filePath + slash + fileName;
FileInputStream local = new FileInputStream(oneFile); FileInputStream local = new FileInputStream(oneFile);
ftpClient.storeFile(fullFilePath, local); ftpClient.storeFile(fullFilePath, local);