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 50fa851f..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 @@ -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 spectrumFiles = FileOperation.getFiles(rootPath+ File.separator+filePath,taskProperties.getFilesourceDirReceiveNum()); + List 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