Merge remote-tracking branch 'origin/mdc' into mdc

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<GardsSampleDataSpectrum> getDBSpectrumListByLeftJoin(IPage<GardsSampleDataSpectrum> page,
-                                                              GardsSampleDataSpectrum gardsSampleData, String dbName,
+                                                              GardsSampleDataSpectrum gardsSampleData,
-                                                              List<String> stationTypes, boolean CollectStopB,
+                                                              String dbName,
-                                                              boolean AcqStartB, LocalDateTime startTime, LocalDateTime endTime,
+                                                              List<String> stationTypes,
-                                                              List<String> userStations, boolean AllUsers,
+                                                              boolean CollectStopB,
+                                                              boolean AcqStartB,
+                                                              LocalDateTime startTime,
+                                                              LocalDateTime endTime,
+                                                              List<String> userStations,
+                                                              boolean AllUsers,
                                                               String orderField, String orderType);
 
-    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);
+    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);
 
     SpectrumFileRecord getDBSpectrumFilePath(String dbName, Integer sampleId, Integer analysisID);
 
     List<GardsXeResultsSpectrum> 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<GardsDetectors> getDetectorList(@Param(value = "stationId") Integer stationId);
 
-    List<StatisticsData> statisticsQueryNuclides(@Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData);
+    List<StatisticsData> statisticsQueryNuclides(
+            @Param(value = "statisticsQueryData") StatisticsQueryData statisticsQueryData);
 
-    List<StatisticsData> statisticsQueryCollection(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
+    List<StatisticsData> statisticsQueryCollection(
+            @Param(value = "startDate") LocalDateTime startDate,
+            @Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
 
-    List<StatisticsData> statisticsQueryAcquisition(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
+    List<StatisticsData> statisticsQueryAcquisition(
+            @Param(value = "startDate") LocalDateTime startDate,
+            @Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
 
-    List<StatisticsData> statisticsQueryXeVolumn(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
+    List<StatisticsData> statisticsQueryXeVolumn(
+            @Param(value = "startDate") LocalDateTime startDate,
+            @Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
 
-    List<StatisticsData> statisticsQuerySampleVolumn(@Param(value = "startDate") LocalDateTime startDate,@Param(value = "endDate") LocalDateTime endDate, List<Integer> detectorList);
+    List<StatisticsData> statisticsQuerySampleVolumn(
+            @Param(value = "startDate") LocalDateTime startDate,
+            @Param(value = "endDate") LocalDateTime endDate, List<Integer> 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<GardsPeaksSpectrum> getPeaks(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsPeaksSpectrum> getPeaks(@Param(value = "dbName") String dbName,
+                                      @Param(value = "idAnalysis") Integer idAnalysis);
 
-    List<GardsCalibrationPairsSpectrum> getCalibrationPairs(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsCalibrationPairsSpectrum> getCalibrationPairs(@Param(value = "dbName") String dbName,
+                                                            @Param(value = "idAnalysis")
+                                                            Integer idAnalysis);
 
-    List<GardsCalibrationSpectrum> getPara(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsCalibrationSpectrum> getPara(@Param(value = "dbName") String dbName,
+                                           @Param(value = "idAnalysis") Integer idAnalysis);
 
-    List<GardsNuclLinesIdedSpectrum> getNuclLinesIded(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsNuclLinesIdedSpectrum> getNuclLinesIded(@Param(value = "dbName") String dbName,
+                                                      @Param(value = "idAnalysis")
+                                                      Integer idAnalysis);
 
-    List<GardsNuclIdedSpectrum> getNuclIded(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsNuclIdedSpectrum> getNuclIded(@Param(value = "dbName") String dbName,
+                                            @Param(value = "idAnalysis") Integer idAnalysis);
 
-    List<GardsQcCheckSpectrum> getQcCheck(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsQcCheckSpectrum> getQcCheck(@Param(value = "dbName") String dbName,
+                                          @Param(value = "idAnalysis") Integer idAnalysis);
 
-    List<CalMDCInfo> getMDC(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<CalMDCInfo> getMDC(@Param(value = "dbName") String dbName,
+                            @Param(value = "idAnalysis") Integer idAnalysis);
 
     GardsAnalySetting getAnalySetting(@Param(value = "idAnalysis") Integer idAnalysis);
 
-    List<NuclideLine> getNuclideLines(@Param(value = "name") String name);
+    Integer getAnalysisID(@Param(value = "dbName") String dbName,
+                          @Param(value = "sampleId") Integer sampleId,
+                          @Param(value = "userName") String userName);
 
-    List<HalfData> getHalf(@Param(value = "names") List<String> names);
+    List<GardsCalibrationPairsSpectrum> ReadGammaFitChannelEnergy(
+            @Param(value = "idAnalysis") Integer idAnalysis);
 
-    HalfData getOneHalf(@Param(value = "name") String name);
+    List<GardsCalibrationSpectrum> ReadGammaCalibrationParam(@Param(value = "dbName") String dbName,
+                                                             @Param(value = "idAnalysis")
+                                                             Integer idAnalysis);
 
-    List<String> UserNuclide(@Param(value = "systemType") String systemType, @Param(value = "userName") String userName);
+    List<GardsCalibrationPairsSpectrum> ReadBetaFitChannelEnergy(
+            @Param(value = "idAnalysis") Integer idAnalysis);
 
-    Integer getAnalysisID(@Param(value = "dbName") String dbName, @Param(value = "sampleId") Integer sampleId, @Param(value = "userName") String userName);
+    List<GardsCalibrationSpectrum> ReadBetaCalibrationParam(@Param(value = "dbName") String dbName,
+                                                            @Param(value = "idAnalysis")
+                                                            Integer idAnalysis);
 
-    List<GardsCalibrationPairsSpectrum> ReadGammaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsROIChannelsSpectrum> ReadROIChannels(@Param(value = "dbName") String dbName,
+                                                   @Param(value = "idAnalysis") Integer idAnalysis,
+                                                   @Param(value = "sampleId") Integer sampleId);
 
-    List<GardsCalibrationSpectrum> ReadGammaCalibrationParam(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsROIResultsSpectrum> ReadROIResults(@Param(value = "dbName") String dbName,
+                                                 @Param(value = "idAnalysis") Integer idAnalysis,
+                                                 @Param(value = "sampleId") Integer sampleId);
 
-    List<GardsCalibrationPairsSpectrum> ReadBetaFitChannelEnergy(@Param(value = "idAnalysis") Integer idAnalysis);
+    List<GardsXeResultsSpectrum> ReadXeResults(@Param(value = "dbName") String dbName,
+                                               @Param(value = "idAnalysis") Integer idAnalysis,
+                                               @Param(value = "sampleId") Integer sampleId);
 
-    List<GardsCalibrationSpectrum> ReadBetaCalibrationParam(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis);
+    List<String> getFULLNuclideNames(@Param(value = "min") Double min,
+                                     @Param(value = "max") Double max);
 
-    List<GardsROIChannelsSpectrum> ReadROIChannels(@Param(value = "dbName") String dbName, @Param(value = "idAnalysis") Integer idAnalysis, @Param(value = "sampleId") Integer sampleId);
+    List<String> getRelevantNuclideNames(@Param(value = "min") Double min,
-
+                                         @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<GardsNuclLinesLib> getNuclideLine(@Param(value = "min") Double min, @Param(value = "max") Double max, @Param(value = "name") String name);
+    List<GardsNuclLinesLib> 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<String> findNuclideList(@Param(value = "min") Double min, @Param(value = "max") Double max, @Param(value = "nuclides") List<String> nuclides);
+    Integer SampleIsExist(@Param(value = "filePathName") String filePathName,
-
+                          @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);
 
@@ -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")
+    String getIdAnalysisByIdAnalyst(@Param(value = "sampleId") String sampleId,
-    void insertROIResults(@Param(value = "roiResultsSpectrum") GardsRoiResults roiResultsSpectrum);
+                                    @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<Map<String, Object>> selectThresholdDataBySampleId(@Param("schemaName") String schemaName,
+                                                            @Param("sampleId") String sampleId);
 
-    List<String> findNuclidesAnalysis();
+    List<ThresholdResultHistory> selectThresholdHistoryBySampleId(
+            @Param("schemaName") String schemaName, @Param("sampleId") String sampleId,
+            @Param("startTime") LocalDateTime startTime);
 
-    List<Map<String, Object>> selectThresholdDataBySampleId(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId);
+    List<NuclideAnalysisInfo> selectXeDataPastYear(@Param("schemaName") String schemaName,
-
+                                                   @Param("sampleId") String sampleId,
-    List<ThresholdResultHistory> selectThresholdHistoryBySampleId(@Param("schemaName") String schemaName, @Param("sampleId") String sampleId,@Param("startTime") LocalDateTime startTime);
+                                                   @Param(value = "userName") String userName,
-
+                                                   @Param("startTime") LocalDateTime startTime,
-    List<NuclideAnalysisInfo> selectXeDataPastYear( @Param("schemaName") String schemaName, @Param("sampleId") String sampleId,@Param(value = "userName") String userName,@Param("startTime") LocalDateTime startTime,@Param("endTime ") LocalDateTime endTime );
+                                                   @Param("endTime ") LocalDateTime endTime);
 
 }