From 96c164cedea1617500f3889976bd99d9fbbf426f Mon Sep 17 00:00:00 2001
From: panbaolin <123456>
Date: Mon, 16 Oct 2023 16:49:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:1.=E4=BF=AE=E6=94=B9filesource=E3=80=81unde?=
 =?UTF-8?q?l=E7=9B=AE=E5=BD=95=E6=89=A7=E8=A1=8C=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6Sample=E5=BB=B6=E8=BF=9F=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/modules/FileSourceHandleManager.java     | 6 +++---
 .../main/java/org/jeecg/modules/UndealHandleManager.java    | 6 +++---
 .../modules/service/impl/GardsAnalysesServiceImpl.java      | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java
index a0fc414b..59d7c887 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java
@@ -56,7 +56,7 @@ public class FileSourceHandleManager{
 
             //初始化线程池
             ThreadFactory threadFactory = new CustomizableThreadFactory("filesource-file-parsing-");
-            poolExecutor = new ThreadPoolExecutor(taskProperties.getReceiveNum(),maximumPoolSize,5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),threadFactory);
+            poolExecutor = new ThreadPoolExecutor(taskProperties.getFilesourceDirReceiveNum(),maximumPoolSize,5, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),threadFactory);
         }
 
         @Override
@@ -71,9 +71,9 @@ public class FileSourceHandleManager{
                     if(!CollectionUtils.isEmpty(spectrumFiles)){
                         CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size());
                         for(File spectrumFile : spectrumFiles){
-                            //如果是Sample谱则延迟500毫秒后执行
+                            //如果是Sample谱则延迟2秒后执行
                             if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){
-                                TimeUnit.MILLISECONDS.sleep(500);
+                                TimeUnit.SECONDS.sleep(2);
                             }
                             ParseingFileSourceThread parseingFileSourceThread = new ParseingFileSourceThread();
                             parseingFileSourceThread.init(spectrumFile,filePath,taskLatch);
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java
index cb7663d0..d4634154 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java
@@ -67,13 +67,13 @@ public class UndealHandleManager{
                     //ftp解析失败文件存储路径
                     final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath();
                     final String filePath = spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath();
-                    List<File> spectrumFiles = FileOperation.getFiles(rootPath+ File.separator+filePath,taskProperties.getFilesourceDirReceiveNum());
+                    List<File> spectrumFiles = FileOperation.getFiles(rootPath+ File.separator+filePath,taskProperties.getUndealDirReceiveNum());
                     if(!CollectionUtils.isEmpty(spectrumFiles)){
                         CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size());
                         for(File spectrumFile : spectrumFiles){
-                            //如果是Sample谱则延迟500毫秒后执行
+                            //如果是Sample谱则延迟2秒后执行
                             if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){
-                                TimeUnit.MILLISECONDS.sleep(500);
+                                TimeUnit.SECONDS.sleep(2);
                             }
                             ParseingFaliFileThread faliFileThread = new ParseingFaliFileThread();
                             faliFileThread.init(spectrumFile,filePath,taskLatch);
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesServiceImpl.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesServiceImpl.java
index ef4ef3ab..4f695572 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesServiceImpl.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesServiceImpl.java
@@ -9,6 +9,7 @@ import org.jeecg.common.properties.SoftwareProperties;
 import org.jeecg.modules.base.entity.original.GardsSampleData;
 import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
 import org.jeecg.modules.base.enums.AnalysesType;
+import org.jeecg.modules.file.FileOperation;
 import org.jeecg.modules.mapper.GardsAnalysesMapper;
 import org.jeecg.modules.service.GardsAnalysesService;
 import org.springframework.stereotype.Service;
@@ -52,8 +53,8 @@ public class GardsAnalysesServiceImpl extends ServiceImpl<GardsAnalysesMapper, G
         analyses.setUseddetphd(detSampleData.getInputFileName());
         analyses.setUsedgasphdId(gasSampleData.getSampleId());
         analyses.setUseddetphdId(detSampleData.getSampleId());
-        analyses.setLogPath(logPath);
-        analyses.setReportPath(reportPath);
+        analyses.setLogPath(FileOperation.separatorConvert(logPath));
+        analyses.setReportPath(FileOperation.separatorConvert(reportPath));
 
         this.save(analyses);
         return analyses;