panbaolin/SourceTermAnalysisSystem_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: panbaolin:ad0a00882099385a9572ebde01844283ecb90e3a
Branches Tags
panbaolin:master
panbaolin:main
..
compare: panbaolin:83f027d1dd78601f5a42a9f4d7c2a92cb652f580
Branches Tags
panbaolin:master
panbaolin:main

No commits in common. "ad0a00882099385a9572ebde01844283ecb90e3a" and "83f027d1dd78601f5a42a9f4d7c2a92cb652f580" have entirely different histories.
ad0a008820 ... 83f027d1dd

1 changed files with 2 additions and 8 deletions
Show Stats Expand all files Collapse all files

10
jeecg-module-data-analyze/src/main/java/org/jeecg/service/impl/SampleStatAnalysisService.java
View File

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