From 4f29457b49aee7f63b0696d30c8dc7a0a81130bb Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Fri, 26 Dec 2025 11:49:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=88=86?= =?UTF-8?q?=E6=9E=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DataAnalysisController.java | 17 +- .../org/jeecg/entity/NuclideActConcIntvl.java | 26 +- .../mapper/GardsSampleStatAnalysisMapper.java | 7 + .../xml/GardsSampleStatAnalysisMapper.xml | 59 + .../service/ISampleStatAnalysisService.java | 69 +- .../impl/SampleStatAnalysisService.java | 2971 ++++++++++++++++- .../org/jeecg/vo/NuclideDynamicChartDTO.java | 42 + 7 files changed, 3167 insertions(+), 24 deletions(-) create mode 100644 jeecg-module-data-analyze/src/main/java/org/jeecg/vo/NuclideDynamicChartDTO.java 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 6cb90ef..005f1fa 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 @@ -1,6 +1,7 @@ package org.jeecg.controller; +import com.fasterxml.jackson.core.JsonProcessingException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.vo.Result; @@ -60,6 +61,16 @@ public class DataAnalysisController { } + + @GetMapping("/getNuclideActConcChartData") + @ApiOperation(value = "样品统计分析-核素等级时序分析", notes = "样品统计分析-核素等级时序分析") + public Result getNuclideActConcChartData(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.getNuclideActConcChartData(sampleType,station, nuclideName, dataSource, startDate, endDate); + } + + /*** 样品等级时序分析 * 样品等级时序分析 * @param sampleType 样品类型 @@ -109,8 +120,9 @@ 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) { - return sampleStatAnalysisService.getSampleActConcTimeSeqAnalysis(sampleType, station, nuclideName, dataSource, startDate, endDate); + @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); } /*** 核素活度浓度对比分析 @@ -145,6 +157,7 @@ public class DataAnalysisController { } return result; } + @GetMapping("/findNuclideList") public Result findNuclideList(String systemType) { Result result = new Result(); diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/NuclideActConcIntvl.java b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/NuclideActConcIntvl.java index 3955d1a..9d3e285 100644 --- a/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/NuclideActConcIntvl.java +++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/entity/NuclideActConcIntvl.java @@ -13,78 +13,78 @@ public class NuclideActConcIntvl { /** 样品ID * */ - @JsonProperty("SAMPLEID") + //@JsonProperty("SAMPLEID") private Integer sampleId; /** * 级别 */ - @JsonProperty("CATEGORY") + //@JsonProperty("CATEGORY") private Integer category; /** * 阈值 */ - @JsonProperty("THRESHOLDVALUE") + //@JsonProperty("THRESHOLDVALUE") private double thresholdValue; /**样品类型 * 系统类型（P : particulate; B :gas with 3-D β-γ coincidence detection; G :all other gas systems (high-resolution * γ-spectrometry or 2-D β-γ coincidence * detection)） */ - @JsonProperty("SAMPLE_TYPE") + //@JsonProperty("SAMPLE_TYPE") private String sampleType; /** 台站ID * */ - @JsonProperty("STATIONID") + //@JsonProperty("STATIONID") private Integer stationId; /** 台站编码 * */ - @JsonProperty("STATIONCODE") + //@JsonProperty("STATIONCODE") private String stationCode; /**数据源 * */ - @JsonProperty("DATASOURCE") + //@JsonProperty("DATASOURCE") private Integer dataSource; /** MDC * */ - @JsonProperty("MDC") + //@JsonProperty("MDC") private Double mdc; /** 活度浓度 * */ - @JsonProperty("CONC") + //@JsonProperty("CONC") private Double conc; /** 收集停止时间 * */ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @JsonProperty("COLLECTSTOP") + //@JsonProperty("COLLECTSTOP") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date collectStop; /** * 活度值不确定度 */ - @JsonProperty("CONCERR") + //@JsonProperty("CONCERR") private Double concErr; /** * 样品处理状态 */ - @JsonProperty("STATUS") + //@JsonProperty("STATUS") private String status; /** * 核素名称 */ - @JsonProperty("NUCLIDE_NAME") + //@JsonProperty("NUCLIDE_NAME") private String nuclideName; } 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 3d619b4..dacdd22 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 @@ -27,6 +27,13 @@ public interface GardsSampleStatAnalysisMapper extends BaseMapper getRnManSampleGradeAnalysis(String sampleType, 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 /*** 获取样品类型P中元素的浓度活度、MDC信息 diff --git a/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/xml/GardsSampleStatAnalysisMapper.xml b/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/xml/GardsSampleStatAnalysisMapper.xml index c65864f..e673989 100644 --- a/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/xml/GardsSampleStatAnalysisMapper.xml +++ b/jeecg-module-data-analyze/src/main/java/org/jeecg/mapper/xml/GardsSampleStatAnalysisMapper.xml @@ -240,6 +240,65 @@ + + + + + +