Compare commits

..

No commits in common. "2935c9a9b20643899c0b0988f2f47fbc22e37a03" and "75b4051cbe82be294768fb0017e42b0e4b74506d" have entirely different histories.

View File

@ -21,35 +21,26 @@ import java.util.Map;
public interface SpectrumAnalysisMapper { public interface SpectrumAnalysisMapper {
Page<GardsSampleDataSpectrum> getDBSpectrumListByLeftJoin(IPage<GardsSampleDataSpectrum> page, Page<GardsSampleDataSpectrum> getDBSpectrumListByLeftJoin(IPage<GardsSampleDataSpectrum> page,
GardsSampleDataSpectrum gardsSampleData, GardsSampleDataSpectrum gardsSampleData, String dbName,
String dbName, List<String> stationTypes, boolean CollectStopB,
List<String> stationTypes, boolean AcqStartB, LocalDateTime startTime, LocalDateTime endTime,
boolean CollectStopB, List<String> userStations, boolean AllUsers,
boolean AcqStartB,
LocalDateTime startTime,
LocalDateTime endTime,
List<String> userStations,
boolean AllUsers,
String orderField, String orderType); String orderField, String orderType);
Page<GardsSampleDataSpectrum> loadSampleData(IPage<GardsSampleDataSpectrum> page, Page<GardsSampleDataSpectrum> loadSampleData(IPage<GardsSampleDataSpectrum> page, GardsSampleDataSpectrum gardsSampleData, List<String> stationTypes, boolean CollectStopB, boolean AcqStartB, LocalDateTime startTime, LocalDateTime endTime, List<String> userStations, boolean AllUsers, String orderField, String orderType);
GardsSampleDataSpectrum gardsSampleData,
List<String> stationTypes, boolean CollectStopB,
boolean AcqStartB, LocalDateTime startTime,
LocalDateTime endTime, List<String> userStations,
boolean AllUsers, String orderField,
String orderType);
SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId, Integer analysisID); SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId, Integer analysisID);
List<GardsXeResultsSpectrum> getXeDataList(Integer sampleId); List<GardsXeResultsSpectrum> getXeDataList(Integer sampleId);
String getQCFilePath(String siteDetCode, LocalDateTime collectStart); String getQCFilePath(String siteDetCode, LocalDateTime collectStartStr);
CommentData viewComment(@Param(value = "sampleId") Integer sampleId); CommentData viewComment(@Param(value = "sampleId") Integer sampleId);
String getSampleFilePath(@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 viewARR(@Param(value = "sampleId") Integer sampleId);
String viewRRR(@Param(value = "sampleId") Integer sampleId); String viewRRR(@Param(value = "sampleId") Integer sampleId);
@ -60,97 +51,69 @@ public interface SpectrumAnalysisMapper {
List<GardsDetectors> getDetectorList(@Param(value = "stationId") Integer stationId); List<GardsDetectors> getDetectorList(@Param(value = "stationId") Integer stationId);
List<StatisticsData> statisticsQueryNuclides( List<StatisticsData> statisticsQueryNuclides(@Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData);
@Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData);
List<StatisticsData> statisticsQueryCollection( List<StatisticsData> statisticsQueryCollection(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
List<StatisticsData> statisticsQueryAcquisition( List<StatisticsData> statisticsQueryAcquisition(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
List<StatisticsData> statisticsQueryXeVolumn( List<StatisticsData> statisticsQueryXeVolumn(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
List<StatisticsData> statisticsQuerySampleVolumn( List<StatisticsData> statisticsQuerySampleVolumn(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
@Param(value = "startDate") LocalDateTime startDate,
@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
String getStatus(@Param(value = "sampleId") Integer sampleId); String getStatus(@Param(value = "sampleId") Integer sampleId);
GardsAnalysesSpectrum getAnalysis(@Param(value = "dbName") String dbName, GardsAnalysesSpectrum getAnalysis(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName);
@Param(value = "sampleId") Integer sampleId,
@Param(value = "userName") String userName);
List<GardsPeaksSpectrum> getPeaks(@Param(value = "dbName") String dbName, List<GardsPeaksSpectrum> getPeaks(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis);
List<GardsCalibrationPairsSpectrum> getCalibrationPairs(@Param(value = "dbName") String dbName, List<GardsCalibrationPairsSpectrum> getCalibrationPairs(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis")
Integer idAnalysis);
List<GardsCalibrationSpectrum> getPara(@Param(value = "dbName") String dbName, List<GardsCalibrationSpectrum> getPara(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis);
List<GardsNuclLinesIdedSpectrum> getNuclLinesIded(@Param(value = "dbName") String dbName, List<GardsNuclLinesIdedSpectrum> getNuclLinesIded(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis")
Integer idAnalysis);
List<GardsNuclIdedSpectrum> getNuclIded(@Param(value = "dbName") String dbName, List<GardsNuclIdedSpectrum> getNuclIded(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis);
List<GardsQcCheckSpectrum> getQcCheck(@Param(value = "dbName") String dbName, List<GardsQcCheckSpectrum> getQcCheck(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis);
List<CalMDCInfo> getMDC(@Param(value = "dbName") String dbName, List<CalMDCInfo> getMDC(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis);
GardsAnalySetting getAnalySetting(@Param(value = "idAnalysis") Integer idAnalysis); GardsAnalySetting getAnalySetting(@Param(value = "idAnalysis") Integer idAnalysis);
Integer getAnalysisID(@Param(value = "dbName") String dbName, List<NuclideLine> getNuclideLines(@Param(value = "name") String name);
@Param(value = "sampleId") Integer sampleId,
@Param(value = "userName") String userName);
List<GardsCalibrationPairsSpectrum> ReadGammaFitChannelEnergy( List<HalfData> getHalf(@Param(value = "names") List<String> names);
@Param(value = "idAnalysis") Integer idAnalysis);
List<GardsCalibrationSpectrum> ReadGammaCalibrationParam(@Param(value = "dbName") String dbName, HalfData getOneHalf(@Param(value = "name") String name);
@Param(value = "idAnalysis")
Integer idAnalysis);
List<GardsCalibrationPairsSpectrum> ReadBetaFitChannelEnergy( List<String> UserNuclide(@Param(value = "systemType") String systemType, @Param(value = "userName") String userName);
@Param(value = "idAnalysis") Integer idAnalysis);
List<GardsCalibrationSpectrum> ReadBetaCalibrationParam(@Param(value = "dbName") String dbName, Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName);
@Param(value = "idAnalysis")
Integer idAnalysis);
List<GardsROIChannelsSpectrum> ReadROIChannels(@Param(value = "dbName") String dbName, List<GardsCalibrationPairsSpectrum> ReadGammaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis,
@Param(value = "sampleId") Integer sampleId);
List<GardsROIResultsSpectrum> ReadROIResults(@Param(value = "dbName") String dbName, List<GardsCalibrationSpectrum> ReadGammaCalibrationParam(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis,
@Param(value = "sampleId") Integer sampleId);
List<GardsXeResultsSpectrum> ReadXeResults(@Param(value = "dbName") String dbName, List<GardsCalibrationPairsSpectrum> ReadBetaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "idAnalysis") Integer idAnalysis,
@Param(value = "sampleId") Integer sampleId);
List<String> getFULLNuclideNames(@Param(value = "min") Double min, List<GardsCalibrationSpectrum> ReadBetaCalibrationParam(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
@Param(value = "max") Double max);
List<String> getRelevantNuclideNames(@Param(value = "min") Double min, List<GardsROIChannelsSpectrum> ReadROIChannels(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId);
@Param(value = "max") Double max);
List<GardsROIResultsSpectrum> ReadROIResults(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId);
List<GardsXeResultsSpectrum> ReadXeResults(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId);
List<String> getUserNuclideNames(@Param(value = "nuclides") List<String> nuclides, @Param(value = "min") Double min, @Param(value = "max") Double max);
List<String> getFULLNuclideNames(@Param(value = "min") Double min, @Param(value = "max") Double max);
List<String> getRelevantNuclideNames(@Param(value = "min") Double min, @Param(value = "max") Double max);
List<String> getNuclideNames(@Param(value = "dbName") String dbName); List<String> getNuclideNames(@Param(value = "dbName") String dbName);
List<GardsNuclLinesLib> getNuclideLine(@Param(value = "min") Double min, List<GardsNuclLinesLib> getNuclideLine(@Param(value = "min") Double min, @Param(value = "max") Double max, @Param(value = "name") String name);
@Param(value = "max") Double max,
@Param(value = "name") String name);
GardsNuclLib getNuclideInfo(@Param(value = "name") String name); GardsNuclLib getNuclideInfo(@Param(value = "name") String name);
@ -158,8 +121,13 @@ public interface SpectrumAnalysisMapper {
String findAutomaticLogPath(@Param(value = "sampleId") Integer sampleId); String findAutomaticLogPath(@Param(value = "sampleId") Integer sampleId);
Integer SampleIsExist(@Param(value = "filePathName") String filePathName, List<String> findNuclideList(@Param(value = "min") Double min, @Param(value = "max") Double max, @Param(value = "nuclides") List<String> nuclides);
@Param(value = "userName") String userName);
List<GardsNuclLinesLib> getNuclideTable(@Param(value = "name") String name, @Param(value = "span") Long span);
List<String> getPossibleNuclide(@Param(value = "nuclides") List<String> nuclides, @Param(value = "min") double min, @Param(value = "max") double max);
Integer SampleIsExist(@Param(value = "filePathName") String filePathName, @Param(value = "userName") String userName);
GardsSampleData findSampleByFile(@Param(value = "filePathName") String filePathName); GardsSampleData findSampleByFile(@Param(value = "filePathName") String filePathName);
@ -177,18 +145,30 @@ public interface SpectrumAnalysisMapper {
void deleteCalibrationPairs(Integer idAnalysis); void deleteCalibrationPairs(Integer idAnalysis);
@InterceptorIgnore(tenantLine = "true")
void insertCalibrationPairs(@Param(value = "calibrationPairs") GardsCalibrationPairs calibrationPairs);
void deleteCalibration(Integer idAnalysis); void deleteCalibration(Integer idAnalysis);
@InterceptorIgnore(tenantLine = "true")
void insertCalibration(@Param(value = "calibration") GardsCalibration calibration);
void deleteROIChannels(Integer idAnalysis); void deleteROIChannels(Integer idAnalysis);
@InterceptorIgnore(tenantLine = "true")
void insertROIChannels(@Param(value = "roiChannels") GardsRoiChannels roiChannels);
void deleteXeResult(Integer idAnalysis); void deleteXeResult(Integer idAnalysis);
@InterceptorIgnore(tenantLine = "true")
void insertXeResult(@Param(value = "xeResult") GardsXeResults xeResult);
void deleteROIResults(Integer idAnalysis); void deleteROIResults(Integer idAnalysis);
String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId, @InterceptorIgnore(tenantLine = "true")
@Param(value = "userName") String userName); void insertROIResults(@Param(value = "roiResultsSpectrum") GardsRoiResults roiResultsSpectrum);
String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId, @Param(value = "userName") String userName);
void deletePeaks(Integer idAnalysis); void deletePeaks(Integer idAnalysis);
@ -202,17 +182,14 @@ public interface SpectrumAnalysisMapper {
void deleteAnalySetting(Integer idAnalysis); void deleteAnalySetting(Integer idAnalysis);
List<Map<String, Object>> selectThresholdDataBySampleId(@Param("schemaName") String schemaName, Integer getSampleIdLikeFileName(@Param(value = "fileName") String fileName);
@Param("sampleId") String sampleId);
List<ThresholdResultHistory> selectThresholdHistoryBySampleId( List<String> findNuclidesAnalysis();
@Param("schemaName") String schemaName, @Param("sampleId") String sampleId,
@Param("startTime") LocalDateTime startTime);
List<NuclideAnalysisInfo> selectXeDataPastYear(@Param("schemaName") String schemaName, List<Map<String, Object>> selectThresholdDataBySampleId(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId);
@Param("sampleId") String sampleId,
@Param(value = "userName") String userName, List<ThresholdResultHistory> selectThresholdHistoryBySampleId(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId,@Param("startTime") LocalDateTime startTime);
@Param("startTime") LocalDateTime startTime,
@Param("endTime ") LocalDateTime endTime); List<NuclideAnalysisInfo> selectXeDataPastYear( @Param("schemaName") String schemaName, @Param("sampleId") String sampleId,@Param(value = "userName") String userName,@Param("startTime") LocalDateTime startTime,@Param("endTime ") LocalDateTime endTime );
} }