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

gamma最大值是-9999的情况下替换成inf

Browse Source 
生成报告根据最大宽度切割时，丢失最后一条数据问题修改
This commit is contained in:
qiaoqinzheng 2023-11-08 17:03:53 +08:00
parent e937652cc1
commit 2c28a746f5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/abstracts/AbstractLogOrReport.java
View File

@ -116,7 +116,7 @@ public abstract class AbstractLogOrReport {
if (data.length()> maxWidth) { if (data.length()> maxWidth) {
//计算需要切割成多少份 //计算需要切割成多少份
double numParts = Math.ceil(data.length() / maxWidth); double numParts = Math.ceil(data.length() / maxWidth);
for (int j=0; j<numParts; j++) { for (int j=0; j<=numParts; j++) {
String dataSub = ""; String dataSub = "";
//如果本次截取的末端下标没有越界 正常截取 //如果本次截取的末端下标没有越界 正常截取
if (((j + 1) * maxWidth) < data.length()) { if (((j + 1) * maxWidth) < data.length()) {

4
jeecg-module-beta-gamma-analyser/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -2411,7 +2411,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
strBuffer.append(System.lineSeparator()); strBuffer.append(System.lineSeparator());
//文本内容第十部分数据 //文本内容第十部分数据
String[] dataTitles10 = new String[]{"ECutAnalysis_Low", "ECutAnalysis_High", "EnergyTolerance", "BaseImprovePSS", "PSS_low", "k_back", "k_alpha", "k_beta", "RiskLevelK", "refTime_act", "refTime_conc"}; String[] dataTitles10 = new String[]{"ECutAnalysis_Low", "ECutAnalysis_High", "EnergyTolerance", "BaseImprovePSS", "PSS_low", "k_back", "k_alpha", "k_beta", "RiskLevelK", "refTime_act", "refTime_conc"};
String[] dataContent10 = new String[]{String.valueOf(middleData.setting_specSetup.getECutAnalysis_Low()), String.valueOf(middleData.setting_specSetup.getECutAnalysis_High()), String[] dataContent10 = new String[]{String.valueOf(middleData.setting_specSetup.getECutAnalysis_Low()), middleData.setting_specSetup.getECutAnalysis_High()==-9999?"inf":String.valueOf(middleData.setting_specSetup.getECutAnalysis_High()),
String.valueOf(middleData.setting_specSetup.getEnergyTolerance()), String.valueOf(middleData.setting_specSetup.getBaseImprovePSS()), String.valueOf(middleData.setting_specSetup.getEnergyTolerance()), String.valueOf(middleData.setting_specSetup.getBaseImprovePSS()),
String.valueOf(middleData.setting_specSetup.getPss_low()), String.valueOf(middleData.setting_specSetup.getK_back()), String.valueOf(middleData.setting_specSetup.getK_alpha()), String.valueOf(middleData.setting_specSetup.getPss_low()), String.valueOf(middleData.setting_specSetup.getK_back()), String.valueOf(middleData.setting_specSetup.getK_alpha()),
String.valueOf(middleData.setting_specSetup.getK_beta()), String.valueOf(middleData.setting_specSetup.getRiskLevelK()), String.valueOf(middleData.setting_specSetup.getK_beta()), String.valueOf(middleData.setting_specSetup.getRiskLevelK()),
@ -2721,7 +2721,7 @@ public class GammaFileUtil extends AbstractLogOrReport {
strBuffer.append(String.format("%s:%-30s%s", " ECutAnalysis_Low", StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getECutAnalysis_Low()))); strBuffer.append(String.format("%s:%-30s%s", " ECutAnalysis_Low", StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getECutAnalysis_Low())));
//换行 //换行
strBuffer.append(System.lineSeparator()); strBuffer.append(System.lineSeparator());
strBuffer.append(String.format("%s:%-30s%s", " ECutAnalysis_High", StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getECutAnalysis_High()))); strBuffer.append(String.format("%s:%-30s%s", " ECutAnalysis_High", StringPool.SPACE, middleData.setting_specSetup.getECutAnalysis_High()==-9999?"inf":String.valueOf(middleData.setting_specSetup.getECutAnalysis_High())));
//换行 //换行
strBuffer.append(System.lineSeparator()); strBuffer.append(System.lineSeparator());
strBuffer.append(String.format("%s:%-30s%s", " EnergyTolerance", StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getEnergyTolerance()))); strBuffer.append(String.format("%s:%-30s%s", " EnergyTolerance", StringPool.SPACE, String.valueOf(middleData.setting_specSetup.getEnergyTolerance())));