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

Merge remote-tracking branch 'origin/station20231013' into station20231013

Browse Source
This commit is contained in:
nieziyan 2023-10-16 17:02:20 +08:00
commit c2273f4c7f
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-auto-process/src/main/java/org/jeecg/modules/FileSourceHandleManager.java
View File

@ -71,9 +71,9 @@ public class FileSourceHandleManager{
if(!CollectionUtils.isEmpty(spectrumFiles)){ if(!CollectionUtils.isEmpty(spectrumFiles)){
CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size()); CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size());
for(File spectrumFile : spectrumFiles){ for(File spectrumFile : spectrumFiles){
//如果是Sample谱则延迟500毫秒后执行 //如果是Sample谱则延迟2秒后执行
if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){ if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){
TimeUnit.MILLISECONDS.sleep(500); TimeUnit.SECONDS.sleep(2);
} }
ParseingFileSourceThread parseingFileSourceThread = new ParseingFileSourceThread(); ParseingFileSourceThread parseingFileSourceThread = new ParseingFileSourceThread();
parseingFileSourceThread.init(spectrumFile,filePath,taskLatch); parseingFileSourceThread.init(spectrumFile,filePath,taskLatch);

6
jeecg-module-auto-process/src/main/java/org/jeecg/modules/UndealHandleManager.java
View File

@ -67,13 +67,13 @@ public class UndealHandleManager{
//ftp解析失败文件存储路径 //ftp解析失败文件存储路径
final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath(); final String rootPath = spectrumServiceQuotes.getSpectrumPathProperties().getRootPath();
final String filePath = spectrumServiceQuotes.getSpectrumPathProperties().getUndealPath(); 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)){ if(!CollectionUtils.isEmpty(spectrumFiles)){
CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size()); CountDownLatch taskLatch = new CountDownLatch(spectrumFiles.size());
for(File spectrumFile : spectrumFiles){ for(File spectrumFile : spectrumFiles){
//如果是Sample谱则延迟500毫秒后执行 //如果是Sample谱则延迟2秒后执行
if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){ if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){
TimeUnit.MILLISECONDS.sleep(500); TimeUnit.SECONDS.sleep(2);
} }
ParseingFaliFileThread faliFileThread = new ParseingFaliFileThread(); ParseingFaliFileThread faliFileThread = new ParseingFaliFileThread();
faliFileThread.init(spectrumFile,filePath,taskLatch); faliFileThread.init(spectrumFile,filePath,taskLatch);

5
jeecg-module-auto-process/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesServiceImpl.java
View File

@ -9,6 +9,7 @@ import org.jeecg.common.properties.SoftwareProperties;
import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.entity.rnauto.GardsAnalyses; import org.jeecg.modules.base.entity.rnauto.GardsAnalyses;
import org.jeecg.modules.base.enums.AnalysesType; import org.jeecg.modules.base.enums.AnalysesType;
import org.jeecg.modules.file.FileOperation;
import org.jeecg.modules.mapper.GardsAnalysesMapper; import org.jeecg.modules.mapper.GardsAnalysesMapper;
import org.jeecg.modules.service.GardsAnalysesService; import org.jeecg.modules.service.GardsAnalysesService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -52,8 +53,8 @@ public class GardsAnalysesServiceImpl extends ServiceImpl<GardsAnalysesMapper, G
analyses.setUseddetphd(detSampleData.getInputFileName()); analyses.setUseddetphd(detSampleData.getInputFileName());
analyses.setUsedgasphdId(gasSampleData.getSampleId()); analyses.setUsedgasphdId(gasSampleData.getSampleId());
analyses.setUseddetphdId(detSampleData.getSampleId()); analyses.setUseddetphdId(detSampleData.getSampleId());
analyses.setLogPath(logPath); analyses.setLogPath(FileOperation.separatorConvert(logPath));
analyses.setReportPath(reportPath); analyses.setReportPath(FileOperation.separatorConvert(reportPath));
this.save(analyses); this.save(analyses);
return analyses; return analyses;