diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java index f068634..8d629de 100644 --- a/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java +++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/controller/DataAnalysisController.java @@ -39,10 +39,14 @@ public class DataAnalysisController { */ @GetMapping("/getSampleMonitorResult") @ApiOperation(value = "样品监测结果回放", notes = "样品监测结果回放") - public Result getSampleMonitorResult(String sampleType, Integer dataSource, @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { + public Result getSampleMonitorResult(String sampleType, Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, + @RequestParam("endDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { - return sampleStatAnalysisService.getSampleMonitorResult(sampleType, dataSource, startDate, endDate); + return sampleStatAnalysisService.getSampleMonitorResult(sampleType, dataSource, startDate, + endDate); } /*** 样品统计分析 @@ -55,23 +59,30 @@ public class DataAnalysisController { */ @GetMapping("/getSampleStatAnalysis") @ApiOperation(value = "样品统计分析", notes = "样品统计分析") - public Result getSampleStatAnalysis(String station, Integer dataSource, @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { - return sampleStatAnalysisService.getSampleStatAnalysis(station, dataSource, startDate, endDate); + public Result getSampleStatAnalysis(String station, Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, + @RequestParam("endDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { + return sampleStatAnalysisService.getSampleStatAnalysis(station, dataSource, startDate, + endDate); } @GetMapping("/getNuclideActConcChartData") @ApiOperation(value = "样品统计分析-核素等级时序分析", notes = "样品统计分析-核素等级时序分析") - public Result getNuclideActConcChartData(@RequestParam("sampleType")String sampleType, - @RequestParam("station") String station, - @RequestParam("nuclideName") String nuclideName, - @RequestParam("dataSource") Integer dataSource, - @RequestParam("startDate") - @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) throws JsonProcessingException { - return sampleStatAnalysisService.getNuclideActConcChartData(sampleType,station, nuclideName, dataSource, startDate, endDate); + public Result getNuclideActConcChartData( + @RequestParam(value = "sampleType") String sampleType, + @RequestParam("station") String station, + @RequestParam("nuclideName") String nuclideName, + @RequestParam("dataSource") Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, + @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) + throws JsonProcessingException { + return sampleStatAnalysisService.getNuclideActConcChartData(sampleType, station, + nuclideName, dataSource, startDate, endDate); } @@ -86,9 +97,14 @@ public class DataAnalysisController { */ @GetMapping("/getSampleGradeAnalysis") @ApiOperation(value = "样品等级时序分析", notes = "样品等级时序分析") - public Result getSampleGradeAnalysis(String sampleType, String station, Integer dataSource, @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { - Result result = sampleStatAnalysisService.getSampleGradeAnalysis(sampleType, station, startDate, endDate, dataSource); + public Result getSampleGradeAnalysis(String sampleType, String station, Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, + @RequestParam("endDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { + Result result = + sampleStatAnalysisService.getSampleGradeAnalysis(sampleType, station, startDate, + endDate, dataSource); return result; } @@ -105,10 +121,17 @@ public class DataAnalysisController { */ @GetMapping("/getActConcIntvlAnalysis") @ApiOperation(value = "样品活度浓度区间频率分析", notes = "样品活度浓度区间频率分析") - public Result getSampleActConcIntvlAnalysis(String sampleType, String station, String nuclideName, Integer dataSource, @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { + public Result getSampleActConcIntvlAnalysis(String sampleType, String station, + String nuclideName, Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + Date startDate, + @RequestParam("endDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + Date endDate) { - return sampleStatAnalysisService.getSampleActConcIntvlAnalysis(sampleType, station, nuclideName, dataSource, startDate, endDate); + return sampleStatAnalysisService.getSampleActConcIntvlAnalysis(sampleType, station, + nuclideName, dataSource, startDate, endDate); } /*** 样品活度浓度时序分析 @@ -123,10 +146,17 @@ public class DataAnalysisController { */ @GetMapping("/getActConcTimeSeqAnalysis") @ApiOperation(value = "样品活度浓度时序分析", notes = "样品活度浓度时序分析") - public Result getSampleActConcTimeSeqAnalysis(String sampleType, String station, String nuclideName, Integer dataSource, @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) throws JsonProcessingException { + public Result getSampleActConcTimeSeqAnalysis(String sampleType, String station, + String nuclideName, Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + Date startDate, + @RequestParam("endDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + Date endDate) throws JsonProcessingException { //return sampleStatAnalysisService.getSampleActConcTimeSeqAnalysis(sampleType, station, nuclideName, dataSource, startDate, endDate); - return sampleStatAnalysisService.getNuclideActConcChartData(sampleType, station, nuclideName, dataSource, startDate, endDate); + return sampleStatAnalysisService.getNuclideActConcChartData(sampleType, station, + nuclideName, dataSource, startDate, endDate); } /*** 核素活度浓度对比分析 @@ -141,9 +171,16 @@ public class DataAnalysisController { */ @GetMapping("/getNuclideActivityConcAnalyze") @ApiOperation(value = "核素活度浓度对比分析", notes = "核素活度浓度对比分析") - public Result getNuclideActivityConcAnalyze(String sampleType, Integer[] stationIds, String nuclideName, Integer dataSource, @RequestParam("startDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date startDate, - @RequestParam("endDate") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endDate) { - return sampleStatAnalysisService.getNuclideActivityConcAnalyze(sampleType, stationIds, nuclideName, dataSource, startDate, endDate); + public Result getNuclideActivityConcAnalyze(String sampleType, Integer[] stationIds, + String nuclideName, Integer dataSource, + @RequestParam("startDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + Date startDate, + @RequestParam("endDate") + @DateTimeFormat(pattern = "yyyy-MM-dd") + Date endDate) { + return sampleStatAnalysisService.getNuclideActivityConcAnalyze(sampleType, stationIds, + nuclideName, dataSource, startDate, endDate); } @@ -151,7 +188,8 @@ public class DataAnalysisController { public Result findStationList(String systemType) { Result result = new Result(); try { - List gardsStations = sampleStatAnalysisService.findStationListByMenuName(systemType); + List gardsStations = + sampleStatAnalysisService.findStationListByMenuName(systemType); result.setCode(200); result.setSuccess(true); result.setResult(gardsStations); @@ -166,7 +204,8 @@ public class DataAnalysisController { public Result findNuclideList(String systemType) { Result result = new Result(); try { - List defaultNuclides = sampleStatAnalysisService.findNuclideList(systemType); + List defaultNuclides = + sampleStatAnalysisService.findNuclideList(systemType); result.setCode(200); result.setSuccess(true); result.setResult(defaultNuclides); diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java index 5ef8098..97ff233 100644 --- a/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java +++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/SystemType.java @@ -20,7 +20,7 @@ public enum SystemType { this.type = type; } - public String getType(){ + public String getType() { return this.type; } diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/GardsSampleStatAnalysisMapper.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/GardsSampleStatAnalysisMapper.java index dacdd22..b3be03f 100644 --- a/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/GardsSampleStatAnalysisMapper.java +++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/GardsSampleStatAnalysisMapper.java @@ -13,25 +13,32 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper getSampleStatAnalysis(String station, String startDate, String endDate); - List selectByStationIds(@Param("stationIds") List stationIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List selectByStationIds(@Param("stationIds") List stationIds, + @Param("startTime") String startTime, + @Param("endTime") String endTime); //region 样品等级时序分析 List getSampleGradeAnalysis(String sampleType, String station, - @Param("startTime") String startTime, @Param("endTime") String endTime, Integer dataSource); + @Param("startTime") String startTime, + @Param("endTime") String endTime, + Integer dataSource); List getRnAutoSampleGradeAnalysis(String sampleType, String station, - @Param("startTime") String startTime, @Param("endTime") String endTime); + @Param("startTime") String startTime, + @Param("endTime") String endTime); List getRnManSampleGradeAnalysis(String sampleType, String station, - @Param("startTime") String startTime, @Param("endTime") String endTime); + @Param("startTime") String startTime, + @Param("endTime") String endTime); - - List getIdentifiedNuclides(@Param("schemaName") String schemaName ,@Param("nuclideName")String nuclideName, String station, - @Param("startTime") String startTime, @Param("endTime") String endTime); - + List getIdentifiedNuclides(@Param("schemaName") String schemaName, + @Param("nuclideName") String nuclideName, + String station, + @Param("startTime") String startTime, + @Param("endTime") String endTime); //endregion @@ -43,18 +50,24 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper */ - List getSamplePNuclideActConcIntvl(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getSamplePNuclideActConcIntvl(String station, + @Param("startTime") String startTime, + @Param("endTime") String endTime); //region 获取样品的级别和阈值 - List getRnAutoSampleLevel(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnAutoSampleLevel(String station, @Param("startTime") String startTime, + @Param("endTime") String endTime); - List getRnManSampleLevel(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); - - - List getNuclideTimeSeriesAnalysis (@Param("schemaName") String schemaName ,@Param("station")String station,@Param("nuclideName")String nuclideName, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnManSampleLevel(String station, @Param("startTime") String startTime, + @Param("endTime") String endTime); + List getNuclideTimeSeriesAnalysis(@Param("schemaName") String schemaName, + @Param("station") String station, + @Param("nuclideName") String nuclideName, + @Param("startTime") String startTime, + @Param("endTime") String endTime); //endregion @@ -68,7 +81,10 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper */ - List getRnautoPNuclideActConcIntvl(String sampleType, String station, String nuclideName, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnautoPNuclideActConcIntvl(String sampleType, String station, + String nuclideName, + @Param("startTime") String startTime, + @Param("endTime") String endTime); /*** 获取样品中元素的浓度活度、MDC信息 * 查询RNAUTO.GARDS_XE_RESULTS中的活度浓度、MDC信息 @@ -77,7 +93,19 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper getRnautoNuclideActConcIntvl(String sampleType, String station, String nuclideName, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnautoNuclideActConcIntvl(String sampleType, String station, + String nuclideName, + @Param("startTime") String startTime, + @Param("endTime") String endTime); + + /** + * + * @param schemaName + * @return + */ + ListgetNuclideActConcIntvl(@Param("schemaName") String schemaName); + + //endregion @@ -91,7 +119,10 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper */ - List getRnmanPNuclideActConcIntvl(String sampleType, String station, String nuclideName, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnmanPNuclideActConcIntvl(String sampleType, String station, + String nuclideName, + @Param("startTime") String startTime, + @Param("endTime") String endTime); /*** 获取样品中元素的浓度活度、MDC信息 * 查询RNAUTO.GARDS_XE_RESULTS中的活度浓度、MDC信息 @@ -100,36 +131,46 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper getRnmanNuclideActConcIntvl(String sampleType, String station, String nuclideName, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnmanNuclideActConcIntvl(String sampleType, String station, + String nuclideName, + @Param("startTime") String startTime, + @Param("endTime") String endTime); //endregion - //region 样品统计分析 /** * RnAuto--获取样品中识别到的核素集合 */ - List getRnAutoIdentifiedNuclides(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnAutoIdentifiedNuclides(String station, + @Param("startTime") String startTime, + @Param("endTime") String endTime); /** * RnAuto-- 核素等级时序分析 */ - List getRnAutoNuclideTimeSeriesAnalysis(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnAutoNuclideTimeSeriesAnalysis(String station, + @Param("startTime") String startTime, + @Param("endTime") String endTime); /** * RnMan--获取样品中识别到的核素集合 */ - List getRnManIdentifiedNuclides(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnManIdentifiedNuclides(String station, + @Param("startTime") String startTime, + @Param("endTime") String endTime); /** * RnMan--核素等级时序分析 * * @return List */ - List getRnManNuclideTimeSeriesAnalysis(String station, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnManNuclideTimeSeriesAnalysis(String station, + @Param("startTime") String startTime, + @Param("endTime") String endTime); /** @@ -213,22 +254,32 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper getRnAutoAnalyzeNuclideActivityConc(@Param("sampleType")String sampleType, @Param("nuclideName")String nuclideName, @Param("stationIds") Integer[] stationIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnAutoAnalyzeNuclideActivityConc( + @Param("sampleType") String sampleType, @Param("nuclideName") String nuclideName, + @Param("stationIds") Integer[] stationIds, @Param("startTime") String startTime, + @Param("endTime") String endTime); - List getRnManAnalyzeNuclideActivityConc(@Param("sampleType")String sampleType, @Param("nuclideName")String nuclideName, @Param("stationIds") Integer[] stationIds, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnManAnalyzeNuclideActivityConc( + @Param("sampleType") String sampleType, @Param("nuclideName") String nuclideName, + @Param("stationIds") Integer[] stationIds, @Param("startTime") String startTime, + @Param("endTime") String endTime); //endregion //region 样品监测结果 - List getRnAutoSampleResult( String sampleType, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnAutoSampleResult(String sampleType, + @Param("startTime") String startTime, + @Param("endTime") String endTime); - List getRnManSampleResult(String sampleType, @Param("startTime") String startTime, @Param("endTime") String endTime); + List getRnManSampleResult(String sampleType, + @Param("startTime") String startTime, + @Param("endTime") String endTime); //endregion + //region 查询台站信息 - List findStationListByMenuName(@Param("systemType")String systemType); + List findStationListByMenuName(@Param("systemType") String systemType); //endregion } diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java index 826e6ab..d75736e 100644 --- a/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java +++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java @@ -28,6 +28,7 @@ import java.text.SimpleDateFormat; import java.time.ZoneId; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.stream.Collector; import java.util.stream.Collectors; @Slf4j @@ -57,7 +58,7 @@ public class SampleStatAnalysisService result.setCode(CommonConstant.SC_OK_200); //声明返回用的结果map Map resultMap = new HashMap<>(); - List StationInfoDataList = new ArrayList<>(); + List stationInfoDataList = new ArrayList<>(); //region 局部变量 if (StringUtils.isBlank(sampleType)) { @@ -78,26 +79,19 @@ public class SampleStatAnalysisService switch (dataSource) { case 1: - StationInfoDataList = + stationInfoDataList = this.baseMapper.getRnAutoSampleResult(sampleType, startTime, endTime); - break; case 2: - StationInfoDataList = + stationInfoDataList = this.baseMapper.getRnManSampleResult(sampleType, startTime, endTime); break; + default: + stationInfoDataList = new ArrayList<>(); } //获取台站信息 -// Map stationInfo = -// StationInfoDataList.stream().collect( -// Collectors.toMap(StationInfoData::getStationCode, -// station -> -// new StationInfoVO(station.getStationCode(), station.getLon(),station.getLat()), -// (existing, replacement) -> existing) -// -// ); - Set stationInfoSet = StationInfoDataList.stream() + Set stationInfoSet = stationInfoDataList.stream() .map(station -> new StationInfoVO( station.getStationCode(), station.getLon(), @@ -106,22 +100,22 @@ public class SampleStatAnalysisService .collect(Collectors.toSet()); - List sortedList = StationInfoDataList.stream() + List sortedList = stationInfoDataList.stream() .sorted(Comparator.comparing(station -> station.getCollectStop().toInstant() .atZone(ZoneId.of("UTC")) .toLocalDate() )) .collect(Collectors.toList()); - //时间段内有多少和台站 + //时间段内有多少台站 Map>> groupedByMonth = sortedList.stream() - .filter(station -> station.getCollectStop() != - null) // 过滤 collectStop 为 null 的数据 - .filter(station -> station.getStationCode() != - null) // 过滤 stationCode 为 null 的数据 - .filter(station -> station.getCategory() != - null) // 过滤 category 为 null 的数据 + .filter(station -> station.getCollectStop() + != null) // 过滤 collectStop 为 null 的数据 + .filter(station -> station.getStationCode() + != null) // 过滤 stationCode 为 null 的数据 + .filter(station -> station.getCategory() + != null) // 过滤 category 为 null 的数据 .collect(Collectors.groupingBy( station -> station.getCollectStop().toInstant() .atZone(ZoneId.of("UTC")) @@ -148,7 +142,7 @@ public class SampleStatAnalysisService // 统计 category 出现次数 Map categoryCount = categories.stream() - .filter(Objects::nonNull) // 再次过滤 null（防御性编程） + .filter(Objects::nonNull) // 再次过滤 null .collect( Collectors.groupingBy( category -> category, @@ -158,7 +152,8 @@ public class SampleStatAnalysisService new HashMap<>(); categoryCount.forEach( (category, count) -> { - String levelKey = "level" + + String levelKey = "level" + + category; // 例如：1 → "level1" levelCount.put(levelKey, count); @@ -335,6 +330,11 @@ public class SampleStatAnalysisService List thresholdList = new ArrayList<>(); Map> levelGroup = new HashMap<>(); + levelGroup.put("category1", new ArrayList<>()); + levelGroup.put("category2", new ArrayList<>()); + levelGroup.put("category3", new ArrayList<>()); + //levelGroup.put("category4", new ArrayList<>()); + for (NuclideActConcIntvl item : rawList) { String timeStr = sdf.format(item.getCollectStop()); mdcList.add(new Object[] {timeStr, item.getMdc()}); @@ -344,9 +344,9 @@ public class SampleStatAnalysisService int cat = item.getCategory(); String categoryStr = "category" + cat; levelGroup.putIfAbsent(categoryStr, new ArrayList<>()); - //double err = item.getConcErr() != null ? item.getConcErr() : 0; + double err = item.getConcErr() != null ? item.getConcErr() : 0; //TODO 测试数据 - double err = 15; + //double err = 15; levelGroup.get(categoryStr).add(new Object[] {timeStr, item.getConc(), err, err}); // if (cat == 3) { // // 3级: 携带误差维度 [时间, 活度, ConcErr , $Conc+ConcErr] @@ -3229,8 +3229,10 @@ public class SampleStatAnalysisService }); result.setSuccess(true); - result.setResult(resultData); - return resultData; + //result.setResult(resultData); + //return resultData; + result.setResult(dataMap); + return result; } @@ -3309,7 +3311,6 @@ public class SampleStatAnalysisService * @return 返回样品活度浓度区间信息 */ @Override - public Result getSampleActConcIntvlAnalysis(String sampleType, String station, String nuclideName, Integer dataSource, Date startDate, Date endDate) { @@ -3342,54 +3343,49 @@ public class SampleStatAnalysisService return result; } String endTime = DateUtils.formatDate(endDate, "yyyy-MM-dd") + " 23:59:59"; + + String schemaName = dataSource == 1 ? "RNAUTO" : "RNMAN"; //endregion //根据数据源、样品类型查询样品的浓度 switch (sampleType) { case "P": - switch (dataSource) { - //RNAUTO - case 1: - nuclideActConcIntvls = - this.baseMapper.getRnautoPNuclideActConcIntvl(sampleType, - station, nuclideName, startTime, endTime); - break; + //RNAUTO + if (dataSource == 1) { + nuclideActConcIntvls = + this.baseMapper.getRnautoPNuclideActConcIntvl(sampleType, + station, nuclideName, startTime, endTime); //RNMAN - case 2: - nuclideActConcIntvls = - this.baseMapper.getRnmanPNuclideActConcIntvl(sampleType, - station, nuclideName, startTime, endTime); - - break; + } else if (dataSource == 2) { + nuclideActConcIntvls = + this.baseMapper.getRnmanPNuclideActConcIntvl(sampleType, + station, nuclideName, startTime, endTime); } break; case "B": - switch (dataSource) { - case 1: - nuclideActConcIntvls = - this.baseMapper.getRnautoNuclideActConcIntvl(sampleType, - station, nuclideName, startTime, endTime); - break; - case 2: - nuclideActConcIntvls = - this.baseMapper.getRnmanNuclideActConcIntvl(sampleType, station, - nuclideName, startTime, endTime); - break; - + if (dataSource == 1) { + nuclideActConcIntvls = + this.baseMapper.getRnautoNuclideActConcIntvl(sampleType, + station, nuclideName, startTime, endTime); + } else if (dataSource == 2) { + nuclideActConcIntvls = + this.baseMapper.getRnmanNuclideActConcIntvl(sampleType, station, + nuclideName, startTime, endTime); } break; } - - - //获取浓度出现的次数 + if (nuclideActConcIntvls.isEmpty()) { + result.error500("查询数据为空"); + return result; + } //获取浓度值集合 List data = DistributionAnalysisToolkit.convertConcToDoubleList(nuclideActConcIntvls); // 设置区间参数 double start = 0; // 区间起始值 - double step = 200; // 区间步长（宽度） + double step = 200; // 区间步长（宽度） // 1. 区间统计