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

同步mdc分支代码

Browse Source
This commit is contained in:
qiaoqinzheng 2024-03-21 10:29:47 +08:00
parent bde5eed237
commit 5c181d60b1
5 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/AlarmItemMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mapper.AlarmItemMapper"> <mapper namespace="org.jeecg.modules.mapper.AlarmItemMapper">
<select id="alarmItems" resultType="org.jeecg.modules.base.entity.postgre.AlarmItem"> <select id="alarmItemsServer" resultType="org.jeecg.modules.base.entity.postgre.AlarmItem">
SELECT SELECT
i.* i.*
FROM FROM

1
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsXeResultsAutoMapper.xml
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mapper.GardsXeResultsAutoMapper"> <mapper namespace="org.jeecg.modules.mapper.GardsXeResultsAutoMapper">
<select id="getConc" resultType="org.jeecg.modules.base.dto.ConcDtoXe"> <select id="getConc" resultType="org.jeecg.modules.base.dto.ConcDtoXe">
SELECT SELECT
xe.NUCLIDE_NAME, xe.NUCLIDE_NAME,

1
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmItemService.java
View File

@ -1,7 +1,6 @@
package org.jeecg.modules.service; package org.jeecg.modules.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.base.dto.ItemDto; import org.jeecg.modules.base.dto.ItemDto;
import org.jeecg.modules.base.entity.postgre.AlarmItem; import org.jeecg.modules.base.entity.postgre.AlarmItem;

13
jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/AbstractS_D_Q_G_SpectrumHandler.java
View File

@ -182,7 +182,14 @@ public abstract class AbstractS_D_Q_G_SpectrumHandler extends AbstractSpectrumHa
protected void updateErrorSpectrumFileName() throws FileNotFoundException { protected void updateErrorSpectrumFileName() throws FileNotFoundException {
StringBuilder newFileName = new StringBuilder(); StringBuilder newFileName = new StringBuilder();
if (StringUtils.isNotBlank(this.sourceData.measurement_id)) { if (StringUtils.isNotBlank(this.sourceData.measurement_id)) {
newFileName.append(super.spectrumServiceQuotes.getNameStandUtil().GetFileNameFromDateTime(this.sourceData.measurement_id, "")); String newName = super.spectrumServiceQuotes.getNameStandUtil().GetFileNameFromDateTime(this.sourceData.measurement_id, "");
if (StringUtils.isNotBlank(newName)) {
newFileName.append(newName);
} else {
newFileName.append(this.sourceData.detector_code);
newFileName.append(StringConstant.DASH);
newFileName.append("");
}
} else { } else {
newFileName.append(this.sourceData.detector_code); newFileName.append(this.sourceData.detector_code);
newFileName.append(StringConstant.DASH); newFileName.append(StringConstant.DASH);
@ -226,11 +233,11 @@ public abstract class AbstractS_D_Q_G_SpectrumHandler extends AbstractSpectrumHa
this.startIntoDatabaseTime = new Date(); this.startIntoDatabaseTime = new Date();
//如果数据已经存储，不在重复存储 //如果数据已经存储，不在重复存储
final GardsSampleData query = spectrumServiceQuotes.getSampleDataService().findByInputFileName(super.spectrumFileRelativePath); final GardsSampleData query = spectrumServiceQuotes.getSampleDataService().findByInputFileName(super.spectrumFileRelativePath);
//如果数据已经存储 并且状态是 P 则判断文件重复 如果数据已经存储并且状态是 F 不进行处理 //如果数据已经存储 并且状态是 P 或 R 则判断文件重复 如果数据已经存储并且状态是 F 不进行处理
if(Objects.nonNull(query)){ if(Objects.nonNull(query)){
this.sampleData = query; this.sampleData = query;
this.endIntoDatabaseTime = new Date(); this.endIntoDatabaseTime = new Date();
if (query.getStatus().equalsIgnoreCase(SampleStatus.COMPLETE.value)) { if (query.getStatus().equalsIgnoreCase(SampleStatus.COMPLETE.value) || query.getStatus().equalsIgnoreCase(SampleStatus.INTERACTIVE.value)) {
//设置文件重复标记为true //设置文件重复标记为true
this.parsingProcessLog.setFileRepeat(true); this.parsingProcessLog.setFileRepeat(true);
//发送文件重复错误事件，后续统计报告使用 //发送文件重复错误事件，后续统计报告使用

1
jeecg-server-cloud/armd-auto-process-start/src/main/java/org/jeecg/JeecgAutoProcessApplication.java
View File

@ -127,6 +127,7 @@ public class JeecgAutoProcessApplication extends SpringBootServletInitializer im
FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getUndealPath()); FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getUndealPath());
FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getFilesourcePath()); FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getFilesourcePath());
FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getEmlPath()); FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getEmlPath());
FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getEmlErrorPath());
FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getErrorFilePath()); FileUtil.mkdir(spectrumPathProperties.getRootPath()+File.separator+spectrumPathProperties.getErrorFilePath());
} }
} }