diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java index d1eadc03..fed6defc 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java @@ -219,7 +219,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { List> resultList = new LinkedList<>(); String userName = JwtUtil.getUserNameByToken(request); String filePath = StringPool.SLASH + spectrumPathProperties.getUploadPath() + StringPool.SLASH +userName; - String sampleRx = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S_(FULL_|PREL_)\\d+\\.PHD"; + String sampleRx = "[a-zA-Z]{3}[0-9]{2}_[0-9]{3}-[0-9]{8}_[0-9]{4}_S.*.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); @@ -234,7 +234,7 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService { for (String matchFileName :matchFileNames) { Map map =new HashMap<>(); //判断sample文件名称是否匹配正则表达式 如果满足 则查询出对应的文件信息 - if ( regexPattern.matcher(matchFileName).find() || regexPattern1.matcher(matchFileName).find() ){ + if ( regexPattern.matcher(matchFileName).find()){ //查询sampleFile文件内容信息 获取文件内容 获取大致的gas det文件名称 Map fileData = phdFileUtil.getFileData(filePath, matchFileName); if (CollectionUtils.isEmpty(fileData)) {