From a807f410c37eb2a50d015ad8771021a29abf8c20 Mon Sep 17 00:00:00 2001
From: xiaoguangbin <xiaoguangbin>
Date: Thu, 12 Oct 2023 14:24:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E8=83=BD?=
 =?UTF-8?q?=E8=B0=B1=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89full=E6=88=96=E8=80=85repl=E7=9A=84=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=20=E4=B8=8D=E8=83=BD=E6=AD=A3=E7=A1=AE=E8=AF=86?=
 =?UTF-8?q?=E5=88=AB=E8=83=BD=E8=B0=B1=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/service/impl/SpectrumAnalysisServiceImpl.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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<Map<String, Object>> 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<String, Object> map =new HashMap<>();
                 //判断sample文件名称是否匹配正则表达式  如果满足 则查询出对应的文件信息
-                if ( regexPattern.matcher(matchFileName).find() || regexPattern1.matcher(matchFileName).find() ){
+                if ( regexPattern.matcher(matchFileName).find()){
                     //查询sampleFile文件内容信息 获取文件内容 获取大致的gas det文件名称
                     Map<String, String> fileData = phdFileUtil.getFileData(filePath, matchFileName);
                     if (CollectionUtils.isEmpty(fileData)) {