From 0ddf8710878246d4d67120a27f6076c25a9fe253 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Wed, 20 May 2026 15:19:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=9C=AA=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/SpectrumAnalysisMapper.java | 163 ++++++++++-------- 1 file changed, 93 insertions(+), 70 deletions(-) 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 75a2e112..ec802c5a 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 @@ -21,26 +21,35 @@ import java.util.Map; public interface SpectrumAnalysisMapper { Page getDBSpectrumListByLeftJoin(IPage page, - GardsSampleDataSpectrum gardsSampleData, String dbName, - List stationTypes, boolean CollectStopB, - boolean AcqStartB, LocalDateTime startTime, LocalDateTime endTime, - List userStations, boolean AllUsers, + GardsSampleDataSpectrum gardsSampleData, + String dbName, + List stationTypes, + boolean CollectStopB, + boolean AcqStartB, + LocalDateTime startTime, + LocalDateTime endTime, + List userStations, + boolean AllUsers, String orderField, String orderType); - Page loadSampleData(IPage page, GardsSampleDataSpectrum gardsSampleData, List stationTypes, boolean CollectStopB, boolean AcqStartB, LocalDateTime startTime, LocalDateTime endTime, List userStations, boolean AllUsers, String orderField, String orderType); + Page loadSampleData(IPage page, + GardsSampleDataSpectrum gardsSampleData, + List stationTypes, boolean CollectStopB, + boolean AcqStartB, LocalDateTime startTime, + LocalDateTime endTime, List userStations, + boolean AllUsers, String orderField, + String orderType); SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId, Integer analysisID); List getXeDataList(Integer sampleId); - String getQCFilePath(String siteDetCode, LocalDateTime collectStartStr); + String getQCFilePath(String siteDetCode, LocalDateTime collectStart); CommentData viewComment(@Param(value = "sampleId") Integer sampleId); String getSampleFilePath(@Param(value = "sampleId") Integer sampleId); - Integer findStationIdBySampleId(@Param(value = "sampleId") Integer sampleId); - String viewARR(@Param(value = "sampleId") Integer sampleId); String viewRRR(@Param(value = "sampleId") Integer sampleId); @@ -51,69 +60,97 @@ public interface SpectrumAnalysisMapper { List getDetectorList(@Param(value = "stationId") Integer stationId); - List statisticsQueryNuclides(@Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData); + List statisticsQueryNuclides( + @Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData); - List statisticsQueryCollection(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List detectorList); + List statisticsQueryCollection( + @Param(value = "startDate") LocalDateTime startDate, + @Param(value = "endDate") LocalDateTime endDate, List detectorList); - List statisticsQueryAcquisition(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List detectorList); + List statisticsQueryAcquisition( + @Param(value = "startDate") LocalDateTime startDate, + @Param(value = "endDate") LocalDateTime endDate, List detectorList); - List statisticsQueryXeVolumn(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List detectorList); + List statisticsQueryXeVolumn( + @Param(value = "startDate") LocalDateTime startDate, + @Param(value = "endDate") LocalDateTime endDate, List detectorList); - List statisticsQuerySampleVolumn(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List detectorList); + List statisticsQuerySampleVolumn( + @Param(value = "startDate") LocalDateTime startDate, + @Param(value = "endDate") LocalDateTime endDate, List detectorList); String getStatus(@Param(value = "sampleId") Integer sampleId); - GardsAnalysesSpectrum getAnalysis(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName); + GardsAnalysesSpectrum getAnalysis(@Param(value = "dbName") String dbName, + @Param(value = "sampleId") Integer sampleId, + @Param(value = "userName") String userName); - List getPeaks(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getPeaks(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis); - List getCalibrationPairs(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getCalibrationPairs(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") + Integer idAnalysis); - List getPara(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getPara(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis); - List getNuclLinesIded(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getNuclLinesIded(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") + Integer idAnalysis); - List getNuclIded(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getNuclIded(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis); - List getQcCheck(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getQcCheck(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis); - List getMDC(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getMDC(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis); GardsAnalySetting getAnalySetting(@Param(value = "idAnalysis") Integer idAnalysis); - List getNuclideLines(@Param(value = "name") String name); + Integer getAnalysisID(@Param(value = "dbName") String dbName, + @Param(value = "sampleId") Integer sampleId, + @Param(value = "userName") String userName); - List getHalf(@Param(value = "names") List names); + List ReadGammaFitChannelEnergy( + @Param(value = "idAnalysis") Integer idAnalysis); - HalfData getOneHalf(@Param(value = "name") String name); + List ReadGammaCalibrationParam(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") + Integer idAnalysis); - List UserNuclide(@Param(value = "systemType") String systemType, @Param(value = "userName") String userName); + List ReadBetaFitChannelEnergy( + @Param(value = "idAnalysis") Integer idAnalysis); - Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName); + List ReadBetaCalibrationParam(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") + Integer idAnalysis); - List ReadGammaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis); + List ReadROIChannels(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis, + @Param(value = "sampleId") Integer sampleId); - List ReadGammaCalibrationParam(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List ReadROIResults(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis, + @Param(value = "sampleId") Integer sampleId); - List ReadBetaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis); + List ReadXeResults(@Param(value = "dbName") String dbName, + @Param(value = "idAnalysis") Integer idAnalysis, + @Param(value = "sampleId") Integer sampleId); - List ReadBetaCalibrationParam(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis); + List getFULLNuclideNames(@Param(value = "min") Double min, + @Param(value = "max") Double max); - List ReadROIChannels(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId); - - List ReadROIResults(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId); - - List ReadXeResults(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId); - - List getUserNuclideNames(@Param(value = "nuclides") List nuclides, @Param(value = "min") Double min, @Param(value = "max") Double max); - - List getFULLNuclideNames(@Param(value = "min") Double min, @Param(value = "max") Double max); - - List getRelevantNuclideNames(@Param(value = "min") Double min, @Param(value = "max") Double max); + List getRelevantNuclideNames(@Param(value = "min") Double min, + @Param(value = "max") Double max); List getNuclideNames(@Param(value = "dbName") String dbName); - List getNuclideLine(@Param(value = "min") Double min, @Param(value = "max") Double max, @Param(value = "name") String name); + List getNuclideLine(@Param(value = "min") Double min, + @Param(value = "max") Double max, + @Param(value = "name") String name); GardsNuclLib getNuclideInfo(@Param(value = "name") String name); @@ -121,13 +158,8 @@ public interface SpectrumAnalysisMapper { String findAutomaticLogPath(@Param(value = "sampleId") Integer sampleId); - List findNuclideList(@Param(value = "min") Double min, @Param(value = "max") Double max, @Param(value = "nuclides") List nuclides); - - List getNuclideTable(@Param(value = "name") String name, @Param(value = "span") Long span); - - List getPossibleNuclide(@Param(value = "nuclides") List nuclides, @Param(value = "min") double min, @Param(value = "max") double max); - - Integer SampleIsExist(@Param(value = "filePathName") String filePathName, @Param(value = "userName") String userName); + Integer SampleIsExist(@Param(value = "filePathName") String filePathName, + @Param(value = "userName") String userName); GardsSampleData findSampleByFile(@Param(value = "filePathName") String filePathName); @@ -145,30 +177,18 @@ public interface SpectrumAnalysisMapper { void deleteCalibrationPairs(Integer idAnalysis); - @InterceptorIgnore(tenantLine = "true") - void insertCalibrationPairs(@Param(value = "calibrationPairs") GardsCalibrationPairs calibrationPairs); void deleteCalibration(Integer idAnalysis); - @InterceptorIgnore(tenantLine = "true") - void insertCalibration(@Param(value = "calibration") GardsCalibration calibration); - void deleteROIChannels(Integer idAnalysis); - @InterceptorIgnore(tenantLine = "true") - void insertROIChannels(@Param(value = "roiChannels") GardsRoiChannels roiChannels); void deleteXeResult(Integer idAnalysis); - @InterceptorIgnore(tenantLine = "true") - void insertXeResult(@Param(value = "xeResult") GardsXeResults xeResult); - void deleteROIResults(Integer idAnalysis); - @InterceptorIgnore(tenantLine = "true") - void insertROIResults(@Param(value = "roiResultsSpectrum") GardsRoiResults roiResultsSpectrum); - - String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId, @Param(value = "userName") String userName); + String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId, + @Param(value = "userName") String userName); void deletePeaks(Integer idAnalysis); @@ -182,14 +202,17 @@ public interface SpectrumAnalysisMapper { void deleteAnalySetting(Integer idAnalysis); - Integer getSampleIdLikeFileName(@Param(value = "fileName") String fileName); + List> selectThresholdDataBySampleId(@Param("schemaName") String schemaName, + @Param("sampleId") String sampleId); - List findNuclidesAnalysis(); + List selectThresholdHistoryBySampleId( + @Param("schemaName") String schemaName, @Param("sampleId") String sampleId, + @Param("startTime") LocalDateTime startTime); - List> selectThresholdDataBySampleId(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId); - - List selectThresholdHistoryBySampleId(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId,@Param("startTime") LocalDateTime startTime); - - List selectXeDataPastYear( @Param("schemaName") String schemaName, @Param("sampleId") String sampleId,@Param(value = "userName") String userName,@Param("startTime") LocalDateTime startTime,@Param("endTime ") LocalDateTime endTime ); + List selectXeDataPastYear(@Param("schemaName") String schemaName, + @Param("sampleId") String sampleId, + @Param(value = "userName") String userName, + @Param("startTime") LocalDateTime startTime, + @Param("endTime ") LocalDateTime endTime); }