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

修改实体类

Browse Source
This commit is contained in:
qiaoqinzheng 2023-09-01 15:46:49 +08:00
parent 0a2c847b7a
commit 5844e6480e
8 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Information.java
View File

@ -10,51 +10,51 @@ import java.util.Date;
@Data @Data
public class Information implements Serializable { public class Information implements Serializable {
String sample_measid_name; private String sample_measid_name;
String sample_det_measid_name; private String sample_det_measid_name;
String sample_gas_measid_name; private String sample_gas_measid_name;
String sit_det_code; private String sit_det_code;
String sample_type; private String sample_type;
String geometry; private String geometry;
String spectral_qualifie; private String spectral_qualifie;
Date transmit_dtg; private Date transmit_dtg;
String detect_code; private String detect_code;
String measurementID; private String measurementID;
String bkgdMeasurementID; private String bkgdMeasurementID;
String gasBkgdMeasurementID; private String gasBkgdMeasurementID;
String sampleRefId; private String sampleRefId;
String collect_start_str; private String collect_start_str;
Date collect_start; private Date collect_start;
Date collect_stop; private Date collect_stop;
double s_xe_stable_volume; private double s_xe_stable_volume;
Date acquisition_start; private Date acquisition_start;
Date acquisition_stop; private Date acquisition_stop;
double acquisition_real_sec; private double acquisition_real_sec;
double acquisition_live_sec; private double acquisition_live_sec;
double s_volume_of_Xe; private double s_volume_of_Xe;
String gas_measid_name; private String gas_measid_name;
String det_measid_name; private String det_measid_name;
} }

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/InputData.java
View File

@ -9,9 +9,9 @@ public class InputData implements Serializable {
private Double energy; private Double energy;
private Double TotalEffi; private Double totalEffi;
private Double PeakEffi; private Double peakEffi;
private Double uncertain; private Double uncertain;

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLine.java
View File

@ -7,7 +7,7 @@ import java.io.Serializable;
@Data @Data
public class NuclideLine implements Serializable { public class NuclideLine implements Serializable {
private String FullName; private String fullName;
private Double energy; private Double energy;

36
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpecSetup.java
View File

@ -10,19 +10,19 @@ import java.util.Date;
@Data @Data
public class SpecSetup implements Serializable { public class SpecSetup implements Serializable {
private double ECutAnalysis_Low; private double eCutAnalysis_Low;
private double ECutAnalysis_High; private double eCutAnalysis_High;
private double EnergyTolerance; private double energyTolerance;
private double CalibrationPSS_high; private double calibrationPSS_high;
private double CalibrationPSS_low; private double calibrationPSS_low;
private double BaseImprovePSS; private double baseImprovePSS;
private double PSS_low; private double pSS_low;
private double k_back; private double k_back;
@ -30,11 +30,11 @@ public class SpecSetup implements Serializable {
private double k_beta; private double k_beta;
private double RiskLevelK; private double riskLevelK;
private boolean bUpdateCal; private boolean bUpdateCal;
private boolean KeepCalPeakSearchPeaks; private boolean keepCalPeakSearchPeaks;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ -45,19 +45,19 @@ public class SpecSetup implements Serializable {
private Date refTime_conc; //默认是CollectStartTime private Date refTime_conc; //默认是CollectStartTime
public SpecSetup(){ public SpecSetup(){
ECutAnalysis_Low = 12.0; eCutAnalysis_Low = 12.0;
ECutAnalysis_High = 12.0; eCutAnalysis_High = 12.0;
EnergyTolerance = 0.5; energyTolerance = 0.5;
CalibrationPSS_high = 10.0; calibrationPSS_high = 10.0;
CalibrationPSS_low = 5.0; calibrationPSS_low = 5.0;
BaseImprovePSS = 10.0; baseImprovePSS = 10.0;
PSS_low = 2.7; pSS_low = 2.7;
k_back = 1.25; k_back = 1.25;
k_alpha = 2.576; k_alpha = 2.576;
k_beta = 1.645; k_beta = 1.645;
RiskLevelK = 4.264890; riskLevelK = 4.264890;
bUpdateCal = false; bUpdateCal = false;
KeepCalPeakSearchPeaks = false; keepCalPeakSearchPeaks = false;
} }
} }

2
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeak.java
View File

@ -13,7 +13,7 @@ public class TablePeak implements Serializable {
private String multiplet; private String multiplet;
private String FWHM; private String fwhm;
private String netArea; private String netArea;

4
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableWidget.java
View File

@ -13,8 +13,8 @@ public class TableWidget implements Serializable {
private Double energy; private Double energy;
private String FWHMC; private String fwhmc;
private String FWHMkeV; private String fwhmKeV;
} }

8
jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/XeData.java
View File

@ -7,12 +7,12 @@ import java.io.Serializable;
@Data @Data
public class XeData implements Serializable { public class XeData implements Serializable {
private String Isotope; private String isotope;
private String Concentration; private String concentration;
private Double Uncertainty; private Double uncertainty;
private Double MDC; private Double mdc;
} }

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

@ -1271,7 +1271,7 @@ public class GammaServiceImpl implements IGammaService {
tablePeak.setEnergy(String.format("%.3f", peak.energy)); tablePeak.setEnergy(String.format("%.3f", peak.energy));
tablePeak.setCentroid(String.format("%.3f", peak.peakCentroid)); tablePeak.setCentroid(String.format("%.3f", peak.peakCentroid));
tablePeak.setMultiplet(String.valueOf(peak.multiIndex)); tablePeak.setMultiplet(String.valueOf(peak.multiIndex));
tablePeak.setFWHM(String.format("%.3f", peak.fwhm)); tablePeak.setFwhm(String.format("%.3f", peak.fwhm));
tablePeak.setNetArea(String.format("%.3f", peak.area)); tablePeak.setNetArea(String.format("%.3f", peak.area));
tablePeak.setAreaErr(peak.area>0?String.format("%.3f",(peak.areaErr/peak.area)*100):"0"); tablePeak.setAreaErr(peak.area>0?String.format("%.3f",(peak.areaErr/peak.area)*100):"0");
tablePeak.setSignificant(String.format("%.3f", peak.significance)); tablePeak.setSignificant(String.format("%.3f", peak.significance));