人工交互分析页面回显数据精度以及格式问题修改
This commit is contained in:
parent
77c4473936
commit
ed00d25f4d
|
@ -36,8 +36,12 @@ public class NumberFormatUtil {
|
||||||
} else {
|
} else {
|
||||||
eValue = "e+0"+ number.substring(number.indexOf("e")+1);
|
eValue = "e+0"+ number.substring(number.indexOf("e")+1);
|
||||||
}
|
}
|
||||||
} else {
|
} else if (Double.valueOf(eValue) < 0){
|
||||||
eValue = number.substring(number.indexOf("e"));
|
if (Double.valueOf(eValue) > -10) {
|
||||||
|
eValue = "e-0"+number.substring(number.indexOf("e")+2);
|
||||||
|
} else {
|
||||||
|
eValue = "e"+number.substring(number.indexOf("e")+1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
value = numberCal + eValue.replace("E", "e");
|
value = numberCal + eValue.replace("E", "e");
|
||||||
} else if (number.indexOf("E")>0) {
|
} else if (number.indexOf("E")>0) {
|
||||||
|
@ -50,8 +54,12 @@ public class NumberFormatUtil {
|
||||||
} else {
|
} else {
|
||||||
eValue = "e+0"+ number.substring(number.indexOf("E")+1);
|
eValue = "e+0"+ number.substring(number.indexOf("E")+1);
|
||||||
}
|
}
|
||||||
} else {
|
} else if (Double.valueOf(eValue) < 0){
|
||||||
eValue = number.substring(number.indexOf("E"));
|
if (Double.valueOf(eValue) > -10) {
|
||||||
|
eValue = "e-0"+number.substring(number.indexOf("E")+2);
|
||||||
|
} else {
|
||||||
|
eValue = "e"+number.substring(number.indexOf("E")+1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
value = numberCal + eValue.replace("E", "e");
|
value = numberCal + eValue.replace("E", "e");
|
||||||
}
|
}
|
||||||
|
|
|
@ -236,25 +236,25 @@
|
||||||
|
|
||||||
<select id="getSampleData" resultType="org.jeecg.modules.entity.GardsSampleDataSpectrum">
|
<select id="getSampleData" resultType="org.jeecg.modules.entity.GardsSampleDataSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
SITE_DET_CODE,
|
SITE_DET_CODE siteDetCode,
|
||||||
SAMPLE_ID,
|
SAMPLE_ID sampleId,
|
||||||
STATION_ID,
|
STATION_ID stationId,
|
||||||
DETECTOR_ID,
|
DETECTOR_ID detectorId,
|
||||||
INPUT_FILE_NAME,
|
INPUT_FILE_NAME inputFileName,
|
||||||
SAMPLE_TYPE,
|
SAMPLE_TYPE sampleType,
|
||||||
DATA_TYPE,
|
DATA_TYPE dataType,
|
||||||
GEOMETRY,
|
GEOMETRY geometry,
|
||||||
SPECTRAL_QUALIFIE,
|
SPECTRAL_QUALIFIE spectralQualifie,
|
||||||
TRANSMIT_DTG,
|
TRANSMIT_DTG transmitDtg,
|
||||||
COLLECT_START,
|
COLLECT_START collectStart,
|
||||||
COLLECT_STOP,
|
COLLECT_STOP collectStop,
|
||||||
ACQUISITION_START,
|
ACQUISITION_START acquisitionStart,
|
||||||
ACQUISITION_STOP,
|
ACQUISITION_STOP acquisitionStop,
|
||||||
ACQUISITION_REAL_SEC,
|
ACQUISITION_REAL_SEC acquisitionRealSec,
|
||||||
ACQUISITION_LIVE_SEC,
|
ACQUISITION_LIVE_SEC acquisitionLiveSec,
|
||||||
QUANTITY,
|
QUANTITY quantity,
|
||||||
STATUS,
|
STATUS status,
|
||||||
MODDATE
|
MODDATE moddate
|
||||||
FROM
|
FROM
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA
|
||||||
<where>
|
<where>
|
||||||
|
@ -264,25 +264,25 @@
|
||||||
|
|
||||||
<select id="findSampleByFilePath" resultType="org.jeecg.modules.entity.GardsSampleDataSpectrum">
|
<select id="findSampleByFilePath" resultType="org.jeecg.modules.entity.GardsSampleDataSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
SITE_DET_CODE,
|
SITE_DET_CODE siteDetCode,
|
||||||
SAMPLE_ID,
|
SAMPLE_ID sampleId,
|
||||||
STATION_ID,
|
STATION_ID stationId,
|
||||||
DETECTOR_ID,
|
DETECTOR_ID detectorId,
|
||||||
INPUT_FILE_NAME,
|
INPUT_FILE_NAME inputFileName,
|
||||||
SAMPLE_TYPE,
|
SAMPLE_TYPE sampleType,
|
||||||
DATA_TYPE,
|
DATA_TYPE dataType,
|
||||||
GEOMETRY,
|
GEOMETRY geometry,
|
||||||
SPECTRAL_QUALIFIE,
|
SPECTRAL_QUALIFIE spectralQualifie,
|
||||||
TRANSMIT_DTG,
|
TRANSMIT_DTG transmitDtg,
|
||||||
COLLECT_START,
|
COLLECT_START collectStart,
|
||||||
COLLECT_STOP,
|
COLLECT_STOP collectStop,
|
||||||
ACQUISITION_START,
|
ACQUISITION_START acquisitionStart,
|
||||||
ACQUISITION_STOP,
|
ACQUISITION_STOP acquisitionStop,
|
||||||
ACQUISITION_REAL_SEC,
|
ACQUISITION_REAL_SEC acquisitionRealSec,
|
||||||
ACQUISITION_LIVE_SEC,
|
ACQUISITION_LIVE_SEC acquisitionLiveSec,
|
||||||
QUANTITY,
|
QUANTITY quantity,
|
||||||
STATUS,
|
STATUS status,
|
||||||
MODDATE
|
MODDATE moddate
|
||||||
FROM
|
FROM
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA
|
||||||
<where>
|
<where>
|
||||||
|
@ -442,15 +442,15 @@
|
||||||
|
|
||||||
<select id="getAnalysis" resultType="org.jeecg.modules.entity.GardsAnalysesSpectrum">
|
<select id="getAnalysis" resultType="org.jeecg.modules.entity.GardsAnalysesSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
IDANALYSIS,
|
IDANALYSIS idAnalysis,
|
||||||
COMMENTS,
|
COMMENTS comments,
|
||||||
SEARCHSTARTCHANNEL,
|
SEARCHSTARTCHANNEL searchStartChannel,
|
||||||
SEARCHENDCHANNEL,
|
SEARCHENDCHANNEL searchEndChannel,
|
||||||
SEARCHTHRESHOLD,
|
SEARCHTHRESHOLD searchThreshold,
|
||||||
NUMBEROFPEAKS,
|
NUMBEROFPEAKS numberOfPeaks,
|
||||||
BASELINE_PATH,
|
BASELINE_PATH baselinePath,
|
||||||
LC_PATH,
|
LC_PATH lcPath,
|
||||||
SCAC_PATH
|
SCAC_PATH scacPath
|
||||||
FROM
|
FROM
|
||||||
${dbName}
|
${dbName}
|
||||||
WHERE SAMPLE_ID = #{sampleId}
|
WHERE SAMPLE_ID = #{sampleId}
|
||||||
|
@ -459,31 +459,31 @@
|
||||||
|
|
||||||
<select id="getPeaks" resultType="org.jeecg.modules.entity.GardsPeaksSpectrum">
|
<select id="getPeaks" resultType="org.jeecg.modules.entity.GardsPeaksSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
IDPEAK,
|
IDPEAK idPeak,
|
||||||
CENTROIDCHANNEL,
|
CENTROIDCHANNEL centroidChannel,
|
||||||
ENERGY,
|
ENERGY energy,
|
||||||
AREA,
|
AREA area,
|
||||||
UNCAREA,
|
UNCAREA uncArea,
|
||||||
EFFICIENCY,
|
EFFICIENCY efficiency,
|
||||||
FWHM,
|
FWHM fwhm,
|
||||||
FWTM,
|
FWTM fwtm,
|
||||||
SIGNIFICANCE,
|
SIGNIFICANCE significance,
|
||||||
LC,
|
LC lc,
|
||||||
ROISTART,
|
ROISTART roiStart,
|
||||||
ROIEND,
|
ROIEND roiEnd,
|
||||||
MULTIINDEX,
|
MULTIINDEX mulitiIndex,
|
||||||
TAIL,
|
TAIL tail,
|
||||||
TAILALPHA,
|
TAILALPHA tailAlpha,
|
||||||
UPPERTAIL,
|
UPPERTAIL upperTail,
|
||||||
UPPERTAILALPHA,
|
UPPERTAILALPHA upperTailAlpha,
|
||||||
BWWIDTHCHAN,
|
BWWIDTHCHAN bwwidthchan,
|
||||||
RECOILDELTACHAN,
|
RECOILDELTACHAN recoildeltachan,
|
||||||
STEPRAIO,
|
STEPRAIO stepraio,
|
||||||
LD,
|
LD ld,
|
||||||
SENSITIVITY,
|
SENSITIVITY sensitivity,
|
||||||
BACKGROUNDAREA,
|
BACKGROUNDAREA backgroundarea,
|
||||||
MEANBACKCOUNT,
|
MEANBACKCOUNT meanbackcount,
|
||||||
PEAKCOMMENTS
|
PEAKCOMMENTS peakcomments
|
||||||
FROM ${dbName}
|
FROM ${dbName}
|
||||||
WHERE IDANALYSIS = #{idAnalysis}
|
WHERE IDANALYSIS = #{idAnalysis}
|
||||||
ORDER BY IDPEAK
|
ORDER BY IDPEAK
|
||||||
|
@ -499,35 +499,51 @@
|
||||||
|
|
||||||
<select id="getNuclLinesIded" resultType="org.jeecg.modules.entity.GardsNuclLinesIdedSpectrum">
|
<select id="getNuclLinesIded" resultType="org.jeecg.modules.entity.GardsNuclLinesIdedSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
NUCLIDENAME,
|
NUCLIDENAME nuclideName,
|
||||||
NUCLIDEFULLNAME,
|
NUCLIDEFULLNAME nuclidefullname,
|
||||||
IDPEAK,
|
IDPEAK idPeak,
|
||||||
ENERGY,
|
ENERGY energy,
|
||||||
UNCENERGY,
|
UNCENERGY uncEnergy,
|
||||||
ABUNDANCE,
|
ABUNDANCE abundance,
|
||||||
UNCABUNDANCE,
|
UNCABUNDANCE uncAbundance,
|
||||||
ACTIVITY,
|
ACTIVITY activity,
|
||||||
UNCACTIVITY,
|
UNCACTIVITY uncActivity,
|
||||||
EFFIC,
|
EFFIC effic,
|
||||||
UNEFFIC ,
|
UNEFFIC unEffic,
|
||||||
MDA,
|
MDA mda,
|
||||||
KEY_FLAG,
|
KEY_FLAG keyFlag,
|
||||||
MDC,
|
MDC mdc,
|
||||||
CONCENTRATION
|
CONCENTRATION concentration
|
||||||
FROM ${dbName}
|
FROM ${dbName}
|
||||||
WHERE IDANALYSIS = #{idAnalysis}
|
WHERE IDANALYSIS = #{idAnalysis}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getNuclIded" resultType="org.jeecg.modules.entity.GardsNuclIdedSpectrum">
|
<select id="getNuclIded" resultType="org.jeecg.modules.entity.GardsNuclIdedSpectrum">
|
||||||
SELECT NUCLIDENAME, HALFLIFE, KEY_ENERGY, KEY_YIELD FROM ${dbName} WHERE IDANALYSIS = #{idAnalysis}
|
SELECT NUCLIDENAME nuclideName,
|
||||||
|
HALFLIFE halflife,
|
||||||
|
KEY_ENERGY keyEnergy,
|
||||||
|
KEY_YIELD keyYield
|
||||||
|
FROM ${dbName}
|
||||||
|
WHERE IDANALYSIS = #{idAnalysis}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getQcCheck" resultType="org.jeecg.modules.entity.GardsQcCheckSpectrum">
|
<select id="getQcCheck" resultType="org.jeecg.modules.entity.GardsQcCheckSpectrum">
|
||||||
SELECT QC_NAME, QC_VALUE, QC_STANDARD, QC_RESULT FROM ${dbName} WHERE IDANALYSIS = #{idAnalysis}
|
SELECT QC_NAME qcName,
|
||||||
|
QC_VALUE qcValue,
|
||||||
|
QC_STANDARD qcStandard,
|
||||||
|
QC_RESULT qcResult
|
||||||
|
FROM ${dbName}
|
||||||
|
WHERE IDANALYSIS = #{idAnalysis}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getMDC" resultType="org.jeecg.modules.entity.vo.CalMDCInfo">
|
<select id="getMDC" resultType="org.jeecg.modules.entity.vo.CalMDCInfo">
|
||||||
SELECT NUCLIDENAME,ENERGY,YIELD,EFFICIENCY,MDC FROM ${dbName} WHERE IDANALYSIS = #{idAnalysis}
|
SELECT NUCLIDENAME nuclideName,
|
||||||
|
ENERGY energy,
|
||||||
|
YIELD yield,
|
||||||
|
EFFICIENCY efficiency,
|
||||||
|
MDC mdc
|
||||||
|
FROM ${dbName}
|
||||||
|
WHERE IDANALYSIS = #{idAnalysis}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getAnalySetting" resultType="org.jeecg.modules.base.entity.rnman.GardsAnalySetting">
|
<select id="getAnalySetting" resultType="org.jeecg.modules.base.entity.rnman.GardsAnalySetting">
|
||||||
|
@ -583,10 +599,10 @@
|
||||||
|
|
||||||
<select id="ReadGammaFitChannelEnergy" resultType="org.jeecg.modules.entity.GardsCalibrationPairsSpectrum">
|
<select id="ReadGammaFitChannelEnergy" resultType="org.jeecg.modules.entity.GardsCalibrationPairsSpectrum">
|
||||||
SELECT DISTINCT
|
SELECT DISTINCT
|
||||||
SMAPLE_DATA.DATA_TYPE,
|
SMAPLE_DATA.DATA_TYPE dataType,
|
||||||
CALIBRATION_PAIRS.IDCALPOINT,
|
CALIBRATION_PAIRS.IDCALPOINT idCalPoint,
|
||||||
CALIBRATION_PAIRS.XVALUE,
|
CALIBRATION_PAIRS.XVALUE xValue,
|
||||||
CALIBRATION_PAIRS.YVALUE
|
CALIBRATION_PAIRS.YVALUE yValue
|
||||||
FROM
|
FROM
|
||||||
RNMAN.GARDS_CALIBRATION_PAIRS CALIBRATION_PAIRS,
|
RNMAN.GARDS_CALIBRATION_PAIRS CALIBRATION_PAIRS,
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA SMAPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA SMAPLE_DATA
|
||||||
|
@ -600,10 +616,10 @@
|
||||||
|
|
||||||
<select id="ReadGammaCalibrationParam" resultType="org.jeecg.modules.entity.GardsCalibrationSpectrum">
|
<select id="ReadGammaCalibrationParam" resultType="org.jeecg.modules.entity.GardsCalibrationSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
SAMPLE_DATA.DATA_TYPE,
|
SAMPLE_DATA.DATA_TYPE dataType,
|
||||||
CALIBRATION.COEFF1,
|
CALIBRATION.COEFF1 coeff1,
|
||||||
CALIBRATION.COEFF2,
|
CALIBRATION.COEFF2 coeff2,
|
||||||
CALIBRATION.COEFF3
|
CALIBRATION.COEFF3 coeff3
|
||||||
FROM
|
FROM
|
||||||
${dbName}.GARDS_CALIBRATION CALIBRATION,
|
${dbName}.GARDS_CALIBRATION CALIBRATION,
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA SAMPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA SAMPLE_DATA
|
||||||
|
@ -615,10 +631,10 @@
|
||||||
|
|
||||||
<select id="ReadBetaFitChannelEnergy" resultType="org.jeecg.modules.entity.GardsCalibrationPairsSpectrum">
|
<select id="ReadBetaFitChannelEnergy" resultType="org.jeecg.modules.entity.GardsCalibrationPairsSpectrum">
|
||||||
SELECT DISTINCT
|
SELECT DISTINCT
|
||||||
SMAPLE_DATA.DATA_TYPE,
|
SMAPLE_DATA.DATA_TYPE dataType,
|
||||||
CALIBRATION_PAIRS.IDCALPOINT,
|
CALIBRATION_PAIRS.IDCALPOINT idCalPoint,
|
||||||
CALIBRATION_PAIRS.XVALUE,
|
CALIBRATION_PAIRS.XVALUE xValue,
|
||||||
CALIBRATION_PAIRS.YVALUE
|
CALIBRATION_PAIRS.YVALUE yValue
|
||||||
FROM
|
FROM
|
||||||
RNMAN.GARDS_CALIBRATION_PAIRS CALIBRATION_PAIRS,
|
RNMAN.GARDS_CALIBRATION_PAIRS CALIBRATION_PAIRS,
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA SMAPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA SMAPLE_DATA
|
||||||
|
@ -632,10 +648,10 @@
|
||||||
|
|
||||||
<select id="ReadBetaCalibrationParam" resultType="org.jeecg.modules.entity.GardsCalibrationSpectrum">
|
<select id="ReadBetaCalibrationParam" resultType="org.jeecg.modules.entity.GardsCalibrationSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
SAMPLE_DATA.DATA_TYPE,
|
SAMPLE_DATA.DATA_TYPE dataType,
|
||||||
CALIBRATION.COEFF1,
|
CALIBRATION.COEFF1 coeff1,
|
||||||
CALIBRATION.COEFF2,
|
CALIBRATION.COEFF2 coeff2,
|
||||||
CALIBRATION.COEFF3
|
CALIBRATION.COEFF3 coeff3
|
||||||
FROM
|
FROM
|
||||||
${dbName}.GARDS_CALIBRATION CALIBRATION,
|
${dbName}.GARDS_CALIBRATION CALIBRATION,
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA SAMPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA SAMPLE_DATA
|
||||||
|
@ -648,12 +664,12 @@
|
||||||
<select id="ReadROIChannels" resultType="org.jeecg.modules.entity.GardsROIChannelsSpectrum">
|
<select id="ReadROIChannels" resultType="org.jeecg.modules.entity.GardsROIChannelsSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
DISTINCT
|
DISTINCT
|
||||||
SAMPLE_DATA.DATA_TYPE,
|
SAMPLE_DATA.DATA_TYPE dataType,
|
||||||
ROI_CHANNELS.ROI,
|
ROI_CHANNELS.ROI roi,
|
||||||
ROI_CHANNELS.B_CHAN_START,
|
ROI_CHANNELS.B_CHAN_START bChanStart,
|
||||||
ROI_CHANNELS.B_CHAN_STOP,
|
ROI_CHANNELS.B_CHAN_STOP bChanStop,
|
||||||
ROI_CHANNELS.G_CHAN_START,
|
ROI_CHANNELS.G_CHAN_START gChanStart,
|
||||||
ROI_CHANNELS.G_CHAN_STOP
|
ROI_CHANNELS.G_CHAN_STOP gChanStop
|
||||||
FROM
|
FROM
|
||||||
${dbName}.GARDS_ROI_CHANNELS ROI_CHANNELS,
|
${dbName}.GARDS_ROI_CHANNELS ROI_CHANNELS,
|
||||||
ORIGINAL.GARDS_SAMPLE_DATA SAMPLE_DATA
|
ORIGINAL.GARDS_SAMPLE_DATA SAMPLE_DATA
|
||||||
|
@ -666,19 +682,19 @@
|
||||||
<select id="ReadROIResults" resultType="org.jeecg.modules.entity.GardsROIResultsSpectrum">
|
<select id="ReadROIResults" resultType="org.jeecg.modules.entity.GardsROIResultsSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
DISTINCT
|
DISTINCT
|
||||||
ROI_RESULTS.ROI,
|
ROI_RESULTS.ROI roi,
|
||||||
ROI_RESULTS.S_GROSS,
|
ROI_RESULTS.S_GROSS sGross,
|
||||||
ROI_RESULTS.G_GROSS,
|
ROI_RESULTS.G_GROSS gGross,
|
||||||
ROI_RESULTS.B_GROSS,
|
ROI_RESULTS.B_GROSS bGross,
|
||||||
ROI_RESULTS.S_NET,
|
ROI_RESULTS.S_NET sNet,
|
||||||
ROI_RESULTS.G_NET,
|
ROI_RESULTS.G_NET gNet,
|
||||||
ROI_RESULTS.NET,
|
ROI_RESULTS.NET net,
|
||||||
ROI_RESULTS.NET_ERR,
|
ROI_RESULTS.NET_ERR netErr,
|
||||||
ROI_RESULTS.CONC,
|
ROI_RESULTS.CONC conc,
|
||||||
ROI_RESULTS.CONC_ERR,
|
ROI_RESULTS.CONC_ERR concErr,
|
||||||
ROI_RESULTS.LC,
|
ROI_RESULTS.LC lc,
|
||||||
ROI_RESULTS.MDC,
|
ROI_RESULTS.MDC mdc,
|
||||||
ROI_RESULTS.NID_FLAG
|
ROI_RESULTS.NID_FLAG nidFlag
|
||||||
FROM
|
FROM
|
||||||
${dbName}.GARDS_ROI_RESULTS ROI_RESULTS
|
${dbName}.GARDS_ROI_RESULTS ROI_RESULTS
|
||||||
WHERE
|
WHERE
|
||||||
|
@ -689,12 +705,12 @@
|
||||||
|
|
||||||
<select id="ReadXeResults" resultType="org.jeecg.modules.entity.GardsXeResultsSpectrum">
|
<select id="ReadXeResults" resultType="org.jeecg.modules.entity.GardsXeResultsSpectrum">
|
||||||
SELECT
|
SELECT
|
||||||
XE_RESULTS.NUCLIDE_NAME,
|
XE_RESULTS.NUCLIDE_NAME nuclideName,
|
||||||
XE_RESULTS.CONC,
|
XE_RESULTS.CONC conc,
|
||||||
XE_RESULTS.CONC_ERR,
|
XE_RESULTS.CONC_ERR concErr,
|
||||||
XE_RESULTS.MDC,
|
XE_RESULTS.MDC mdc,
|
||||||
XE_RESULTS.NID_FLAG,
|
XE_RESULTS.NID_FLAG nidFlag,
|
||||||
XE_RESULTS.LC
|
XE_RESULTS.LC lc
|
||||||
FROM
|
FROM
|
||||||
${dbName}.GARDS_XE_RESULTS XE_RESULTS
|
${dbName}.GARDS_XE_RESULTS XE_RESULTS
|
||||||
WHERE
|
WHERE
|
||||||
|
@ -741,12 +757,12 @@
|
||||||
|
|
||||||
<select id="getNuclideLine" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib">
|
<select id="getNuclideLine" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib">
|
||||||
select
|
select
|
||||||
a.fullname,
|
a.fullname fullName,
|
||||||
a.energy,
|
a.energy energy,
|
||||||
a.energy_uncert,
|
a.energy_uncert energyUncert,
|
||||||
a.yield,
|
a.yield yield,
|
||||||
a.yield_uncert,
|
a.yield_uncert yieldUncert,
|
||||||
a.key_flag
|
a.key_flag keyFlag
|
||||||
from
|
from
|
||||||
CONFIGURATION.GARDS_NUCL_LINES_LIB a
|
CONFIGURATION.GARDS_NUCL_LINES_LIB a
|
||||||
where a.name = #{name}
|
where a.name = #{name}
|
||||||
|
@ -758,32 +774,36 @@
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getNuclideInfo" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLib">
|
<select id="getNuclideInfo" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLib">
|
||||||
select a.num_lines, a.halflife, a.halflife_err from CONFIGURATION.GARDS_NUCL_LIB a where a.name = #{name}
|
select a.num_lines numLines,
|
||||||
|
a.halflife halflife,
|
||||||
|
a.halflife_err halflifeErr
|
||||||
|
from CONFIGURATION.GARDS_NUCL_LIB a
|
||||||
|
where a.name = #{name}
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<select id="getParentAndDaughter" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLib">
|
<select id="getParentAndDaughter" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLib">
|
||||||
select
|
select
|
||||||
a.parents_1,
|
a.parents_1 parents1,
|
||||||
a.parents_2,
|
a.parents_2 parents2,
|
||||||
a.parents_3,
|
a.parents_3 parents3,
|
||||||
a.parents_4,
|
a.parents_4 parents4,
|
||||||
a.parents_5,
|
a.parents_5 parents5,
|
||||||
a.parents_6,
|
a.parents_6 parents6,
|
||||||
a.daughters_1,
|
a.daughters_1 daughters1,
|
||||||
a.branchingratios_1,
|
a.branchingratios_1 branchingratios1,
|
||||||
a.daughtersstable_1,
|
a.daughtersstable_1 daughtersstable1,
|
||||||
a.daughters_2,
|
a.daughters_2 daughters2,
|
||||||
a.branchingratios_2,
|
a.branchingratios_2 branchingratios2,
|
||||||
a.daughtersstable_2,
|
a.daughtersstable_2 daughtersstable2,
|
||||||
a.daughters_3,
|
a.daughters_3 daughters3,
|
||||||
a.branchingratios_3,
|
a.branchingratios_3 branchingratios3,
|
||||||
a.daughtersstable_3,
|
a.daughtersstable_3 daughtersstable3,
|
||||||
a.daughters_4,
|
a.daughters_4 daughters4,
|
||||||
a.branchingratios_4,
|
a.branchingratios_4 branchingratios4,
|
||||||
a.daughtersstable_4,
|
a.daughtersstable_4 daughtersstable4,
|
||||||
a.daughters_5,
|
a.daughters_5 daughters5,
|
||||||
a.branchingratios_5,
|
a.branchingratios_5 branchingratios5,
|
||||||
a.daughtersstable_5
|
a.daughtersstable_5 daughtersstable5
|
||||||
from
|
from
|
||||||
CONFIGURATION.GARDS_NUCL_LIB a
|
CONFIGURATION.GARDS_NUCL_LIB a
|
||||||
where a.name = #{name}
|
where a.name = #{name}
|
||||||
|
@ -808,11 +828,11 @@
|
||||||
|
|
||||||
<select id="getNuclideTable" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib">
|
<select id="getNuclideTable" resultType="org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib">
|
||||||
select
|
select
|
||||||
a.fullname,
|
a.fullname fullName,
|
||||||
a.energy,
|
a.energy energy,
|
||||||
a.energy_uncert,
|
a.energy_uncert energyUncert,
|
||||||
a.yield,
|
a.yield yield,
|
||||||
a.yield_uncert
|
a.yield_uncert yieldUncert
|
||||||
from CONFIGURATION.GARDS_NUCL_LINES_LIB a
|
from CONFIGURATION.GARDS_NUCL_LINES_LIB a
|
||||||
where a.name = #{name}
|
where a.name = #{name}
|
||||||
and a.energy >= 30
|
and a.energy >= 30
|
||||||
|
|
|
@ -4697,15 +4697,15 @@ public class GammaServiceImpl extends AbstractLogOrReport implements IGammaServi
|
||||||
TableResult tableResult = new TableResult();
|
TableResult tableResult = new TableResult();
|
||||||
NuclideActMda nuc = it.getValue();
|
NuclideActMda nuc = it.getValue();
|
||||||
tableResult.setNuclide(it.getKey());
|
tableResult.setNuclide(it.getKey());
|
||||||
tableResult.setActivity(NumUtil.keep4ScienceStr(nuc.getActivity()));
|
tableResult.setActivity(NumberFormatUtil.numberFormat(String.valueOf(nuc.getActivity())));
|
||||||
String act_err = nuc.getActivity() > 0 ? NumUtil.keepStr(nuc.getAct_err() / nuc.getActivity() * 100, 2) : "0";
|
String act_err = nuc.getActivity() > 0 ? NumberFormatUtil.numberFormat(String.valueOf(nuc.getAct_err() / nuc.getActivity() * 100)) : "0";
|
||||||
tableResult.setActErr(act_err);
|
tableResult.setActErr(act_err);
|
||||||
tableResult.setFactor1(coverage_factor);
|
tableResult.setFactor1(NumberFormatUtil.numberFormat(coverage_factor));
|
||||||
tableResult.setConfidence1(level_confidence);
|
tableResult.setConfidence1(NumberFormatUtil.numberFormat(level_confidence));
|
||||||
tableResult.setConc(Objects.isNull(nuc.getConcentration())?null:NumUtil.keep4ScienceStr(nuc.getConcentration() / 1000));
|
tableResult.setConc(Objects.isNull(nuc.getConcentration())?null:NumberFormatUtil.numberFormat(String.valueOf(nuc.getConcentration() / 1000)));
|
||||||
tableResult.setConcErr(act_err);
|
tableResult.setConcErr(act_err);
|
||||||
tableResult.setFactor2(coverage_factor);
|
tableResult.setFactor2(NumberFormatUtil.numberFormat(coverage_factor));
|
||||||
tableResult.setConfidence2(level_confidence);
|
tableResult.setConfidence2(NumberFormatUtil.numberFormat(level_confidence));
|
||||||
tableResultList.add(tableResult);
|
tableResultList.add(tableResult);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user