From b46a773d53b7623bc51d110ca4744552890c6369 Mon Sep 17 00:00:00 2001
From: duwenyuan <1351851645@qq.com>
Date: Fri, 17 Oct 2025 09:34:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9CCode=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/service/impl/SampleStatAnalysisService.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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 fd781a8..c7355d9 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
@@ -4,6 +4,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.entity.GardsThresholdResultHis;
 import org.jeecg.modules.base.entity.original.GardsSampleData;
@@ -28,6 +29,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
 
     public Result getSampleMonitorResult(String sampleType, Integer dataSource, Date startDate, Date endDate) {
         Result result = new Result();
+        result.setCode(CommonConstant.SC_OK_200);
         //声明返回用的结果map
         Map<String, Object> resultMap = new HashMap<>();
         List<StationInfoData> StationInfoDataList = new ArrayList<>();
@@ -73,7 +75,6 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
 
         result.setSuccess(true);
         result.setResult(resultMap);
-
         return result;
     }
 
@@ -96,6 +97,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
         String schemaName = dataSource == 1 ? "RNAUTO" : "RNMAN";
         //region 局部变量
         Result result = new Result();
+        result.setCode(CommonConstant.SC_OK_200);
         if (StringUtils.isBlank(stationCode)) {
             result.error500("Station Code cannot be null");
             return result;
@@ -160,6 +162,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
         List<SampleLevelData> sampleDataList = new ArrayList<>();
         //region 局部变量
         Result result = new Result();
+        result.setCode(CommonConstant.SC_OK_200);
         if (StringUtils.isBlank(sampleType)) {
             result.error500("SampleType Code cannot be null");
             return result;
@@ -215,6 +218,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
         List<NuclideActConcIntvl> nuclideActConcIntvls = new ArrayList<>();
         //region 局部变量
         Result result = new Result();
+        result.setCode(CommonConstant.SC_OK_200);
         if (StringUtils.isBlank(sampleType)) {
             result.error500("SampleType Code cannot be null");
             return result;
@@ -276,7 +280,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
 
 
         // 1. 区间统计
-        List<DistributionAnalysisToolkit.IntervalStat> stats = DistributionAnalysisToolkit.calculateIntervalStats(data, start, step);
+        List<DistributionAnalysisToolkit.IntervalStat> stats = DistributionAnalysisToolkit.calculateIntervalStats(nuclideActConcIntvls, start, step);
         // 3. 累积分布函数
         List<DistributionAnalysisToolkit.CDFPoint> cdfPoints = DistributionAnalysisToolkit.calculateCDF(data);
         // 4. 核密度估计
@@ -309,6 +313,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
     @Override
     public Result getSampleActConcTimeSeqAnalysis(String sampleType, String station, String nuclideName, Integer dataSource, Date startDate, Date endDate) {
         Result result = new Result();
+        result.setCode(CommonConstant.SC_OK_200);
         //声明返回用的结果map
         Map<String, Object> resultMap = new HashMap<>();
         //region 局部变量
@@ -392,6 +397,7 @@ public class SampleStatAnalysisService extends ServiceImpl<GardsSampleStatAnalys
     public Result getNuclideActivityConcAnalyze(String sampleType, Integer[] stationIds, String nuclideName, Integer dataSource, Date startDate, Date endDate) {
 
         Result result = new Result();
+        result.setCode(CommonConstant.SC_OK_200);
         Map<String, Object> resultMap = new HashMap<>();
         List<NuclideActConcIntvl> nuclideActConcIntvls = new ArrayList<>();
         //region 局部变量