From 642ace8058023a86a3f9f973b3367df9a49bf15c Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 5 Jan 2024 15:05:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=88=86?= =?UTF-8?q?=E6=9E=90gamma=E6=97=A5=E5=BF=97=E9=83=A8=E5=88=86QC=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=88=A4=E6=96=AD=E4=BF=AE=E6=94=B9=20=E4=BA=BA?= =?UTF-8?q?=E5=B7=A5=E4=BA=A4=E4=BA=92=E5=88=86=E6=9E=90beta=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E9=83=A8=E5=88=86=E5=86=85=E5=AE=B9=E5=89=8D=E5=90=8E?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=8D=A2=20=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=A4=84=E7=90=86gamma=E6=97=A5=E5=BF=97=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=AD=A3=E5=B8=B8=E5=86=99=E5=85=A5=E6=A0=B8?= =?UTF-8?q?=E7=B4=A0=EF=BC=8Cqc=E7=BB=93=E6=9E=9C=E5=88=86=E6=9E=90?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/spectrum/Sample_G_Analysis.java | 8 +- .../org/jeecg/common/util/GammaFileUtil.java | 2 +- .../org/jeecg/common/util/PHDFileUtil.java | 84 +++++++++---------- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java index cbdfb39a..ce1c6a2e 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java @@ -585,10 +585,8 @@ public class Sample_G_Analysis { data.add(item); item = new AttributeItemVo("MDC", middleData.getNucl_ided_MDC(), "uBq/m^3"); data.add(item); - writes.addAll(MyLogFormatUtil.getBlockContext(infoMap)); + writes.addAll(MyLogFormatUtil.getBlockContext(data)); - // Starting Data Quality..... - writes.add(MyLogFormatUtil.getHeaderFormat(MyLogFormatUtil.GGetDataQuality)); data = new ArrayList<>(); item = new AttributeItemVo("Name", middleData.getQC_CHECK_QC_NAME()); data.add(item); @@ -598,7 +596,9 @@ public class Sample_G_Analysis { data.add(item); item = new AttributeItemVo("Test", middleData.getQC_CHECK_QC_STANDARD()); data.add(item); - writes.addAll(MyLogFormatUtil.getBlockContext(infoMap)); + writes.addAll(MyLogFormatUtil.getBlockContext(data)); + // Starting Data Quality..... + writes.add(MyLogFormatUtil.getHeaderFormat(MyLogFormatUtil.GGetDataQuality)); // Spectrum Analysis Finished writes.add(MyLogFormatUtil.getTitleFormat(MyLogFormatUtil.GTitleSpectrumEnd)); diff --git a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 055623be..439f9c44 100644 --- a/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -2612,7 +2612,7 @@ public class GammaFileUtil extends AbstractLogOrReport { for (int i=0; i 0) { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2))))); + if (bgAnalyseResult.g_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_e_c)) { + if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) { + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2))))); } else { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1676,9 +1676,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第四十五行数据 - if (bgAnalyseResult.d_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_c_e)) { - if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2))))); + if (bgAnalyseResult.g_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_c_e)) { + if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) { + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2))))); } else { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1694,9 +1694,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第四十四行数据 - if (bgAnalyseResult.d_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_e_c)) { - if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2))))); + if (bgAnalyseResult.g_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_e_c)) { + if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) { + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2))))); } else { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1706,9 +1706,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第四十五行数据 - if (bgAnalyseResult.d_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_c_e)) { - if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2))))); + if (bgAnalyseResult.g_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_c_e)) { + if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) { + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2))))); } else { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1732,12 +1732,12 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第四十八行数据 - for (int i = 0; i < bgAnalyseResult.D_ROI.size(); i++) { - String roi = String.valueOf(bgAnalyseResult.D_ROI.get(i)); - String bStart = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_start.get(i)); - String bStop = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i)); - String gStart = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_start.get(i)); - String gStop = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i)); + for (int i = 0; i < bgAnalyseResult.G_ROI.size(); i++) { + String roi = String.valueOf(bgAnalyseResult.G_ROI.get(i)); + String bStart = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_start.get(i)); + String bStop = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i)); + String gStart = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_start.get(i)); + String gStop = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i)); out.append(rowFormat(dataFormat7, roi, bStart, bStop, gStart, gStop)); //换行 out.append(System.lineSeparator()); @@ -1759,9 +1759,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第五十一行数据 - if (bgAnalyseResult.g_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_e_c)) { - if (bgAnalyseResult.g_b_fitting_e_c.size() > 0) { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_e_c.get(2))))); + if (bgAnalyseResult.d_b_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_e_c)) { + if (bgAnalyseResult.d_b_fitting_e_c.size() > 0) { + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_e_c.get(2))))); } else { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1771,9 +1771,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第五十二行数据 - if (bgAnalyseResult.g_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_b_fitting_c_e)) { - if (bgAnalyseResult.g_b_fitting_c_e.size() > 0) { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_b_fitting_c_e.get(2))))); + if (bgAnalyseResult.d_b_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_b_fitting_c_e)) { + if (bgAnalyseResult.d_b_fitting_c_e.size() > 0) { + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_b_fitting_c_e.get(2))))); } else { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1789,9 +1789,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第五十四行数据 - if (bgAnalyseResult.g_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_e_c)) { - if (bgAnalyseResult.g_g_fitting_e_c.size() > 0) { - out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_e_c.get(2))))); + if (bgAnalyseResult.d_g_fitting_e_c != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_e_c)) { + if (bgAnalyseResult.d_g_fitting_e_c.size() > 0) { + out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_e_c.get(2))))); } else { out.append(rowFormat("energy to channel equation: CH(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1801,9 +1801,9 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第五十五行数据 - if (bgAnalyseResult.g_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.g_g_fitting_c_e)) { - if (bgAnalyseResult.g_g_fitting_c_e.size() > 0) { - out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.g_g_fitting_c_e.get(2))))); + if (bgAnalyseResult.d_g_fitting_c_e != null && CollectionUtils.isNotEmpty(bgAnalyseResult.d_g_fitting_c_e)) { + if (bgAnalyseResult.d_g_fitting_c_e.size() > 0) { + out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(0))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(1))), NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.d_g_fitting_c_e.get(2))))); } else { out.append(rowFormat("channel to energy equation: E(x) = (%s)+(%s)*x+(%s)x*x", "?1", "?2", "?3")); } @@ -1827,12 +1827,12 @@ public class PHDFileUtil extends AbstractLogOrReport { //换行 out.append(System.lineSeparator()); //第五十八行数据 - for (int i = 0; i < bgAnalyseResult.G_ROI.size(); i++) { - String roi = String.valueOf(bgAnalyseResult.G_ROI.get(i)); - String bStart = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_start.get(i)); - String bStop = String.valueOf(bgAnalyseResult.G_ROI_B_Boundary_stop.get(i)); - String gStart = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_start.get(i)); - String gStop = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i)); + for (int i = 0; i < bgAnalyseResult.D_ROI.size(); i++) { + String roi = String.valueOf(bgAnalyseResult.D_ROI.get(i)); + String bStart = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_start.get(i)); + String bStop = String.valueOf(bgAnalyseResult.D_ROI_B_Boundary_stop.get(i)); + String gStart = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_start.get(i)); + String gStop = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i)); out.append(rowFormat(dataFormat7, roi, bStart, bStop, gStart, gStop)); //换行 out.append(System.lineSeparator()); @@ -1851,8 +1851,8 @@ public class PHDFileUtil extends AbstractLogOrReport { out.append(System.lineSeparator()); //第六十行数据 String dataFormat8 = "ROI : %-8sSample : %-8sGasBkgnd : %-7sDetBkgnd : %-8s"; - for (int i = 0; i < bgAnalyseResult.G_ROI_G_Boundary_stop.size(); i++) { - String roi = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i)); + for (int i = 0; i < bgAnalyseResult.D_ROI_G_Boundary_stop.size(); i++) { + String roi = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i)); String sCts = String.valueOf(bgAnalyseResult.s_roi_cts.get(i)); String gCts = String.valueOf(bgAnalyseResult.g_roi_cts.get(i)); String dCts = String.valueOf(bgAnalyseResult.d_roi_cts.get(i)); @@ -1880,8 +1880,8 @@ public class PHDFileUtil extends AbstractLogOrReport { // out.append(System.lineSeparator()); //第六十三行数据 String dataFormat9 = "ROI : %-8sNet count : %-2s+/- %-20sLC : %-12s"; - for (int i = 0; i < bgAnalyseResult.G_ROI_G_Boundary_stop.size(); i++) { - String roi = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i)); + for (int i = 0; i < bgAnalyseResult.D_ROI_G_Boundary_stop.size(); i++) { + String roi = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i)); String net = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_net_coutns.get(i))); String netErr = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_net_coutns_err.get(i))); String lcCts = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.LC_CTS.get(i))); @@ -1903,8 +1903,8 @@ public class PHDFileUtil extends AbstractLogOrReport { out.append(System.lineSeparator()); //第六十五行数据 String dataFormat10 = "ROI : %-8sConc : %-2s+/- %-2smBq/m3 LC : %-2smBq/m3 MDC : %-2smBq/m3 "; - for (int i = 0; i < bgAnalyseResult.G_ROI_G_Boundary_stop.size(); i++) { - String roi = String.valueOf(bgAnalyseResult.G_ROI_G_Boundary_stop.get(i)); + for (int i = 0; i < bgAnalyseResult.D_ROI_G_Boundary_stop.size(); i++) { + String roi = String.valueOf(bgAnalyseResult.D_ROI_G_Boundary_stop.get(i)); String conc = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_con_uncer.get(i))); String concErr = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.ROI_con_uncer_err.get(i))); String lc = NumberFormatUtil.numberFormat(String.valueOf(bgAnalyseResult.LC.get(i)));