From e82a59dd3853224cebc28f6de23d5afcfcb82886 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Mon, 4 Sep 2023 17:17:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=B9=B6=E4=BF=AE=E6=94=B9vo?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=BC=95=E5=85=A5=20=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0gamma=E6=A8=A1=E5=9D=97=E4=B8=8BsaveToDB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{base => entity}/vo/AcquisitionBlock.java | 2 +- .../{base => entity}/vo/AnalyseData.java | 2 +- .../{base => entity}/vo/BaseControls.java | 2 +- .../{base => entity}/vo/BgCalibratePara.java | 2 +- .../modules/{base => entity}/vo/Boundary.java | 2 +- .../{base => entity}/vo/CalibrationBlock.java | 2 +- .../{base => entity}/vo/CalibrationParam.java | 2 +- .../{base => entity}/vo/CertificateBlock.java | 2 +- .../{base => entity}/vo/ChartData.java | 2 +- .../{base => entity}/vo/CoeffData.java | 2 +- .../{base => entity}/vo/CollectionBlock.java | 2 +- .../{base => entity}/vo/CommentData.java | 2 +- .../{base => entity}/vo/CommentInfo.java | 2 +- .../{base => entity}/vo/ConfigureData.java | 2 +- .../{base => entity}/vo/EfficiencyData.java | 2 +- .../{base => entity}/vo/EnergyData.java | 2 +- .../{base => entity}/vo/FittingBody.java | 2 +- .../{base => entity}/vo/GEfficiencyBlock.java | 2 +- .../{base => entity}/vo/GEnergyBlock.java | 2 +- .../{base => entity}/vo/GResolutionBlock.java | 2 +- .../{base => entity}/vo/GSpectrumBlock.java | 2 +- .../vo/GStoreMiddleProcessData.java | 4 +- .../GStoreMiddleProcessDataNuclLinesIded.java | 2 +- .../modules/{base => entity}/vo/HalfData.java | 2 +- .../{base => entity}/vo/HeaderBlock.java | 2 +- .../{base => entity}/vo/HistogramData.java | 2 +- .../{base => entity}/vo/Information.java | 4 +- .../{base => entity}/vo/InputData.java | 2 +- .../{base => entity}/vo/MessageInfo.java | 2 +- .../{base => entity}/vo/NuclideActMda.java | 2 +- .../{base => entity}/vo/NuclideLine.java | 2 +- .../{base => entity}/vo/NuclideLines.java | 2 +- .../modules/{base => entity}/vo/PHDFile.java | 2 +- .../{base => entity}/vo/ParameterInfo.java | 2 +- .../modules/{base => entity}/vo/PeakInfo.java | 2 +- .../{base => entity}/vo/ProcessingBlock.java | 2 +- .../modules/{base => entity}/vo/QCResult.java | 2 +- .../{base => entity}/vo/QcCheckItem.java | 2 +- .../{base => entity}/vo/ResolutionData.java | 2 +- .../{base => entity}/vo/RlrDataValues.java | 2 +- .../{base => entity}/vo/SampleBlock.java | 2 +- .../modules/{base => entity}/vo/Sections.java | 2 +- .../{base => entity}/vo/SeriseData.java | 2 +- .../{base => entity}/vo/ShapeData.java | 2 +- .../{base => entity}/vo/SpecSetup.java | 2 +- .../{base => entity}/vo/SpectrumData.java | 2 +- .../vo/SpectrumFileRecord.java | 2 +- .../{base => entity}/vo/SpectrumGroup.java | 2 +- .../{base => entity}/vo/StatisticsData.java | 2 +- .../vo/StatisticsQueryData.java | 2 +- .../modules/{base => entity}/vo/StcGraph.java | 2 +- .../{base => entity}/vo/TableAssociation.java | 2 +- .../{base => entity}/vo/TableDaughter.java | 2 +- .../vo/TableNuclideActivity.java | 2 +- .../{base => entity}/vo/TablePeak.java | 2 +- .../{base => entity}/vo/TablePeakFit.java | 2 +- .../{base => entity}/vo/TableQCResult.java | 2 +- .../{base => entity}/vo/TableResult.java | 2 +- .../{base => entity}/vo/TableWidget.java | 2 +- .../{base => entity}/vo/TotaleffBlock.java | 2 +- .../modules/{base => entity}/vo/XeData.java | 2 +- .../modules/spectrum/Prepare_G_Analysis.java | 4 +- .../modules/spectrum/Sample_G_Analysis.java | 2 +- .../org/jeecg/common/cache/LocalCache.java | 4 +- .../org/jeecg/common/util/GammaFileUtil.java | 3 +- .../org/jeecg/common/util/NameStandUtil.java | 2 +- .../org/jeecg/common/util/PHDFileUtil.java | 1 - .../modules/controller/GammaController.java | 10 +- .../SpectrumAnalysesController.java | 6 +- .../jeecg/modules/entity/vo/ChangeData.java | 2 +- .../modules/entity}/vo/StructInsertInput.java | 2 +- .../entity}/vo/StructInsertOutput.java | 2 +- .../GardsAnalySettingSpectrumMapper.java | 7 + .../mapper/GardsAnalysesManMapper.java | 4 + .../GardsCalibrationPairsSpectrumMapper.java | 7 + .../GardsCalibrationSpectrumMapper.java | 7 + .../mapper/GardsNuclIdedSpectrumMapper.java | 7 + .../GardsNuclLinesIdedSpectrumMapper.java | 7 + .../mapper/GardsPeaksSpectrumMapper.java | 7 + .../mapper/GardsQcCheckSpectrumMapper.java | 7 + .../mapper/SpectrumAnalysisMapper.java | 15 +- .../mapper/xml/GardsAnalysesManMapper.xml | 25 ++ .../mapper/xml/SpectrumAnalysisMapper.xml | 42 ++- .../modules/native_jni/CalValuesHandler.java | 6 +- .../jeecg/modules/service/IGammaService.java | 4 +- .../IGardsAnalySettingSpectrumService.java | 11 + .../IGardsAnalysesSpectrumService.java | 15 ++ ...dsCalibrationPairsOrigSpectrumService.java | 3 + ...IGardsCalibrationPairsSpectrumService.java | 12 + .../IGardsCalibrationSpectrumService.java | 11 + .../IGardsNuclIdedSpectrumService.java | 12 + .../IGardsNuclLinesIdedSpectrumService.java | 11 + .../service/IGardsPeaksSpectrumService.java | 11 + .../service/IGardsQcCheckSpectrumService.java | 12 + .../IGardsSampleAuxSpectrumService.java | 3 + .../IGardsSampleCertLineSpectrumService.java | 3 + .../IGardsSampleCertSpectrumService.java | 3 + .../IGardsSampleDataSpectrumService.java | 3 + ...GardsSampleDescriptionSpectrumService.java | 3 + .../IGardsSpectrumSpectrumService.java | 3 + ...dsTotalEfficiencyPairsSpectrumService.java | 3 + .../service/ISpectrumAnalysisService.java | 2 +- .../service/impl/GammaServiceImpl.java | 243 +++++++++++++----- .../GardsAnalySettingSpectrumServiceImpl.java | 43 ++++ .../GardsAnalysesSpectrumServiceImpl.java | 68 +++++ ...sBgEfficiencyPairsSpectrumServiceImpl.java | 2 + ...librationPairsOrigSpectrumServiceImpl.java | 65 +++++ ...dsCalibrationPairsSpectrumServiceImpl.java | 105 ++++++++ .../GardsCalibrationSpectrumServiceImpl.java | 92 +++++++ .../GardsHistogramSpectrumServiceImpl.java | 2 + .../GardsNuclIdedSpectrumServiceImpl.java | 57 ++++ ...GardsNuclLinesIdedSpectrumServiceImpl.java | 59 +++++ .../impl/GardsPeaksSpectrumServiceImpl.java | 69 +++++ .../impl/GardsQcCheckSpectrumServiceImpl.java | 43 ++++ .../GardsRoiLimitsSpectrumServiceImpl.java | 2 + .../GardsSampleAuxSpectrumServiceImpl.java | 37 +++ ...ardsSampleCertLineSpectrumServiceImpl.java | 28 ++ .../GardsSampleCertSpectrumServiceImpl.java | 23 ++ .../GardsSampleDataSpectrumServiceImpl.java | 52 ++++ ...sSampleDescriptionSpectrumServiceImpl.java | 24 ++ .../GardsSampleRatiosSpectrumServiceImpl.java | 2 + .../GardsSpectrumSpectrumServiceImpl.java | 25 ++ ...talEfficiencyPairsSpectrumServiceImpl.java | 27 ++ .../impl/SpectrumAnalysisServiceImpl.java | 3 +- .../impl/StationOperationServiceImpl.java | 2 +- 125 files changed, 1335 insertions(+), 168 deletions(-) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/AcquisitionBlock.java (94%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/AnalyseData.java (96%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/BaseControls.java (95%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/BgCalibratePara.java (96%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/Boundary.java (85%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CalibrationBlock.java (92%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CalibrationParam.java (96%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CertificateBlock.java (98%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/ChartData.java (93%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CoeffData.java (93%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CollectionBlock.java (95%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CommentData.java (82%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/CommentInfo.java (87%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/ConfigureData.java (96%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/EfficiencyData.java (85%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/EnergyData.java (85%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/FittingBody.java (88%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/GEfficiencyBlock.java (94%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/GEnergyBlock.java (94%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/GResolutionBlock.java (93%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/GSpectrumBlock.java (94%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/GStoreMiddleProcessData.java (99%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/GStoreMiddleProcessDataNuclLinesIded.java (98%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/HalfData.java (81%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/HeaderBlock.java (97%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/HistogramData.java (83%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/Information.java (88%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/InputData.java (86%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/MessageInfo.java (95%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/NuclideActMda.java (97%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/NuclideLine.java (89%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/NuclideLines.java (95%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/PHDFile.java (99%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/ParameterInfo.java (89%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/PeakInfo.java (97%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/ProcessingBlock.java (95%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/QCResult.java (95%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/QcCheckItem.java (88%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/ResolutionData.java (85%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/RlrDataValues.java (96%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/SampleBlock.java (88%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/Sections.java (97%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/SeriseData.java (80%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/ShapeData.java (90%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/SpecSetup.java (97%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/SpectrumData.java (97%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/SpectrumFileRecord.java (94%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/SpectrumGroup.java (93%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/StatisticsData.java (89%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/StatisticsQueryData.java (96%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/StcGraph.java (88%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TableAssociation.java (82%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TableDaughter.java (85%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TableNuclideActivity.java (91%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TablePeak.java (91%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TablePeakFit.java (90%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TableQCResult.java (85%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TableResult.java (91%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TableWidget.java (87%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/TotaleffBlock.java (94%) rename jeecg-boot-base-core/src/main/java/org/jeecg/modules/{base => entity}/vo/XeData.java (86%) rename {jeecg-boot-base-core/src/main/java/org/jeecg/modules/base => jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity}/vo/StructInsertInput.java (96%) rename {jeecg-boot-base-core/src/main/java/org/jeecg/modules/base => jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity}/vo/StructInsertOutput.java (95%) create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalySettingSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclIdedSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsPeaksSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsQcCheckSpectrumMapper.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalySettingSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalysesSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclIdedSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclLinesIdedSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsPeaksSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsQcCheckSpectrumService.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalySettingSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclLinesIdedSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsPeaksSpectrumServiceImpl.java create mode 100644 jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsQcCheckSpectrumServiceImpl.java diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/AcquisitionBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AcquisitionBlock.java similarity index 94% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/AcquisitionBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AcquisitionBlock.java index dfb21156..ad551e00 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/AcquisitionBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AcquisitionBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/AnalyseData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AnalyseData.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/AnalyseData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AnalyseData.java index 13f94a28..ce82e75e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/AnalyseData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/AnalyseData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BaseControls.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BaseControls.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BaseControls.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BaseControls.java index c52ffeaa..f78b3977 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BaseControls.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BaseControls.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BgCalibratePara.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BgCalibratePara.java index fe64e70d..b2b845e0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/BgCalibratePara.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/BgCalibratePara.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import java.io.Serializable; import java.util.LinkedList; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Boundary.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Boundary.java similarity index 85% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Boundary.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Boundary.java index 277ab69a..4a9b912d 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Boundary.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Boundary.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CalibrationBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationBlock.java similarity index 92% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CalibrationBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationBlock.java index 0bae631f..56ac7b0f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CalibrationBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CalibrationParam.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationParam.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CalibrationParam.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationParam.java index d0ce6fa0..f314b1f6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CalibrationParam.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CalibrationParam.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CertificateBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CertificateBlock.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CertificateBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CertificateBlock.java index 578b060f..a190aaf2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CertificateBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CertificateBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ChartData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ChartData.java similarity index 93% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ChartData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ChartData.java index 34eef02c..c9797f1f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ChartData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ChartData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CoeffData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CoeffData.java similarity index 93% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CoeffData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CoeffData.java index d38cb76e..b7adab90 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CoeffData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CoeffData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CollectionBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CollectionBlock.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CollectionBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CollectionBlock.java index e4857d7d..5f0fa00f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CollectionBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CollectionBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CommentData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentData.java similarity index 82% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CommentData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentData.java index 1f4229e5..e31c1bd9 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CommentData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CommentInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentInfo.java similarity index 87% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CommentInfo.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentInfo.java index 4e44a5ab..c0405baa 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/CommentInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/CommentInfo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ConfigureData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ConfigureData.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ConfigureData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ConfigureData.java index 945656a1..57795f4f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ConfigureData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ConfigureData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/EfficiencyData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EfficiencyData.java similarity index 85% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/EfficiencyData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EfficiencyData.java index 998f3b82..830ada1b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/EfficiencyData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EfficiencyData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/EnergyData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EnergyData.java similarity index 85% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/EnergyData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EnergyData.java index e19a3bab..cee85781 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/EnergyData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/EnergyData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/FittingBody.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java similarity index 88% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/FittingBody.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java index 31698030..58d2fb24 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/FittingBody.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/FittingBody.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GEfficiencyBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEfficiencyBlock.java similarity index 94% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GEfficiencyBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEfficiencyBlock.java index 96b7f370..002936c2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GEfficiencyBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEfficiencyBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GEnergyBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEnergyBlock.java similarity index 94% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GEnergyBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEnergyBlock.java index 6234fc8c..b1c30949 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GEnergyBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GEnergyBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GResolutionBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GResolutionBlock.java similarity index 93% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GResolutionBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GResolutionBlock.java index e7292c01..90363fce 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GResolutionBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GResolutionBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GSpectrumBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GSpectrumBlock.java similarity index 94% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GSpectrumBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GSpectrumBlock.java index ad35db0e..17bb2403 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GSpectrumBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GSpectrumBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GStoreMiddleProcessData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessData.java similarity index 99% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GStoreMiddleProcessData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessData.java index 5bd685b4..62f74254 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GStoreMiddleProcessData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; @@ -182,7 +182,7 @@ public class GStoreMiddleProcessData implements Serializable { public List peaks_Nuclide_name; //文件名称 public List peaks_comments; // gards_ nucl_lines_ided数据表 - public Map nucl_lines_ided_data; + public Map nucl_lines_ided_data; //gards_ nucl_ided数据表 public List nucl_ided_Nuclidename; // 核素名称 public List nucl_ided_Type; //核素类型 未知 diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GStoreMiddleProcessDataNuclLinesIded.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessDataNuclLinesIded.java similarity index 98% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GStoreMiddleProcessDataNuclLinesIded.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessDataNuclLinesIded.java index 9876238f..114f1931 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/GStoreMiddleProcessDataNuclLinesIded.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/GStoreMiddleProcessDataNuclLinesIded.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HalfData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HalfData.java similarity index 81% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HalfData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HalfData.java index 34ade394..205fc1a0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HalfData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HalfData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HeaderBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HeaderBlock.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HeaderBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HeaderBlock.java index a221b996..881e09de 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HeaderBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HeaderBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HistogramData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HistogramData.java similarity index 83% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HistogramData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HistogramData.java index 78afd4d7..f3a725b1 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/HistogramData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/HistogramData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; 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/entity/vo/Information.java similarity index 88% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Information.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Information.java index 8aeef031..ada9c6d9 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/entity/vo/Information.java @@ -1,8 +1,6 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; -import com.baomidou.mybatisplus.core.toolkit.StringPool; import lombok.Data; -import org.jeecg.common.util.DateUtils; import java.io.Serializable; import java.util.Date; 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/entity/vo/InputData.java similarity index 86% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/InputData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/InputData.java index 65d7cbbd..3e60dbd0 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/entity/vo/InputData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/MessageInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/MessageInfo.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/MessageInfo.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/MessageInfo.java index 2e6a2f86..c72bfebf 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/MessageInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/MessageInfo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideActMda.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideActMda.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideActMda.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideActMda.java index 39d765d1..78ddf098 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideActMda.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideActMda.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; 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/entity/vo/NuclideLine.java similarity index 89% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLine.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLine.java index ac5c6b39..6bf6fa68 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/entity/vo/NuclideLine.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLines.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLines.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLines.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLines.java index aebbd97f..b5917aa8 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/NuclideLines.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/NuclideLines.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/PHDFile.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PHDFile.java similarity index 99% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/PHDFile.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PHDFile.java index 5144106e..29b4fd5f 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/PHDFile.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PHDFile.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ParameterInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ParameterInfo.java similarity index 89% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ParameterInfo.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ParameterInfo.java index 3553d00e..d0f1dbbf 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ParameterInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ParameterInfo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/PeakInfo.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/PeakInfo.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java index 5c2306fa..78758e4e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/PeakInfo.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/PeakInfo.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import java.io.Serializable; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ProcessingBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ProcessingBlock.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ProcessingBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ProcessingBlock.java index cd9e9bee..965a8977 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ProcessingBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ProcessingBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/QCResult.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCResult.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/QCResult.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCResult.java index 64b50546..459b4a3e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/QCResult.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QCResult.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/QcCheckItem.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QcCheckItem.java similarity index 88% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/QcCheckItem.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QcCheckItem.java index e8318690..dd6a2693 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/QcCheckItem.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/QcCheckItem.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ResolutionData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ResolutionData.java similarity index 85% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ResolutionData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ResolutionData.java index 907b961c..9c3a5ee0 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ResolutionData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ResolutionData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/RlrDataValues.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/RlrDataValues.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/RlrDataValues.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/RlrDataValues.java index a5df36d9..bb2b746e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/RlrDataValues.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/RlrDataValues.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SampleBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SampleBlock.java similarity index 88% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SampleBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SampleBlock.java index 2d111db3..b4aaf36c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SampleBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SampleBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Sections.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Sections.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Sections.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Sections.java index 5befc44e..cf5ed71b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/Sections.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/Sections.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SeriseData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java similarity index 80% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SeriseData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java index dc2c5dea..33919c5b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SeriseData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SeriseData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ShapeData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ShapeData.java similarity index 90% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ShapeData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ShapeData.java index 459ed96b..2e60c96b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/ShapeData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/ShapeData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; 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/entity/vo/SpecSetup.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpecSetup.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpecSetup.java index 8bebdddb..3a86e209 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/entity/vo/SpecSetup.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java similarity index 97% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java index 27322585..8e416380 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumFileRecord.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumFileRecord.java similarity index 94% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumFileRecord.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumFileRecord.java index 7a1e3ac4..9fa58cc6 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumFileRecord.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumFileRecord.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumGroup.java similarity index 93% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumGroup.java index 5f211756..fbcd0dc2 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/SpectrumGroup.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/SpectrumGroup.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import java.io.Serializable; import java.util.LinkedList; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StatisticsData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java similarity index 89% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StatisticsData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java index af7b5b29..f6107aab 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StatisticsData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StatisticsQueryData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StatisticsQueryData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java index fdd4ecfe..46f287f7 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StatisticsQueryData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StatisticsQueryData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StcGraph.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java similarity index 88% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StcGraph.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java index 72bc4047..7d6a2926 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StcGraph.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/StcGraph.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableAssociation.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableAssociation.java similarity index 82% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableAssociation.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableAssociation.java index 0c6bfdd5..7b46a3ef 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableAssociation.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableAssociation.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableDaughter.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableDaughter.java similarity index 85% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableDaughter.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableDaughter.java index 9f8d99de..32b3000b 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableDaughter.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableDaughter.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableNuclideActivity.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableNuclideActivity.java similarity index 91% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableNuclideActivity.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableNuclideActivity.java index 5fda41e0..318d827e 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableNuclideActivity.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableNuclideActivity.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; 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/entity/vo/TablePeak.java similarity index 91% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeak.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TablePeak.java index 76138e49..50523d23 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/entity/vo/TablePeak.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeakFit.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TablePeakFit.java similarity index 90% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeakFit.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TablePeakFit.java index e8af9387..0198391c 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TablePeakFit.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TablePeakFit.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableQCResult.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableQCResult.java similarity index 85% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableQCResult.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableQCResult.java index 607f95d7..c67d472a 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableQCResult.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableQCResult.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableResult.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableResult.java similarity index 91% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableResult.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableResult.java index b742e217..74528fd3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableResult.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableResult.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; 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/entity/vo/TableWidget.java similarity index 87% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TableWidget.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TableWidget.java index e8c33347..12ff4756 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/entity/vo/TableWidget.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TotaleffBlock.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TotaleffBlock.java similarity index 94% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TotaleffBlock.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TotaleffBlock.java index e27b2b3a..3fe6fed3 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/TotaleffBlock.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/TotaleffBlock.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; 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/entity/vo/XeData.java similarity index 86% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/XeData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/entity/vo/XeData.java index a3121988..76a4d76f 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/entity/vo/XeData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import lombok.Data; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java index 360b10fd..cd4b188f 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Prepare_G_Analysis.java @@ -2,8 +2,8 @@ package org.jeecg.modules.spectrum; import cn.hutool.core.util.StrUtil; import org.jeecg.common.constant.Setting; -import org.jeecg.modules.base.vo.PHDFile; -import org.jeecg.modules.base.vo.SpecSetup; +import org.jeecg.modules.entity.vo.PHDFile; +import org.jeecg.modules.entity.vo.SpecSetup; import org.jeecg.modules.service.IGardsGammaDefaultParamsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java index 590cfbfe..06987f61 100644 --- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java +++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/Sample_G_Analysis.java @@ -4,7 +4,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import org.jeecg.common.util.SpringContextUtils; -import org.jeecg.modules.base.vo.PHDFile; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; @Data diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/cache/LocalCache.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/cache/LocalCache.java index 2f01843f..9c23f8e3 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/cache/LocalCache.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/cache/LocalCache.java @@ -2,14 +2,14 @@ package org.jeecg.common.cache; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; -import org.jeecg.modules.base.vo.PHDFile; +import org.jeecg.modules.entity.vo.PHDFile; import org.springframework.stereotype.Component; import java.util.concurrent.TimeUnit; @Component public class LocalCache { - private Cache phdCache = CacheBuilder.newBuilder() + private Cache phdCache = CacheBuilder.newBuilder() //设置缓存初始大小，应该合理设置，后续会扩容 .initialCapacity(10) //最大值 diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java index 3d273cf1..43d64f28 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/GammaFileUtil.java @@ -15,9 +15,8 @@ import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; import org.jeecg.modules.base.enums.CalName; import org.jeecg.modules.base.enums.CalType; import org.jeecg.modules.base.enums.MiddleDataType; -import org.jeecg.modules.base.vo.*; import org.jeecg.modules.entity.*; -import org.jeecg.modules.entity.vo.TablePeaks; +import org.jeecg.modules.entity.vo.*; import org.jeecg.modules.mapper.SpectrumAnalysisMapper; import org.jeecg.modules.native_jni.CalValuesHandler; import org.jeecg.modules.native_jni.EnergySpectrumHandler; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java index 51b7b92f..ea4287ef 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/NameStandUtil.java @@ -3,7 +3,7 @@ package org.jeecg.common.util; import com.baomidou.mybatisplus.core.toolkit.StringPool; import org.jeecg.modules.base.enums.DataType; import org.jeecg.modules.base.enums.SystemType; -import org.jeecg.modules.base.vo.PHDFile; +import org.jeecg.modules.entity.vo.PHDFile; import org.springframework.stereotype.Component; import java.text.ParseException; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java index 78057328..f8265a1d 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/common/util/PHDFileUtil.java @@ -8,7 +8,6 @@ import org.apache.commons.net.ftp.FTP; import org.apache.commons.net.ftp.FTPClient; import org.apache.commons.net.ftp.FTPFile; import org.jeecg.common.properties.SpectrumPathProperties; -import org.jeecg.modules.base.vo.*; import org.jeecg.modules.entity.GardsXeResultsSpectrum; import org.jeecg.modules.entity.vo.*; import org.jeecg.modules.native_jni.EnergySpectrumHandler; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java index b8f76478..c25ed7d3 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/GammaController.java @@ -1,8 +1,10 @@ package org.jeecg.modules.controller; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.vo.*; import org.jeecg.modules.entity.vo.ChangeData; +import org.jeecg.modules.entity.vo.CoeffData; +import org.jeecg.modules.entity.vo.ConfigureData; +import org.jeecg.modules.entity.vo.InputData; import org.jeecg.modules.service.IGammaService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -59,7 +61,7 @@ public class GammaController { } @GetMapping("nuclideReview") - public Result nuclideReview(Integer sampleId, String fileName, Integer channel, HttpServletRequest request){ + public Result nuclideReview(Integer sampleId, String fileName, Double channel, HttpServletRequest request){ return gammaService.nuclideReview(sampleId, fileName, channel, request); } @@ -208,8 +210,8 @@ public class GammaController { } @GetMapping("saveToDB") - public Result saveToDB(){ - return null; + public Result saveToDB(String fileName, String userName){ + return gammaService.saveToDB(fileName, userName); } } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java index d62cac46..071d4b48 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/controller/SpectrumAnalysesController.java @@ -4,11 +4,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.vo.AnalyseData; -import org.jeecg.modules.base.vo.FittingBody; -import org.jeecg.modules.base.vo.StatisticsQueryData; import org.jeecg.modules.entity.GardsSampleDataSpectrum; +import org.jeecg.modules.entity.vo.AnalyseData; import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn; +import org.jeecg.modules.entity.vo.FittingBody; +import org.jeecg.modules.entity.vo.StatisticsQueryData; import org.jeecg.modules.service.ISpectrumAnalysisService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ChangeData.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ChangeData.java index 1fe6f253..bf636d05 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ChangeData.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/ChangeData.java @@ -1,7 +1,7 @@ package org.jeecg.modules.entity.vo; import lombok.Data; -import org.jeecg.modules.base.vo.ParameterInfo; +import org.jeecg.modules.entity.vo.ParameterInfo; import java.io.Serializable; import java.util.List; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StructInsertInput.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java similarity index 96% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StructInsertInput.java rename to jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java index 6f823d8a..f747ff79 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StructInsertInput.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertInput.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import java.io.Serializable; diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StructInsertOutput.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java similarity index 95% rename from jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StructInsertOutput.java rename to jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java index fc4b7a43..307523bf 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/vo/StructInsertOutput.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/entity/vo/StructInsertOutput.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.base.vo; +package org.jeecg.modules.entity.vo; import java.io.Serializable; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalySettingSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalySettingSpectrumMapper.java new file mode 100644 index 00000000..009dbd4c --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalySettingSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; + +public interface GardsAnalySettingSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java index 0beb8014..d8d6de03 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsAnalysesManMapper.java @@ -2,6 +2,10 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.jeecg.modules.base.entity.rnman.GardsAnalyses; +import org.jeecg.modules.entity.GardsAnalysesSpectrum; public interface GardsAnalysesManMapper extends BaseMapper { + + void updateEntity(GardsAnalysesSpectrum analyses); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsSpectrumMapper.java new file mode 100644 index 00000000..4c622f1f --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationPairsSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsCalibrationPairs; + +public interface GardsCalibrationPairsSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java new file mode 100644 index 00000000..3fbdc68b --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsCalibrationSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsCalibration; + +public interface GardsCalibrationSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclIdedSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclIdedSpectrumMapper.java new file mode 100644 index 00000000..a18cbf72 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclIdedSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsNuclIded; + +public interface GardsNuclIdedSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedSpectrumMapper.java new file mode 100644 index 00000000..d91900c9 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsNuclLinesIdedSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded; + +public interface GardsNuclLinesIdedSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsPeaksSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsPeaksSpectrumMapper.java new file mode 100644 index 00000000..cb61deda --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsPeaksSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsPeaks; + +public interface GardsPeaksSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsQcCheckSpectrumMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsQcCheckSpectrumMapper.java new file mode 100644 index 00000000..d71a88c4 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/GardsQcCheckSpectrumMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.rnman.GardsQcCheck; + +public interface GardsQcCheckSpectrumMapper extends BaseMapper { +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java index 3d6e96dc..b2d27224 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/SpectrumAnalysisMapper.java @@ -7,8 +7,9 @@ import org.apache.ibatis.annotations.Param; import org.jeecg.modules.base.entity.configuration.GardsNuclLib; import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib; import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; -import org.jeecg.modules.base.vo.*; import org.jeecg.modules.entity.*; +import org.jeecg.modules.entity.vo.*; + import java.util.List; @Mapper @@ -138,4 +139,16 @@ public interface SpectrumAnalysisMapper { void insertXeResult(List xeResults); + String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId, @Param(value = "userName") String userName); + + void deletePeaks(Integer idAnalysis); + + void deleteNuclLines(Integer idAnalysis); + + void deleteNucl(Integer idAnalysis); + + void deleteQCCheck(Integer idAnalysis); + + void deleteAnalySetting(Integer idAnalysis); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml new file mode 100644 index 00000000..836abe6a --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/GardsAnalysesManMapper.xml @@ -0,0 +1,25 @@ + + + + + + UPDATE + RNMAN.GARDS_ANALYSES + SET ANALYSISBEGIN = to_date(#{analyses.analysisBeginStr},'yyyy/MM/dd HH:mm:ss'), + ANALYSISEND = to_date(#{analyses.analysisEndStr},'yyyy/MM/dd HH:mm:ss'), + SOFTWARE = #{analyses.software}, + SWVERSION = #{analyses.swVersion}, + COMMENTS = #{analyses.comments}, + SEARCHSTARTCHANNEL = #{analyses.searchStartChannel}, + SEARCHENDCHANNEL = #{analyses.searchEndChannel}, + SEARCHTHRESHOLD = #{analyses.searchThreshold}, + NUMBEROFPEAKS = #{analyses.numberOfPeaks}, + TOTALCOUNTS = #{analyses.totalCounts}, + BASELINE_PATH = #{analyses.baselinePath}, + LC_PATH = #{analyses.lcPath}, + SCAC_PATH = #{analyses.scacPath} + WHERE + IDANALYSIS = #{analyses.idAnalysis} + + + \ No newline at end of file diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml index b141b438..9768fb49 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/mapper/xml/SpectrumAnalysisMapper.xml @@ -109,7 +109,7 @@ SELECT SAMPLE_ID,NUCLIDE_NAME,CONC,CONC_ERR,MDC,LC FROM RNAUTO.GARDS_XE_RESULTS where SAMPLE_ID = #{sampleId} - SELECT org_sample.SAMPLE_ID sampleId, org_sample.INPUT_FILE_NAME sampleFilePath, @@ -140,7 +140,7 @@ - SELECT A.ANALYST, A.COMMENTS FROM RNMAN.GARDS_ANALYSES A WHERE A.SAMPLE_ID= #{sampleId} @@ -222,7 +222,7 @@ SELECT DETECTOR_CODE FROM CONFIGURATION.GARDS_DETECTORS WHERE STATION_ID = #{stationId} - SELECT GXR.NUCLIDE_NAME, GSD.COLLECT_START @@ -270,7 +270,7 @@ order by GXR.NUCLIDE_NAME, GSD.COLLECT_START - select gsd.COLLECT_START dateTime, round(to_number(GSD.COLLECT_STOP-GSD.COLLECT_START)*24,2) dataValue @@ -292,7 +292,7 @@ order by gsd.COLLECT_START - select gsd.ACQUISITION_START dateTime, round(to_number(GSD.ACQUISITION_STOP-GSD.ACQUISITION_START)*24,2) dataValue @@ -315,7 +315,7 @@ order by gsd.ACQUISITION_START - select GSD.COLLECT_START dateTime, GSA.XE_VOLUME dataValue @@ -339,7 +339,7 @@ order by gsd.COLLECT_START - select GSD.COLLECT_START dateTime, GSD.QUANTITY dataValue @@ -471,11 +471,11 @@ WHERE idanalysis = #{idAnalysis} - SELECT FULLNAME,ENERGY,ENERGY_UNCERT,YIELD,YIELD_UNCERT,KEY_FLAG from CONFIGURATION.GARDS_NUCL_LINES_LIB WHERE NAME = #{name} ORDER BY ENERGY - SELECT NAME, HALFLIFE @@ -899,4 +899,28 @@ + + + + DELETE FROM RNMAN.GARDS_PEAKS WHERE IDANALYSIS= #{idAnalysis} + + + + DELETE FROM RNMAN.GARDS_NUCL_LINES_IDED WHERE IDANALYSIS= #{idAnalysis} + + + + DELETE FROM RNMAN.GARDS_NUCL_IDED WHERE IDANALYSIS= #{idAnalysis} + + + + DELETE FROM RNMAN.GARDS_QC_CHECK WHERE IDANALYSIS= #{idAnalysis} + + + + DELETE FROM RNMAN.GARDS_ANALY_SETTING WHERE IDANALYSIS= #{idAnalysis} + + \ No newline at end of file diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java index e2b1244b..de41b46f 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/native_jni/CalValuesHandler.java @@ -1,8 +1,8 @@ package org.jeecg.modules.native_jni; -import org.jeecg.modules.base.vo.PeakInfo; -import org.jeecg.modules.base.vo.StructInsertInput; -import org.jeecg.modules.base.vo.StructInsertOutput; +import org.jeecg.modules.entity.vo.PeakInfo; +import org.jeecg.modules.entity.vo.StructInsertInput; +import org.jeecg.modules.entity.vo.StructInsertOutput; import org.jeecg.modules.native_jni.struct.CalValuesOut; import java.util.List; diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java index 95f642e1..d3886c7f 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGammaService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.vo.*; +import org.jeecg.modules.entity.vo.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -24,7 +24,7 @@ public interface IGammaService{ Result getSelPosNuclide(Integer sampleId, String fileName, int channel, String nuclides, HttpServletRequest request); - Result nuclideReview(Integer sampleId, String fileName, Integer channel, HttpServletRequest request); + Result nuclideReview(Integer sampleId, String fileName, Double channel, HttpServletRequest request); Result changeNuclide(Integer sampleId, String fileName, String nuclideName); diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalySettingSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalySettingSpectrumService.java new file mode 100644 index 00000000..4a2c1212 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalySettingSpectrumService.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; +import org.jeecg.modules.entity.vo.PHDFile; + +public interface IGardsAnalySettingSpectrumService extends IService { + + boolean saveAnalySettingGamma(PHDFile phd, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalysesSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalysesSpectrumService.java new file mode 100644 index 00000000..ffa06123 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsAnalysesSpectrumService.java @@ -0,0 +1,15 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsAnalyses; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; +import org.jeecg.modules.entity.vo.PHDFile; +import org.jeecg.modules.entity.GardsAnalysesSpectrum; + +public interface IGardsAnalysesSpectrumService extends IService { + + Integer insertEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments); + + void updateEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsOrigSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsOrigSpectrumService.java index 5f4ccc36..062aff59 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsOrigSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsOrigSpectrumService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import java.util.List; @@ -10,4 +11,6 @@ public interface IGardsCalibrationPairsOrigSpectrumService extends IService readLines); + boolean saveCalibrationPairsOrigGamma(PHDFile phd, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsSpectrumService.java new file mode 100644 index 00000000..288ff94f --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationPairsSpectrumService.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsCalibrationPairs; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; +import org.jeecg.modules.entity.vo.PHDFile; + +public interface IGardsCalibrationPairsSpectrumService extends IService { + + boolean saveGardsCalibrationPairsGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java new file mode 100644 index 00000000..0167cc8f --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsCalibrationSpectrumService.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsCalibration; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; + +public interface IGardsCalibrationSpectrumService extends IService { + + boolean saveCalibrationGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclIdedSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclIdedSpectrumService.java new file mode 100644 index 00000000..be379230 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclIdedSpectrumService.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsNuclIded; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; + +public interface IGardsNuclIdedSpectrumService extends IService { + + boolean saveNuclIdedGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclLinesIdedSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclLinesIdedSpectrumService.java new file mode 100644 index 00000000..d932c5b9 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsNuclLinesIdedSpectrumService.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsNuclLinesIded; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; + +public interface IGardsNuclLinesIdedSpectrumService extends IService { + + boolean saveNuclLinesIdedGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsPeaksSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsPeaksSpectrumService.java new file mode 100644 index 00000000..340297b8 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsPeaksSpectrumService.java @@ -0,0 +1,11 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsPeaks; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; + +public interface IGardsPeaksSpectrumService extends IService { + + boolean savePeaksGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsQcCheckSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsQcCheckSpectrumService.java new file mode 100644 index 00000000..133539d9 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsQcCheckSpectrumService.java @@ -0,0 +1,12 @@ +package org.jeecg.modules.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.jeecg.modules.base.entity.rnman.GardsQcCheck; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; +import org.jeecg.modules.entity.vo.PHDFile; + +public interface IGardsQcCheckSpectrumService extends IService { + + boolean saveQcCheckGamma(GStoreMiddleProcessData middleData, PHDFile phd, String idAnalysis); + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleAuxSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleAuxSpectrumService.java index d6d8d91d..70736435 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleAuxSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleAuxSpectrumService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsSampleAux; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import java.util.List; @@ -10,4 +11,6 @@ public interface IGardsSampleAuxSpectrumService extends IService Integer saveSampleAux(EnergySpectrumStruct sourceData, Integer sampleId, List readLines); + boolean saveSampleAuxGamma(PHDFile phd, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertLineSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertLineSpectrumService.java index 7228f5d0..dc95a908 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertLineSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertLineSpectrumService.java @@ -2,10 +2,13 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsSampleCertLine; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; public interface IGardsSampleCertLineSpectrumService extends IService { Integer saveSampleCertLine(EnergySpectrumStruct sourceData, Integer sampleId); + boolean saveSampleCertLineGamma(PHDFile phd, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertSpectrumService.java index df373364..3c4b4c93 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleCertSpectrumService.java @@ -2,10 +2,13 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsSampleCert; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; public interface IGardsSampleCertSpectrumService extends IService { Integer saveSampleCert(EnergySpectrumStruct sourceData, Integer sampleId); + boolean saveSampleCertGamma(PHDFile phd, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDataSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDataSpectrumService.java index 273a232e..08f88bd8 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDataSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDataSpectrumService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsSampleData; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import java.util.List; @@ -10,4 +11,6 @@ public interface IGardsSampleDataSpectrumService extends IService readLines); + boolean saveSampleDataGamma(PHDFile phd, String input_file_name, Integer station_id, Integer detect_id); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDescriptionSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDescriptionSpectrumService.java index ddb188bd..76acf103 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDescriptionSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSampleDescriptionSpectrumService.java @@ -2,10 +2,13 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsSampleDescription; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; public interface IGardsSampleDescriptionSpectrumService extends IService { Integer saveSampleDescription(EnergySpectrumStruct sourceData, Integer sampleId); + boolean saveSampleDescriptionGamma(PHDFile phd, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSpectrumSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSpectrumSpectrumService.java index b3a50db0..8dbb73b5 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSpectrumSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsSpectrumSpectrumService.java @@ -2,6 +2,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsSpectrum; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import java.util.List; @@ -10,4 +11,6 @@ public interface IGardsSpectrumSpectrumService extends IService { Integer saveSpectrum(EnergySpectrumStruct sourceData, Integer sampleId, List readLines, String filePathName); + boolean saveSpectrumGamma(PHDFile phd, Integer sampleId, String input_file_name); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsTotalEfficiencyPairsSpectrumService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsTotalEfficiencyPairsSpectrumService.java index 6dc29913..2ba2fd2a 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsTotalEfficiencyPairsSpectrumService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/IGardsTotalEfficiencyPairsSpectrumService.java @@ -2,10 +2,13 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.modules.base.entity.original.GardsTotalEfficiencyPairs; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; public interface IGardsTotalEfficiencyPairsSpectrumService extends IService { Integer saveTotalEfficiencyPairs(EnergySpectrumStruct sourceData, Integer sampleId); + boolean saveTotalEfficiencyPairsGamma(PHDFile phd, Integer sampleId); + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java index 4ee22fe7..6ccc60bb 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/ISpectrumAnalysisService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.GardsSampleDataSpectrum; -import org.jeecg.modules.base.vo.*; +import org.jeecg.modules.entity.vo.*; import org.jeecg.modules.entity.vo.BgDataAnlyseResultIn; import javax.servlet.http.HttpServletRequest; 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 e12d59c7..446f624d 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 @@ -15,12 +15,11 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.*; import org.jeecg.modules.base.entity.configuration.GardsNuclLinesLib; import org.jeecg.modules.base.enums.RoleType; -import org.jeecg.modules.base.vo.*; -import org.jeecg.modules.entity.vo.TablePeaks; +import org.jeecg.modules.entity.vo.*; +import org.jeecg.modules.entity.*; import org.jeecg.modules.mapper.SpectrumAnalysisMapper; import org.jeecg.modules.native_jni.CalValuesHandler; -import org.jeecg.modules.service.IGammaService; -import org.jeecg.modules.service.ISysDefaultNuclideSpectrumService; +import org.jeecg.modules.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -40,8 +39,6 @@ import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; -import static io.netty.util.ResourceLeakDetector.setEnabled; - @Service(value = "gammaService") @DS("ora") public class GammaServiceImpl implements IGammaService { @@ -64,6 +61,38 @@ public class GammaServiceImpl implements IGammaService { private FTPUtil ftpUtil; @Value("${ZeroTime}") private String ZeroTimeStr; + @Autowired + private IGardsAnalysesSpectrumService analysesSpectrumService; + @Autowired + private IGardsSampleDataSpectrumService sampleDataSpectrumService; + @Autowired + private IGardsSampleAuxSpectrumService sampleAuxSpectrumService; + @Autowired + private IGardsSampleDescriptionSpectrumService sampleDescriptionSpectrumService; + @Autowired + private IGardsSampleCertSpectrumService sampleCertSpectrumService; + @Autowired + private IGardsSampleCertLineSpectrumService sampleCertLineSpectrumService; + @Autowired + private IGardsCalibrationPairsOrigSpectrumService calibrationPairsOrigSpectrumService; + @Autowired + private IGardsTotalEfficiencyPairsSpectrumService totalEfficiencyPairsSpectrumService; + @Autowired + private IGardsSpectrumSpectrumService spectrumService; + @Autowired + private IGardsCalibrationPairsSpectrumService calibrationPairsSpectrumService; + @Autowired + private IGardsCalibrationSpectrumService calibrationSpectrumService; + @Autowired + private IGardsPeaksSpectrumService peaksSpectrumService; + @Autowired + private IGardsNuclLinesIdedSpectrumService nuclLinesIdedSpectrumService; + @Autowired + private IGardsNuclIdedSpectrumService nuclIdedSpectrumService; + @Autowired + private IGardsQcCheckSpectrumService qcCheckSpectrumService; + @Autowired + private IGardsAnalySettingSpectrumService analySettingSpectrumService; @Override public Result gammaByDB(String dbName, Integer sampleId) { @@ -261,7 +290,8 @@ public class GammaServiceImpl implements IGammaService { //Bar Chart 柱状图 List differance = gammaFileUtil.Differance(phd, vPeak, m_vCount, m_nCount); map.put("barChart", differance); - + //赋值energy + map.put("energy", phd.getVEnergy()); result.setSuccess(true); result.setResult(map); return result; @@ -385,7 +415,7 @@ public class GammaServiceImpl implements IGammaService { } List tablePeaksList = gammaFileUtil.FitPeakBaseLine(phd, vIdx); - if(CollectionUtils.isNotEmpty(tablePeaksList)) { +// if(CollectionUtils.isNotEmpty(tablePeaksList)) { // gammaFileUtil.PeaksChanged(phd); // List list = gammaFileUtil.vAddPeaks(m_data->m_phd->vPeak.begin()+vIdx.first(), m_data->m_phd->vPeak.begin()+vIdx.last()+1); @@ -413,7 +443,7 @@ public class GammaServiceImpl implements IGammaService { // m_chart->RemoveData("Peak"); // m_chart->AddDatas(m_data->Channel_Peak()); // } - } +// } // else { // m_data->m_phd->vPeak.erase(m_data->m_phd->vPeak.begin() + peakIdx); // } @@ -462,7 +492,7 @@ public class GammaServiceImpl implements IGammaService { } @Override - public Result nuclideReview(Integer sampleId, String fileName, Integer channel, HttpServletRequest request) { + public Result nuclideReview(Integer sampleId, String fileName, Double channel, HttpServletRequest request) { Result result = new Result(); if (Objects.isNull(channel)){ return result; @@ -475,7 +505,7 @@ public class GammaServiceImpl implements IGammaService { result.error500("请先选择解析文件！"); return result; } - double value = gammaFileUtil.GetEnergyByFloatChan(phd, channel); + double value = gammaFileUtil.GetEnergyByFloatChan(phd, channel.intValue()); BigDecimal bigDecimal = BigDecimal.valueOf(value); bigDecimal = bigDecimal.setScale(2, BigDecimal.ROUND_HALF_UP); map.put("energy", bigDecimal); @@ -1778,91 +1808,172 @@ public class GammaServiceImpl implements IGammaService { //将PHDFile数据 生成用于数据库存储的数据结构 GStoreMiddleProcessData middleData = new GStoreMiddleProcessData(); bRet = gammaFileUtil.GetInterMiddlData(phd, userName, middleData); + if(!bRet) { + result.error500("Transform PHDFile into structGStoreMiddleProcessData failed."); + return result; + } //根据文件名称查询对应的sampleId 如果存在则赋值sampleId, Status 如果不存在则先存储数据信息到sampleData - + GardsSampleDataSpectrum sampleData = spectrumAnalysisMapper.findSampleByFilePath(middleData.analyses_save_filePath); + if (Objects.nonNull(sampleData)){ + phd.setId_sample(sampleData.getSampleId().toString()); + phd.setStatus(sampleData.getStatus()); + } else { + //如果sampleData为空 存储数据 + needUploadSpec = SaveSampleToDB(phd, middleData.analyses_save_filePath); + bRet = needUploadSpec; + } + if(!bRet) { + result.error500("The Database hasn't this Spectrum("+phd.getFilename()+") and Insert it to Database failed."); + return result; + } //根据sampleId,分析员名称查询idAnalysis String idAnalysis = ""; + idAnalysis = spectrumAnalysisMapper.getIdAnalysisByIdAnalyst(phd.getId_sample(), userName); //写入 RNMAN数据库 //获取phd文件中的totalcmt信息 存入数据库 + String comments = phd.getTotalCmt().trim(); //如果comment的数据长度大于1024 则截取前1024部分 - + if (comments.length()>1024){ + comments = comments.substring(0, 1024); + } //判断idAnalysis是否为空 if (StringUtils.isBlank(idAnalysis)){ // 向 RNMAN.GARDS_ANALYSES 表插入数据 + analysesSpectrumService.insertEntity(middleData, phd, userName, comments); + //查询idAnalysis + idAnalysis = spectrumAnalysisMapper.getIdAnalysisByIdAnalyst(phd.getId_sample(), userName); + //修改sample_data状态 + spectrumAnalysisMapper.updateAnalysesStatus(middleData.analyses_save_filePath); }else { // 更新 RNMAN.GARDS_ANALYSES 表数据 + analysesSpectrumService.updateEntity(middleData, phd, userName, comments, idAnalysis); + //删除GARDS_CALIBRATION_PAIRS表数据 + spectrumAnalysisMapper.deleteCalibrationPairs(Integer.valueOf(idAnalysis)); + //删除GARDS_CALIBRATION表数据 + spectrumAnalysisMapper.deleteCalibration(Integer.valueOf(idAnalysis)); + //删除GARDS_PEAKS表数据 + spectrumAnalysisMapper.deletePeaks(Integer.valueOf(idAnalysis)); + //删除GARDS_NUCL_LINES_IDED表数据 + spectrumAnalysisMapper.deleteNuclLines(Integer.valueOf(idAnalysis)); + //删除GARDS_NUCL_IDED表数据 + spectrumAnalysisMapper.deleteNucl(Integer.valueOf(idAnalysis)); + //删除GARDS_QC_CHECK表数据 + spectrumAnalysisMapper.deleteQCCheck(Integer.valueOf(idAnalysis)); + //删除GARDS_ANALY_SETTING表数据 + spectrumAnalysisMapper.deleteAnalySetting(Integer.valueOf(idAnalysis)); } - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Energy 刻度数据对 - int t_size = middleData.calibration_pairs_E_idCalPoint.size(); - if (t_size>0){ - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Energy 刻度数据对 - // 向 RNMAN.GARDS_CALIBRATION 表写入 Energy 刻度数据对 + bRet = calibrationPairsSpectrumService.saveGardsCalibrationPairsGamma(middleData, Integer.valueOf(phd.getId_sample()), idAnalysis); + if (!bRet) { + result.error500("Save analysis results to DB failed."); + return result; } - - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Efficiency 刻度数据对 - t_size = middleData.calibration_pairs_EF_idCalPoint.size(); - if(t_size > 0){ - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Efficiency 刻度数据对 - // 向 RNMAN.GARDS_CALIBRATION 表写入 Efficiency 刻度数据对 + bRet = calibrationSpectrumService.saveCalibrationGamma(middleData, Integer.valueOf(phd.getId_sample()), idAnalysis); + if (!bRet) { + result.error500("Save analysis results to DB failed."); + return result; } - - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Resolution 刻度数据对 - t_size = middleData.calibration_pairs_R_idCalPoint.size(); - if(t_size > 0){ - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Resolution 刻度数据对 - // 向 RNMAN.GARDS_CALIBRATION 表写入 Resolution 刻度数据对 - } - - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 TotalEfficiency 刻度数据对 - t_size = middleData.calibration_pairs_T_idCalPoint.size(); - if(t_size > 0){ - // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 TotalEfficiency 刻度数据对 - // 向 RNMAN.GARDS_CALIBRATION 表写入 TotalEfficiency 刻度数据对 - } - // 向 RNMAN.GARDS_PEAKS 表写入峰信息 - t_size = middleData.peaks_idPeak.size(); - if(t_size > 0){ - + bRet = peaksSpectrumService.savePeaksGamma(middleData, Integer.valueOf(phd.getId_sample()), idAnalysis); + if (!bRet) { + result.error500("Save analysis results to DB failed."); + return result; } - // 向 RNMAN.GARDS_NUCL_LINES_IDED 表写入被识别核素的射线信息 - Map map = middleData.nucl_lines_ided_data; - for(Map.Entry itor: map.entrySet()){ - + bRet = nuclLinesIdedSpectrumService.saveNuclLinesIdedGamma(middleData, Integer.valueOf(phd.getId_sample()), idAnalysis); + if (!bRet) { + result.error500("Save analysis results to DB failed."); + return result; } - // 向 RNMAN.GARDS_NUCL_IDED 表写入被识别核素的活度浓度信息 - t_size = middleData.nucl_ided_Nuclidename.size(); - if(t_size > 0){ - + bRet = nuclIdedSpectrumService.saveNuclIdedGamma(middleData, Integer.valueOf(phd.getId_sample()), idAnalysis); + if (!bRet) { + result.error500("Save analysis results to DB failed."); + return result; } - // 向 RNMAN.GARDS_QC_CHECK 表写入 QC 检查结果 -// t_size = phd->QcItems.size(); - t_size = 1; - if(t_size > 0){ - + bRet = qcCheckSpectrumService.saveQcCheckGamma(middleData, phd, idAnalysis); + if (!bRet) { + result.error500("Save analysis results to DB failed."); + return result; } - // 向 RNMAN.GARDS_ANALY_SETTING 表写入 SpecSetup 分析参数设置 - -// if(bRet) { - if (true) { -// phd->status = "R"; - String status = "R"; + bRet = analySettingSpectrumService.saveAnalySettingGamma(phd, idAnalysis); + if(bRet) { + phd.setStatus("R"); List paths=new LinkedList<>(); paths.add(middleData.analyses_lc_filePath); paths.add(middleData.analyses_scac_filePath); paths.add(middleData.analyses_baseline_filePath); if(false) paths.add(middleData.analyses_save_filePath); + } else { + result.error500("Save analysis results to DB failed."); + return result; } - else { - String Warning = "Save analysis results to DB failed."; - } - - return null; + return result; } + public boolean SaveSampleToDB(PHDFile phd, String input_file_name) { + boolean bRet = true; + String sit_det_code = phd.getHeader().getSite_code(); + String detect_code = phd.getHeader().getDetector_code(); + // 查询 station_id 和 detect_id + Integer station_id = spectrumAnalysisMapper.getStationId(sit_det_code); + Integer detect_id = spectrumAnalysisMapper.getDetectorId(detect_code); + // ORIGINAL.GARDS_SAMPLE_DATA 表数据 + sampleDataSpectrumService.saveSampleDataGamma(phd, input_file_name, station_id, detect_id); + // 查询新增后的 sample_id 的值赋给变量 DECLARESAMPLEID + Integer sampleId = spectrumAnalysisMapper.getSampleId(input_file_name); + // ORIGINAL.GARDS_SAMPLE_AUX 表数据 + bRet = sampleAuxSpectrumService.saveSampleAuxGamma(phd, sampleId); + if (!bRet) { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + return bRet; + } + // ORIGINAL.gards_sample_description 数据表 + bRet = sampleDescriptionSpectrumService.saveSampleDescriptionGamma(phd, sampleId); + if (!bRet) { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + return bRet; + } + // ORIGINAL.GARDS_SAMPLE_CERT 和 ORIGINAL.GARDS_SAMPLE_CERT_LINE 数据表 + if(phd.getCertificate().getRecord_count() > 0) { + bRet = sampleCertSpectrumService.saveSampleCertGamma(phd, sampleId); + if (!bRet) { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + return bRet; + } + bRet = sampleCertLineSpectrumService.saveSampleCertLineGamma(phd, sampleId); + if (!bRet) { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + return bRet; + } + } + //gards_ calibration_pairs_orig数据表 + bRet = calibrationPairsOrigSpectrumService.saveCalibrationPairsOrigGamma(phd, sampleId); + if (!bRet) { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + return bRet; + } + // gards_total_efficiency _pairs数据表(IDC没有) + bRet = totalEfficiencyPairsSpectrumService.saveTotalEfficiencyPairsGamma(phd, sampleId); + if (!bRet) { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + return bRet; + } + //gards_spectrum数据表 + bRet = spectrumService.saveSpectrumGamma(phd, sampleId, input_file_name); + if(bRet) { + GardsSampleDataSpectrum samplData = spectrumAnalysisMapper.findSampleByFilePath(input_file_name); + if(Objects.nonNull(samplData)) { + phd.setId_sample(samplData.getSampleId().toString()); + phd.setStatus(samplData.getStatus()); + } + } else { + String Warning = "Save "+phd.getFilename()+" to original DB failed."; + } + return bRet; + } + + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalySettingSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalySettingSpectrumServiceImpl.java new file mode 100644 index 00000000..8fbfe812 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalySettingSpectrumServiceImpl.java @@ -0,0 +1,43 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.base.entity.rnman.GardsAnalySetting; +import org.jeecg.modules.entity.vo.PHDFile; +import org.jeecg.modules.mapper.GardsAnalySettingSpectrumMapper; +import org.jeecg.modules.service.IGardsAnalySettingSpectrumService; +import org.springframework.stereotype.Service; + +@Service("gardsAnalySettingSpectrumService") +@DS("ora") +public class GardsAnalySettingSpectrumServiceImpl extends ServiceImpl implements IGardsAnalySettingSpectrumService { + + @Override + public boolean saveAnalySettingGamma(PHDFile phd, String idAnalysis) { + boolean bRet = false; + GardsAnalySetting analySetting = new GardsAnalySetting(); + analySetting.setIdanalysis(Integer.valueOf(idAnalysis)); + analySetting.setSampleId(Integer.valueOf(phd.getId_sample())); + analySetting.setEcutanalysisLow(phd.getUsedSetting().getECutAnalysis_Low()); + analySetting.setEcutanalysisHigh(phd.getUsedSetting().getECutAnalysis_High()); + analySetting.setEnergytolerance(phd.getUsedSetting().getEnergyTolerance()); + analySetting.setCalibrationpssHigh(phd.getUsedSetting().getCalibrationPSS_high()); + analySetting.setCalibrationpssLow(phd.getUsedSetting().getCalibrationPSS_low()); + analySetting.setBaseimprovepss(phd.getUsedSetting().getBaseImprovePSS()); + analySetting.setPssLow(phd.getUsedSetting().getPSS_low()); + analySetting.setKBack(phd.getUsedSetting().getK_back()); + analySetting.setKAlpha(phd.getUsedSetting().getK_alpha()); + analySetting.setKBeta(phd.getUsedSetting().getK_beta()); + analySetting.setRisklevelk(phd.getUsedSetting().getRiskLevelK()); + analySetting.setBupdatecal(phd.getUsedSetting().isBUpdateCal()?1:0); + analySetting.setKeepcalpeakserchpeaks(phd.getUsedSetting().isKeepCalPeakSearchPeaks()?1:0); + analySetting.setReftimeAct(phd.getUsedSetting().getRefTime_act()); + analySetting.setReftimeConc(phd.getUsedSetting().getRefTime_conc()); + int insert = this.baseMapper.insert(analySetting); + if (insert>0){ + bRet = true; + } + return bRet; + } + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java new file mode 100644 index 00000000..755e2391 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsAnalysesSpectrumServiceImpl.java @@ -0,0 +1,68 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.common.util.DateUtils; +import org.jeecg.modules.base.entity.rnman.GardsAnalyses; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; +import org.jeecg.modules.entity.vo.PHDFile; +import org.jeecg.modules.entity.GardsAnalysesSpectrum; +import org.jeecg.modules.mapper.GardsAnalysesManMapper; +import org.jeecg.modules.service.IGardsAnalysesSpectrumService; +import org.springframework.stereotype.Service; + +import java.text.ParseException; +import java.util.Date; + +@Service("gardsAnalysesSpectrumService") +@DS("ora") +public class GardsAnalysesSpectrumServiceImpl extends ServiceImpl implements IGardsAnalysesSpectrumService { + + @Override + public Integer insertEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments) { + try { + GardsAnalyses analyses = new GardsAnalyses(); + analyses.setSampleId(Integer.valueOf(phd.getId_sample())); + analyses.setAnalysisBegin(DateUtils.parseDate(phd.getAnaly_start_time())); + analyses.setAnalysisEnd(new Date()); + analyses.setType(middleData.analyses_type); + analyses.setSoftware(""); + analyses.setSwVersion("1.0.1"); + analyses.setAnalyst(userName); + analyses.setComments(comments); + analyses.setSearchStartChannel((int) middleData.analyses_searchStartChannel); + analyses.setSearchEndChannel((int) middleData.analyses_searchEndChannel); + analyses.setSearchThreshold(middleData.analyses_searchThreshold); + analyses.setNumberOfPeaks((int) middleData.analyses_numberOfPeaks); + analyses.setTotalCounts((float) middleData.analyses_totalCounts); + analyses.setBaselinePath(middleData.analyses_baseline_filePath); + analyses.setLcPath(middleData.analyses_lc_filePath); + analyses.setScacPath(middleData.analyses_scac_filePath); + int insert = this.baseMapper.insert(analyses); + return insert; + } catch (ParseException e) { + throw new RuntimeException(e); + } + } + + @Override + public void updateEntity(GStoreMiddleProcessData middleData, PHDFile phd, String userName, String comments, String idAnalysis) { + GardsAnalysesSpectrum analyses = new GardsAnalysesSpectrum(); + analyses.setIdAnalysis(Integer.valueOf(idAnalysis)); + analyses.setAnalysisBeginStr(phd.getAnaly_start_time()); + analyses.setAnalysisEndStr(DateUtils.formatDate(new Date(), "yyyy/MM/dd HH:mm:ss")); + analyses.setSoftware(""); + analyses.setSwVersion("1.0.1"); + analyses.setComments(comments); + analyses.setSearchStartChannel((int) middleData.analyses_searchStartChannel); + analyses.setSearchEndChannel((int) middleData.analyses_searchEndChannel); + analyses.setSearchThreshold(middleData.analyses_searchThreshold); + analyses.setNumberOfPeaks((int) middleData.analyses_numberOfPeaks); + analyses.setTotalCounts((float) middleData.analyses_totalCounts); + analyses.setBaselinePath(middleData.analyses_baseline_filePath); + analyses.setLcPath(middleData.analyses_lc_filePath); + analyses.setScacPath(middleData.analyses_scac_filePath); + this.baseMapper.updateEntity(analyses); + } + +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsBgEfficiencyPairsSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsBgEfficiencyPairsSpectrumServiceImpl.java index 899934d8..2d8a76f7 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsBgEfficiencyPairsSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsBgEfficiencyPairsSpectrumServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsBgEfficiencyPairs; @@ -12,6 +13,7 @@ import java.util.LinkedList; import java.util.List; @Service("gardsBgEfficiencyPairsSpectrumService") +@DS("ora") public class GardsBgEfficiencyPairsSpectrumServiceImpl extends ServiceImpl implements IGardsBgEfficiencyPairsSpectrumService { @Override diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java index 814e6b7c..205415b8 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsCalibrationPairsOrigSpectrumServiceImpl.java @@ -1,11 +1,17 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsCalibrationPairsOrig; +import org.jeecg.modules.base.enums.CalName; import org.jeecg.modules.base.enums.CalType; import org.jeecg.modules.base.enums.SampleFileHeader; import org.jeecg.modules.base.enums.SystemType; +import org.jeecg.modules.entity.vo.GEfficiencyBlock; +import org.jeecg.modules.entity.vo.GEnergyBlock; +import org.jeecg.modules.entity.vo.GResolutionBlock; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsCalibrationPairsOrigSpectrumService; @@ -15,6 +21,7 @@ import java.util.LinkedList; import java.util.List; @Service("gardsCalibrationPairsOrigSpectrumService") +@DS("ora") public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl implements IGardsCalibrationPairsOrigSpectrumService { @Override @@ -98,4 +105,62 @@ public class GardsCalibrationPairsOrigSpectrumServiceImpl extends ServiceImpl calibrationPairsOrigList = new LinkedList<>(); + int t_size = phd.getMapEnerKD().get(CalName.CalPHD.getType()).getG_energy().size(); + if(t_size > 0) { + GEnergyBlock g_ener = phd.getMapEnerKD().get(CalName.CalPHD.getType()); + for (int i=0; i 0) { + GResolutionBlock g_reso = phd.getMapResoKD().get(CalName.CalPHD.getType()); + for (int i=0; i 0) { + GEfficiencyBlock g_effi = phd.getMapEffiKD().get(CalName.CalPHD.getType()); + for (int i=0; i implements IGardsCalibrationPairsSpectrumService { + + + @Override + public boolean saveGardsCalibrationPairsGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis) { + boolean bRet = false; + List calibrationPairsList = new LinkedList<>(); + // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Energy 刻度数据对 + int t_size = middleData.calibration_pairs_E_idCalPoint.size(); + if (t_size>0){ + // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Energy 刻度数据对 + for (int i=0; i 0){ + // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Efficiency 刻度数据对 + for (int i=0; i 0){ + // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 Resolution 刻度数据对 + for (int i=0; i 0){ + // 向 RNMAN.GARDS_CALIBRATION_PAIRS 表写入 TotalEfficiency 刻度数据对 + for (int i=0; i implements IGardsCalibrationSpectrumService { + + + @Override + public boolean saveCalibrationGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis) { + boolean bRet = false; + List calibrationList = new LinkedList<>(); + int t_size = middleData.calibration_pairs_E_idCalPoint.size(); + if (t_size>0){ + // 向 RNMAN.GARDS_CALIBRATION 表写入 Energy 刻度数据对 + GardsCalibration calibration = new GardsCalibration(); + calibration.setSampleId(sampleId); + calibration.setIdAnalysis(Integer.valueOf(idAnalysis)); + calibration.setSampleType(middleData.calibration_sample_type); + calibration.setCalType(middleData.calibration_E_Caltype); + calibration.setFunction((int) middleData.calibration_E_function); + calibration.setFunctionDef(middleData.calibration_E_functionDef); + calibration.setStartOfRange((int) middleData.calibration_E_startOfRange); + calibration.setEndOfRange((int) middleData.calibration_E_endOfRange); + calibration.setCoeffString(middleData.calibration_E_coeff_string); + calibrationList.add(calibration); + } + + t_size = middleData.calibration_pairs_EF_idCalPoint.size(); + if(t_size > 0){ + // 向 RNMAN.GARDS_CALIBRATION 表写入 Efficiency 刻度数据对 + GardsCalibration calibration = new GardsCalibration(); + calibration.setSampleId(sampleId); + calibration.setIdAnalysis(Integer.valueOf(idAnalysis)); + calibration.setSampleType(middleData.calibration_sample_type); + calibration.setCalType(middleData.calibration_EF_Caltype); + calibration.setFunction((int) middleData.calibration_EF_function); + calibration.setFunctionDef(middleData.calibration_EF_functionDef); + calibration.setStartOfRange((int) middleData.calibration_EF_startOfRange); + calibration.setEndOfRange((int) middleData.calibration_EF_endOfRange); + calibration.setCoeffString(middleData.calibration_EF_coeff_string); + calibrationList.add(calibration); + } + + t_size = middleData.calibration_pairs_R_idCalPoint.size(); + if(t_size > 0){ + // 向 RNMAN.GARDS_CALIBRATION 表写入 Resolution 刻度数据对 + GardsCalibration calibration = new GardsCalibration(); + calibration.setSampleId(sampleId); + calibration.setIdAnalysis(Integer.valueOf(idAnalysis)); + calibration.setSampleType(middleData.calibration_sample_type); + calibration.setCalType(middleData.calibration_R_Caltype); + calibration.setFunction((int) middleData.calibration_R_function); + calibration.setFunctionDef(middleData.calibration_R_functionDef); + calibration.setStartOfRange((int) middleData.calibration_R_startOfRange); + calibration.setEndOfRange((int) middleData.calibration_R_endOfRange); + calibration.setCoeffString(middleData.calibration_R_coeff_string); + calibrationList.add(calibration); + } + + t_size = middleData.calibration_pairs_T_idCalPoint.size(); + if(t_size > 0){ + // 向 RNMAN.GARDS_CALIBRATION 表写入 TotalEfficiency 刻度数据对 + GardsCalibration calibration = new GardsCalibration(); + calibration.setSampleId(sampleId); + calibration.setIdAnalysis(Integer.valueOf(idAnalysis)); + calibration.setSampleType(middleData.calibration_sample_type); + calibration.setCalType(middleData.calibration_T_Caltype); + calibration.setFunction((int) middleData.calibration_T_function); + calibration.setFunctionDef(middleData.calibration_T_functionDef); + calibration.setStartOfRange((int) middleData.calibration_T_startOfRange); + calibration.setEndOfRange((int) middleData.calibration_T_endOfRange); + calibration.setCoeffString(middleData.calibration_T_coeff_string); + calibrationList.add(calibration); + } + if (CollectionUtils.isNotEmpty(calibrationList)) { + bRet = this.saveBatch(calibrationList); + } + return bRet; + } +} diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsHistogramSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsHistogramSpectrumServiceImpl.java index 801ca3f2..9da481bb 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsHistogramSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsHistogramSpectrumServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsHistogram; import org.jeecg.modules.mapper.GardsHistogramSpectrumMapper; @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; @Service("gardsHistogramSpectrumService") +@DS("ora") public class GardsHistogramSpectrumServiceImpl extends ServiceImpl implements IGardsHistogramSpectrumService { @Override diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java new file mode 100644 index 00000000..c5144c77 --- /dev/null +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsNuclIdedSpectrumServiceImpl.java @@ -0,0 +1,57 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.jeecg.modules.base.entity.rnman.GardsNuclIded; +import org.jeecg.modules.entity.vo.GStoreMiddleProcessData; +import org.jeecg.modules.entity.GardsNuclIdedSpectrum; +import org.jeecg.modules.mapper.GardsNuclIdedSpectrumMapper; +import org.jeecg.modules.service.IGardsNuclIdedSpectrumService; +import org.springframework.stereotype.Service; + +import java.util.LinkedList; +import java.util.List; + +@Service("gardsNuclIdedSpectrumService") +@DS("ora") +public class GardsNuclIdedSpectrumServiceImpl extends ServiceImpl implements IGardsNuclIdedSpectrumService { + + + @Override + public boolean saveNuclIdedGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis) { + boolean bRet = false; + List nuclIdedList = new LinkedList<>(); + int t_size = middleData.nucl_ided_Nuclidename.size(); + if(t_size > 0){ + for (int i=0; i implements IGardsNuclLinesIdedSpectrumService { + + @Override + public boolean saveNuclLinesIdedGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis) { + boolean bRet = false; + Map map = middleData.nucl_lines_ided_data; + List nuclLinesIdedList = new LinkedList<>(); + for(String key: map.keySet()){ + int size = map.get(key).nuclideFullname.size(); + for (int i=0; i implements IGardsPeaksSpectrumService { + + + @Override + public boolean savePeaksGamma(GStoreMiddleProcessData middleData, Integer sampleId, String idAnalysis) { + List peaksList = new LinkedList<>(); + int t_size = middleData.peaks_idPeak.size(); + if(t_size > 0){ + for (int i=0; i implements IGardsQcCheckSpectrumService { + + + @Override + public boolean saveQcCheckGamma(GStoreMiddleProcessData middleData, PHDFile phd, String idAnalysis) { + boolean bRet = false; + + int t_size = phd.getQcItems().size(); + if(t_size > 0){ + List qcCheckList = new LinkedList<>(); + for (int i=0; i implements IGardsRoiLimitsSpectrumService { @Override diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleAuxSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleAuxSpectrumServiceImpl.java index e7abf840..80705442 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleAuxSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleAuxSpectrumServiceImpl.java @@ -1,9 +1,12 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.entity.original.GardsSampleAux; import org.jeecg.modules.base.enums.SampleFileHeader; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.mapper.GardsSampleAuxSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsSampleAuxSpectrumService; @@ -13,6 +16,7 @@ import java.text.ParseException; import java.util.List; @Service("gardsSampleAuxSpectrumService") +@DS("ora") public class GardsSampleAuxSpectrumServiceImpl extends ServiceImpl implements IGardsSampleAuxSpectrumService { @Override @@ -79,4 +83,37 @@ public class GardsSampleAuxSpectrumServiceImpl extends ServiceImpl0) { + bRet = true; + } + return bRet; + } } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertLineSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertLineSpectrumServiceImpl.java index d2f6a0e3..69feb743 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertLineSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleCertLineSpectrumServiceImpl.java @@ -1,8 +1,10 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsSampleCertLine; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.mapper.GardsSampleCertLineSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsSampleCertLineSpectrumService; @@ -12,6 +14,7 @@ import java.util.LinkedList; import java.util.List; @Service("gardsSampleCertLineSpectrumService") +@DS("ora") public class GardsSampleCertLineSpectrumServiceImpl extends ServiceImpl implements IGardsSampleCertLineSpectrumService { @Override @@ -38,4 +41,29 @@ public class GardsSampleCertLineSpectrumServiceImpl extends ServiceImpl sampleCertLineList = new LinkedList<>(); + for (int i=0; i implements IGardsSampleCertSpectrumService { @Override @@ -28,4 +31,24 @@ public class GardsSampleCertSpectrumServiceImpl extends ServiceImpl0) { + bRet = true; + } + } catch (ParseException e) { + throw new RuntimeException(e); + } + return bRet; + } + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataSpectrumServiceImpl.java index ba2bb897..26fdb8cf 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataSpectrumServiceImpl.java @@ -1,9 +1,12 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.util.DateUtils; import org.jeecg.modules.base.entity.original.GardsSampleData; import org.jeecg.modules.base.enums.SampleFileHeader; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.mapper.GardsSampleDataSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsSampleDataSpectrumService; @@ -14,6 +17,7 @@ import java.util.Date; import java.util.List; @Service("gardsSampleDataSpectrumService") +@DS("ora") public class GardsSampleDataSpectrumServiceImpl extends ServiceImpl implements IGardsSampleDataSpectrumService { @Override @@ -81,4 +85,52 @@ public class GardsSampleDataSpectrumServiceImpl extends ServiceImpl 0) { + bRet = true; + } + return bRet; + } + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDescriptionSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDescriptionSpectrumServiceImpl.java index 62a6d016..d7e817c4 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDescriptionSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleDescriptionSpectrumServiceImpl.java @@ -1,13 +1,17 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsSampleDescription; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.mapper.GardsSampleDescriptionSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsSampleDescriptionSpectrumService; import org.springframework.stereotype.Service; @Service("gardsSampleDescriptionSpectrumService") +@DS("ora") public class GardsSampleDescriptionSpectrumServiceImpl extends ServiceImpl implements IGardsSampleDescriptionSpectrumService { @Override @@ -22,4 +26,24 @@ public class GardsSampleDescriptionSpectrumServiceImpl extends ServiceImpl 1024){ + t_cmt = t_cmt.substring(0, 1024); + } + GardsSampleDescription sampleDescription = new GardsSampleDescription(); + sampleDescription.setSampleId(sampleId); + sampleDescription.setDescription(t_cmt); + int insert = this.baseMapper.insert(sampleDescription); + if (insert>0) { + bRet = true; + } + } + return bRet; + } + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleRatiosSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleRatiosSpectrumServiceImpl.java index 64c1e73f..024f88c9 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleRatiosSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSampleRatiosSpectrumServiceImpl.java @@ -1,5 +1,6 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsSampleRatios; @@ -12,6 +13,7 @@ import java.util.LinkedList; import java.util.List; @Service("gardsSampleRatiosSpectrumService") +@DS("ora") public class GardsSampleRatiosSpectrumServiceImpl extends ServiceImpl implements IGardsSampleRatiosSpectrumService { @Override diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSpectrumSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSpectrumSpectrumServiceImpl.java index 9da37e2c..38a4492b 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSpectrumSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsSpectrumSpectrumServiceImpl.java @@ -1,10 +1,13 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsSpectrum; import org.jeecg.modules.base.enums.SampleFileHeader; import org.jeecg.modules.base.enums.SystemType; +import org.jeecg.modules.entity.vo.GSpectrumBlock; +import org.jeecg.modules.entity.vo.PHDFile; import org.jeecg.modules.mapper.GardsSpectrumSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsSpectrumSpectrumService; @@ -14,6 +17,7 @@ import java.util.LinkedList; import java.util.List; @Service("gardsSpectrumSpectrumService") +@DS("ora") public class GardsSpectrumSpectrumServiceImpl extends ServiceImpl implements IGardsSpectrumSpectrumService { @Override @@ -47,4 +51,25 @@ public class GardsSpectrumSpectrumServiceImpl extends ServiceImpl 0) { + GSpectrumBlock g_spec = phd.getSpec(); + GardsSpectrum spectrum = new GardsSpectrum(); + spectrum.setSampleId(sampleId); + spectrum.setSampleType(SystemType.GAMMA.getType()); + spectrum.setFilename(input_file_name); + spectrum.setChannels((int) g_spec.getNum_g_channel()); + spectrum.setEnergySpan((int) g_spec.getG_energy_span()); + spectrum.setStartChannel((int) g_spec.getBegin_channel()); + int insert = this.baseMapper.insert(spectrum); + if (insert>0) { + bRet = true; + } + } + return bRet; + } + } diff --git a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java index 13b83283..1d73eaec 100644 --- a/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java +++ b/jeecg-module-spectrum-analysis/src/main/java/org/jeecg/modules/service/impl/GardsTotalEfficiencyPairsSpectrumServiceImpl.java @@ -1,8 +1,12 @@ package org.jeecg.modules.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.modules.base.entity.original.GardsTotalEfficiencyPairs; +import org.jeecg.modules.base.enums.CalName; +import org.jeecg.modules.entity.vo.PHDFile; +import org.jeecg.modules.entity.vo.TotaleffBlock; import org.jeecg.modules.mapper.GardsTotalEfficiencyPairsSpectrumMapper; import org.jeecg.modules.native_jni.struct.EnergySpectrumStruct; import org.jeecg.modules.service.IGardsTotalEfficiencyPairsSpectrumService; @@ -12,6 +16,7 @@ import java.util.LinkedList; import java.util.List; @Service("gardsTotalEfficiencyPairsSpectrumService") +@DS("ora") public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl implements IGardsTotalEfficiencyPairsSpectrumService { @Override @@ -31,4 +36,26 @@ public class GardsTotalEfficiencyPairsSpectrumServiceImpl extends ServiceImpl totalEfficiencyPairsList = new LinkedList<>(); + int t_size = phd.getMapTotEKD().get(CalName.CalPHD.getType()).getG_energy().size(); + if(t_size > 0) { + TotaleffBlock g_tote = phd.getMapTotEKD().get(CalName.CalPHD.getType()); + for (int i=0; i stationInfoMap = (HashMap) redisUtil.get("stationInfoMap"); // 获取所有的台站信息 List stations = stationInfoMap.values().stream() - .sorted(Comparator.comparing(GardsStations::getStationId)) + .sorted(Comparator.comparing(GardsStations::getStationId)).limit(10) .collect(Collectors.toList()); List stationInfos = new ArrayList<>(); for (GardsStations gardsStations : stations) {