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

fix：解决异常报警 取核素平均值报错问题

Browse Source
This commit is contained in:
xiaoguangbin 2024-10-22 09:29:45 +08:00
parent c2c0566dae
commit a5eb7a4ea7
3 changed files with 4 additions and 2 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/GardsNuclIdedAutoMapper.xml
View File

@ -37,6 +37,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
AND TO_NUMBER(n.CONCENTRATION) &gt; TO_NUMBER(n.MDC) AND n.CONCENTRATION &gt; n.MDC
</select> </select>
</mapper> </mapper>

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

@ -37,6 +37,6 @@
#{item} #{item}
</foreach> </foreach>
</if> </if>
AND TO_NUMBER(n.CONCENTRATION) &gt; TO_NUMBER(n.MDC) AND n.CONCENTRATION &gt; n.MDC
</select> </select>
</mapper> </mapper>

2
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java
View File

@ -148,6 +148,7 @@ public class CalculateConcServiceImpl implements CalculateConcService {
autoResult.putAll(calculate(nuclConcAuto, index)); autoResult.putAll(calculate(nuclConcAuto, index));
for (String nuclide : nuclides) { for (String nuclide : nuclides) {
String val = autoResult.get(nuclide); String val = autoResult.get(nuclide);
if(StrUtil.isBlank(val)) continue;
AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val); AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val);
analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDARR); analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDARR);
autoAvgs.add(analysisNuclideAvg); autoAvgs.add(analysisNuclideAvg);
@ -158,6 +159,7 @@ public class CalculateConcServiceImpl implements CalculateConcService {
manResult.putAll(calculate(nuclConcMan, index)); manResult.putAll(calculate(nuclConcMan, index));
for (String nuclide : nuclides) { for (String nuclide : nuclides) {
String val = manResult.get(nuclide); String val = manResult.get(nuclide);
if(StrUtil.isBlank(val)) continue;
AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val); AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val);
analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDRRR); analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDRRR);
manAvgs.add(analysisNuclideAvg); manAvgs.add(analysisNuclideAvg);