From a5eb7a4ea715b4df4b61ea25e7c423cedcae3730 Mon Sep 17 00:00:00 2001 From: xiaoguangbin Date: Tue, 22 Oct 2024 09:29:45 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E6=8A=A5=E8=AD=A6=20=E5=8F=96=E6=A0=B8=E7=B4=A0?= =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=80=BC=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml | 2 +- .../org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml | 2 +- .../jeecg/modules/service/impl/CalculateConcServiceImpl.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml index 671cf586..c9c2755a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedAutoMapper.xml @@ -37,6 +37,6 @@ #{item} - AND TO_NUMBER(n.CONCENTRATION) > TO_NUMBER(n.MDC) + AND n.CONCENTRATION > n.MDC \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml index 5f408b1f..9686b238 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/GardsNuclIdedManMapper.xml @@ -37,6 +37,6 @@ #{item} - AND TO_NUMBER(n.CONCENTRATION) > TO_NUMBER(n.MDC) + AND n.CONCENTRATION > n.MDC \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java index ef0ab2af..9ebded1a 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java @@ -148,6 +148,7 @@ public class CalculateConcServiceImpl implements CalculateConcService { autoResult.putAll(calculate(nuclConcAuto, index)); for (String nuclide : nuclides) { String val = autoResult.get(nuclide); + if(StrUtil.isBlank(val)) continue; AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val); analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDARR); autoAvgs.add(analysisNuclideAvg); @@ -158,6 +159,7 @@ public class CalculateConcServiceImpl implements CalculateConcService { manResult.putAll(calculate(nuclConcMan, index)); for (String nuclide : nuclides) { String val = manResult.get(nuclide); + if(StrUtil.isBlank(val)) continue; AlarmAnalysisNuclideAvg analysisNuclideAvg = new AlarmAnalysisNuclideAvg(station, nuclide, val); analysisNuclideAvg.setDataSourceType(CommonConstant.ARMDRRR); manAvgs.add(analysisNuclideAvg);