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 resultMap = new HashMap<>(); List StationInfoDataList = new ArrayList<>(); @@ -73,7 +75,6 @@ public class SampleStatAnalysisService extends ServiceImpl 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 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 stats = DistributionAnalysisToolkit.calculateIntervalStats(data, start, step); + List stats = DistributionAnalysisToolkit.calculateIntervalStats(nuclideActConcIntvls, start, step); // 3. 累积分布函数 List cdfPoints = DistributionAnalysisToolkit.calculateCDF(data); // 4. 核密度估计 @@ -309,6 +313,7 @@ public class SampleStatAnalysisService extends ServiceImpl resultMap = new HashMap<>(); //region 局部变量 @@ -392,6 +397,7 @@ public class SampleStatAnalysisService extends ServiceImpl resultMap = new HashMap<>(); List nuclideActConcIntvls = new ArrayList<>(); //region 局部变量