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

GammaFileUtil下GetMiddleData方法遗漏字段增加

Browse Source 
SpectrumAnalysisServiceImpl下ViewRRR接口增加日期格式化
This commit is contained in:
qiaoqinzheng 2023-09-01 15:57:18 +08:00
parent 5844e6480e
commit 7edab0412f
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java
View File

@ -13,6 +13,7 @@ import org.jeecg.modules.base.entity.configuration.GardsNuclLib;
import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib; import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib;
import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; import org.jeecg.modules.base.entity.rnman.GardsAnalySetting;
import org.jeecg.modules.base.enums.CalName; import org.jeecg.modules.base.enums.CalName;
import org.jeecg.modules.base.enums.CalType;
import org.jeecg.modules.base.vo.*; import org.jeecg.modules.base.vo.*;
import org.jeecg.modules.entity.*; import org.jeecg.modules.entity.*;
import org.jeecg.modules.entity.vo.TablePeaks; import org.jeecg.modules.entity.vo.TablePeaks;
@ -2773,6 +2774,8 @@ public class GammaFileUtil {
totalNumber+=fileAnlyse.getSpec().getCounts().get(m); totalNumber+=fileAnlyse.getSpec().getCounts().get(m);
} }
middleData.analyses_type="AUTOMATIC"; middleData.analyses_type="AUTOMATIC";
middleData.analyses_software = "AutoDataProcessDemon";
middleData.analyses_swVersion = "1.0.1";
middleData.analyses_category = 1; middleData.analyses_category = 1;
middleData.analyses_comments = "autoprocess"; middleData.analyses_comments = "autoprocess";
middleData.analyses_searchStartChannel = fileAnlyse.getBaseCtrls().getRg_low(); middleData.analyses_searchStartChannel = fileAnlyse.getBaseCtrls().getRg_low();
@ -2782,9 +2785,9 @@ public class GammaFileUtil {
middleData.analyses_totalCounts = totalNumber; middleData.analyses_totalCounts = totalNumber;
if(fileAnlyse.getUsedEnerKD() != null && fileAnlyse.getUsedEnerKD().getG_energy().size() != 0) { if(fileAnlyse.getUsedEnerKD() != null && fileAnlyse.getUsedEnerKD().getG_energy().size() != 0) {
middleData.calibration_pairs_E_Caltype = "energy"; middleData.calibration_pairs_E_Caltype = CalType.ENERGY_CAL.getType();
middleData.calibration_pairs_E_Input = fileAnlyse.getUsedEner(); middleData.calibration_pairs_E_Input = fileAnlyse.getUsedEner();
middleData.calibration_pairs_S_E_Caltype = "energy"; middleData.calibration_pairs_S_E_Caltype = CalType.ENERGY_CAL.getType();
middleData.calibration_pairs_S_E_Input = fileAnlyse.getUsedEner(); middleData.calibration_pairs_S_E_Input = fileAnlyse.getUsedEner();
List<String> temp = new LinkedList<>(); List<String> temp = new LinkedList<>();
for(int pos=0;pos<fileAnlyse.getUsedEnerKD().getG_energy().size();pos++) { for(int pos=0;pos<fileAnlyse.getUsedEnerKD().getG_energy().size();pos++) {
@ -2806,9 +2809,9 @@ public class GammaFileUtil {
//gards_ calibration_pairs Efficiency //gards_ calibration_pairs Efficiency
middleData.calibration_pairs_sample_type = fileAnlyse.getHeader().getSystem_type(); middleData.calibration_pairs_sample_type = fileAnlyse.getHeader().getSystem_type();
if(fileAnlyse.getUsedEffiKD() != null && fileAnlyse.getUsedEffiKD().getG_energy().size() != 0) { if(fileAnlyse.getUsedEffiKD() != null && fileAnlyse.getUsedEffiKD().getG_energy().size() != 0) {
middleData.calibration_pairs_EF_Caltype = "efficiency"; middleData.calibration_pairs_EF_Caltype = CalType.EFFICIENCY_CAL.getType();
middleData.calibration_pairs_EF_Input = fileAnlyse.getUsedEffi(); middleData.calibration_pairs_EF_Input = fileAnlyse.getUsedEffi();
middleData.calibration_pairs_S_EF_Caltype = "efficiency"; middleData.calibration_pairs_S_EF_Caltype = CalType.EFFICIENCY_CAL.getType();
middleData.calibration_pairs_S_EF_Input = fileAnlyse.getUsedEffi(); middleData.calibration_pairs_S_EF_Input = fileAnlyse.getUsedEffi();
List<String> temp = new LinkedList<>(); List<String> temp = new LinkedList<>();
for(int pos=0;pos<fileAnlyse.getUsedEffiKD().getG_energy().size();pos++) for(int pos=0;pos<fileAnlyse.getUsedEffiKD().getG_energy().size();pos++)
@ -2830,9 +2833,9 @@ public class GammaFileUtil {
//gards_ calibration_pairs Resolution //gards_ calibration_pairs Resolution
if(fileAnlyse.getUsedResoKD() != null && fileAnlyse.getUsedResoKD().getFWHM().size() != 0) { if(fileAnlyse.getUsedResoKD() != null && fileAnlyse.getUsedResoKD().getFWHM().size() != 0) {
middleData.calibration_pairs_R_Caltype = "Resolution"; middleData.calibration_pairs_R_Caltype = CalType.RESOLUTION_CAL.getType();
middleData.calibration_pairs_R_Input = fileAnlyse.getUsedReso(); middleData.calibration_pairs_R_Input = fileAnlyse.getUsedReso();
middleData.calibration_pairs_S_R_Caltype = "Resolution"; middleData.calibration_pairs_S_R_Caltype = CalType.RESOLUTION_CAL.getType();
middleData.calibration_pairs_S_R_Input = fileAnlyse.getUsedReso(); middleData.calibration_pairs_S_R_Input = fileAnlyse.getUsedReso();
List<String> temp = new LinkedList<>(); List<String> temp = new LinkedList<>();
@ -2854,9 +2857,9 @@ public class GammaFileUtil {
//gards_ calibration_pairs TotalEfficiency //gards_ calibration_pairs TotalEfficiency
if(fileAnlyse.getUsedTotEKD() != null && fileAnlyse.getUsedTotEKD().getG_energy().size() != 0) { if(fileAnlyse.getUsedTotEKD() != null && fileAnlyse.getUsedTotEKD().getG_energy().size() != 0) {
middleData.calibration_pairs_T_Caltype = "TotalEfficiency"; middleData.calibration_pairs_T_Caltype = CalType.TOTALEFFICIENCY_CAL.getType();
middleData.calibration_pairs_T_Input = fileAnlyse.getUsedTotE(); middleData.calibration_pairs_T_Input = fileAnlyse.getUsedTotE();
middleData.calibration_pairs_S_T_Caltype = "TotalEfficiency"; middleData.calibration_pairs_S_T_Caltype = CalType.TOTALEFFICIENCY_CAL.getType();
middleData.calibration_pairs_S_T_Input = fileAnlyse.getUsedTotE(); middleData.calibration_pairs_S_T_Input = fileAnlyse.getUsedTotE();
List<String> temp = new LinkedList<>(); List<String> temp = new LinkedList<>();
for(int pos=0;pos<fileAnlyse.getUsedTotEKD().getG_energy().size();pos++) { for(int pos=0;pos<fileAnlyse.getUsedTotEKD().getG_energy().size();pos++) {

6
jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/SpectrumAnalysisServiceImpl.java
View File

@ -803,14 +803,14 @@ public class SpectrumAnalysisServiceImpl implements ISpectrumAnalysisService {
strBuffer.append("#COLLECTION INFORMATION").append("\n"); strBuffer.append("#COLLECTION INFORMATION").append("\n");
strBuffer.append(" Station CODE: ").append(information.getSit_det_code()).append("\n"); strBuffer.append(" Station CODE: ").append(information.getSit_det_code()).append("\n");
strBuffer.append(" Detector CODE: ").append(information.getDetect_code()).append("\n"); strBuffer.append(" Detector CODE: ").append(information.getDetect_code()).append("\n");
strBuffer.append(" Collection Start: ").append(information.getCollect_start()).append("\n"); strBuffer.append(" Collection Start: ").append(DateUtils.formatDate(information.getCollect_start(), "yyyy/MM/dd HH:mm:ss")).append("\n");
strBuffer.append(" Collection Stop: ").append(information.getCollect_stop()).append("\n"); strBuffer.append(" Collection Stop: ").append(DateUtils.formatDate(information.getCollect_stop(), "yyyy/MM/dd HH:mm:ss")).append("\n");
strBuffer.append(" Collection TIME(h): ").append((information.getCollect_stop().getTime()/1000-information.getCollect_start().getTime()/1000)/3600).append("\n"); strBuffer.append(" Collection TIME(h): ").append((information.getCollect_stop().getTime()/1000-information.getCollect_start().getTime()/1000)/3600).append("\n");
strBuffer.append(" Air Volume[cm3]: ").append(information.getS_xe_stable_volume()).append("\n"); strBuffer.append(" Air Volume[cm3]: ").append(information.getS_xe_stable_volume()).append("\n");
strBuffer.append(" Xe Volume[cm3]: ").append(information.getS_volume_of_Xe()).append("\n"); strBuffer.append(" Xe Volume[cm3]: ").append(information.getS_volume_of_Xe()).append("\n");
strBuffer.append("\n"); strBuffer.append("\n");
strBuffer.append("#ACQUISITION INFORMATION").append("\n"); strBuffer.append("#ACQUISITION INFORMATION").append("\n");
strBuffer.append(" Acquisition Start: ").append(information.getAcquisition_start()).append("\n"); strBuffer.append(" Acquisition Start: ").append(DateUtils.formatDate(information.getAcquisition_start(), "yyyy/MM/dd HH:mm:ss")).append("\n");
strBuffer.append(" Acq Real Time(s): ").append(information.getAcquisition_real_sec()).append("\n"); strBuffer.append(" Acq Real Time(s): ").append(information.getAcquisition_real_sec()).append("\n");
strBuffer.append(" Acq Live Time: ").append(information.getAcquisition_live_sec()).append("\n"); strBuffer.append(" Acq Live Time: ").append(information.getAcquisition_live_sec()).append("\n");
strBuffer.append("\n"); strBuffer.append("\n");