diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Information.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Information.java index d23b41a1..8aeef031 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Information.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Information.java @@ -10,51 +10,51 @@ import java.util.Date; @Data 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; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/InputData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/InputData.java index 33201777..65d7cbbd 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/InputData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/InputData.java @@ -9,9 +9,9 @@ public class InputData implements Serializable { private Double energy; - private Double TotalEffi; + private Double totalEffi; - private Double PeakEffi; + private Double peakEffi; private Double uncertain; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLine.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLine.java index a0b1ba07..ac5c6b39 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLine.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLine.java @@ -7,7 +7,7 @@ import java.io.Serializable; @Data public class NuclideLine implements Serializable { - private String FullName; + private String fullName; private Double energy; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpecSetup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpecSetup.java index b9a089f6..8bebdddb 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpecSetup.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpecSetup.java @@ -10,19 +10,19 @@ import java.util.Date; @Data 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; @@ -30,11 +30,11 @@ public class SpecSetup implements Serializable { private double k_beta; - private double RiskLevelK; + private double riskLevelK; private boolean bUpdateCal; - private boolean KeepCalPeakSearchPeaks; + private boolean keepCalPeakSearchPeaks; @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @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 public SpecSetup(){ - ECutAnalysis_Low = 12.0; - ECutAnalysis_High = 12.0; - EnergyTolerance = 0.5; - CalibrationPSS_high = 10.0; - CalibrationPSS_low = 5.0; - BaseImprovePSS = 10.0; - PSS_low = 2.7; + eCutAnalysis_Low = 12.0; + eCutAnalysis_High = 12.0; + energyTolerance = 0.5; + calibrationPSS_high = 10.0; + calibrationPSS_low = 5.0; + baseImprovePSS = 10.0; + pSS_low = 2.7; k_back = 1.25; k_alpha = 2.576; k_beta = 1.645; - RiskLevelK = 4.264890; + riskLevelK = 4.264890; bUpdateCal = false; - KeepCalPeakSearchPeaks = false; + keepCalPeakSearchPeaks = false; } } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeak.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeak.java index d402eb13..76138e49 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeak.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeak.java @@ -13,7 +13,7 @@ public class TablePeak implements Serializable { private String multiplet; - private String FWHM; + private String fwhm; private String netArea; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableWidget.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableWidget.java index acf96f81..e8c33347 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableWidget.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableWidget.java @@ -13,8 +13,8 @@ public class TableWidget implements Serializable { private Double energy; - private String FWHMC; + private String fwhmc; - private String FWHMkeV; + private String fwhmKeV; } diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/XeData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/XeData.java index 31fffd55..a3121988 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/XeData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/XeData.java @@ -7,12 +7,12 @@ import java.io.Serializable; @Data 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; } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java index 4b6c7bbc..0caf73d8 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GammaServiceImpl.java @@ -1271,7 +1271,7 @@ public class GammaServiceImpl implements IGammaService { tablePeak.setEnergy(String.format("%.3f", peak.energy)); tablePeak.setCentroid(String.format("%.3f", peak.peakCentroid)); 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.setAreaErr(peak.area>0?String.format("%.3f",(peak.areaErr/peak.area)*100):"0"); tablePeak.setSignificant(String.format("%.3f", peak.significance));