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

fix:1.若能谱文件已解析成功，遇见重复解析时无论报任何错都不应再修改状态

Browse Source
This commit is contained in:
panbaolin 2023-10-19 20:38:55 +08:00
parent 05c345425d
commit f61d91114b
3 changed files with 11 additions and 5 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谱则延迟2秒后执行 //如果是Sample谱则延迟5秒后执行
if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){ if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){
TimeUnit.SECONDS.sleep(2); TimeUnit.SECONDS.sleep(5);
} }
ParseingFileSourceThread parseingFileSourceThread = new ParseingFileSourceThread(); ParseingFileSourceThread parseingFileSourceThread = new ParseingFileSourceThread();
parseingFileSourceThread.init(spectrumFile,filePath,taskLatch); parseingFileSourceThread.init(spectrumFile,filePath,taskLatch);

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

@ -71,9 +71,9 @@ public class UndealHandleManager{
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谱则延迟2秒后执行 //如果是Sample谱则延迟5秒后执行
if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){ if(spectrumFile.getName().contains(BlockConstant.sampleFlag)){
TimeUnit.SECONDS.sleep(2); TimeUnit.SECONDS.sleep(5);
} }
ParseingFaliFileThread faliFileThread = new ParseingFaliFileThread(); ParseingFaliFileThread faliFileThread = new ParseingFaliFileThread();
faliFileThread.init(spectrumFile,filePath,taskLatch); faliFileThread.init(spectrumFile,filePath,taskLatch);

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

@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.entity.original.GardsSampleData;
import org.jeecg.modules.base.enums.SampleStatus;
import org.jeecg.modules.file.FileOperation; import org.jeecg.modules.file.FileOperation;
import org.jeecg.modules.mapper.GardsSampleDataMapper; import org.jeecg.modules.mapper.GardsSampleDataMapper;
import org.jeecg.modules.service.GardsSampleDataService; import org.jeecg.modules.service.GardsSampleDataService;
@ -79,6 +80,11 @@ public class GardsSampleDataServiceImpl extends ServiceImpl<GardsSampleDataMappe
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void updateStatus(String status, String inputFileName) { public void updateStatus(String status, String inputFileName) {
this.baseMapper.updateStatus(status,inputFileName); LambdaQueryWrapper<GardsSampleData> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(GardsSampleData::getInputFileName,inputFileName);
final GardsSampleData sampleData = this.getOne(queryWrapper);
if(Objects.nonNull(sampleData) && !SampleStatus.COMPLETE.getValue().equals(sampleData.getStatus())){
this.baseMapper.updateStatus(status,inputFileName);
}
} }
} }