xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：核素浓度计算为null问题

Browse Source
This commit is contained in:
nieziyan 2024-03-04 16:44:54 +08:00
parent 0b15a28641
commit 16449f5c0e
6 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsAutoService.java
View File

@ -11,7 +11,7 @@ import java.util.Set;
public interface IGardsXeResultsAutoService extends IService<GardsXeResults> {
List<ConcDtoXe> getConc(Map<String,Object> params);
List<ConcDtoXe> getConc(Map<String,Object> params, Set<String> nuclides);
List<String> nuclideNames(Set<String> nuclideNames);
}

2
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsManService.java
View File

@ -11,7 +11,7 @@ import java.util.Set;
public interface IGardsXeResultsManService extends IService<GardsXeResults> {
List<ConcDtoXe> getConc(Map<String,Object> params);
List<ConcDtoXe> getConc(Map<String,Object> params, Set<String> nuclides);
List<String> nuclideNames(Set<String> nuclideNames);
}

12
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java
View File

@ -96,7 +96,7 @@ public class CalculateConcServiceImpl implements CalculateConcService {
// 查询指定台站的所有的核素浓度 并计算核素浓度均值
params.put("nuclideName", nuclides);
params.put("stationId", station);
List<ConcDtoXe> xeConcAuto = xeResultsAutoService.getConc(params); // beta-gamma
List<ConcDtoXe> xeConcAuto = xeResultsAutoService.getConc(params, nuclides); // beta-gamma
List<ConcDto> nuclConcAuto = nuclIdedAutoService.getConc(params); // gamma
Map<String, String> autoResult = new HashMap<>();
autoResult.putAll(calculate(concDto(xeConcAuto), index));
@ -117,7 +117,7 @@ public class CalculateConcServiceImpl implements CalculateConcService {
// 查询指定台站的所有的核素浓度 并计算核素浓度均值
params.put("nuclideName", nuclides);
params.put("stationId", station);
List<ConcDtoXe> xeConcMan = xeResultsManService.getConc(params); // beta-gamma
List<ConcDtoXe> xeConcMan = xeResultsManService.getConc(params, nuclides); // beta-gamma
List<ConcDto> nuclConcMan = nuclIdedManService.getConc(params); // gamma
Map<String,String> manResult = new HashMap<>();
manResult.putAll(calculate(concDto(xeConcMan), index));
@ -180,12 +180,10 @@ public class CalculateConcServiceImpl implements CalculateConcService {
}
private String log(List<AlarmAnalysisNuclideAvg> nuclideAvgs){
List<String> nuclideNames = nuclideAvgs.stream()
Set<String> nuclideNames = nuclideAvgs.stream()
.map(AlarmAnalysisNuclideAvg::getNuclide)
.collect(Collectors.toList());
.collect(Collectors.toSet());
String nuclide = CollUtil.join(nuclideNames, ",");
String now = LocalDateTime.now()
.format(DateTimeFormatter.ofPattern(DateConstant.DATE_TIME));
return "核素 [" + nuclide + "] 进行了浓度均值计算, 计算时间: " + now;
return "核素 [" + nuclide + "] 进行了浓度均值计算";
}
}

22
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsAutoServiceImpl.java
View File

@ -1,5 +1,7 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.jeecg.common.constant.DateConstant;
@ -22,10 +24,24 @@ import java.util.stream.Collectors;
@DS("ora")
public class GardsXeResultsAutoServiceImpl extends ServiceImpl<GardsXeResultsAutoMapper, GardsXeResults> implements IGardsXeResultsAutoService {
@Override
public List<ConcDtoXe> getConc(Map<String, Object> params) {
return baseMapper.getConc(params);
public List<ConcDtoXe> getConc(Map<String, Object> params, Set<String> nuclides) {
List<String> M = ListUtil.toList("Xe131M", "Xe133M");
// XeResults表: 查询条件使用m
nuclides = nuclides.stream()
.filter(M::contains)
.map(item -> StrUtil.replace(item, "M","m")).collect(Collectors.toSet());
params.put("nuclideName", nuclides);
// 将返回结果的m转换为M
List<String> m = ListUtil.toList("Xe131m", "Xe133m");
List<ConcDtoXe> result = baseMapper.getConc(params);
result = result.stream()
.filter(item -> m.contains(item.getNuclideName()))
.peek(item -> {
String nuclideName = StrUtil.replace(item.getNuclideName(), "m","M");
item.setNuclideName(nuclideName);
}).collect(Collectors.toList());
return result;
}
@Override

21
jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsManServiceImpl.java
View File

@ -1,5 +1,7 @@
package org.jeecg.modules.service.impl;
import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -24,8 +26,23 @@ public class GardsXeResultsManServiceImpl extends ServiceImpl<GardsXeResultsManM
@Override
public List<ConcDtoXe> getConc(Map<String, Object> params) {
return baseMapper.getConc(params);
public List<ConcDtoXe> getConc(Map<String, Object> params ,Set<String> nuclides) {
List<String> M = ListUtil.toList("Xe131M", "Xe133M");
// XeResults表: 查询条件使用m
nuclides = nuclides.stream()
.filter(M::contains)
.map(item -> StrUtil.replace(item, "M","m")).collect(Collectors.toSet());
params.put("nuclideName", nuclides);
// 将返回结果的m转换为M
List<String> m = ListUtil.toList("Xe131m", "Xe133m");
List<ConcDtoXe> result = baseMapper.getConc(params);
result = result.stream()
.filter(item -> m.contains(item.getNuclideName()))
.peek(item -> {
String nuclideName = StrUtil.replace(item.getNuclideName(), "m","M");
item.setNuclideName(nuclideName);
}).collect(Collectors.toList());
return result;
}
@Override

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/jobs/TableSpaceJob.java
View File

@ -44,7 +44,7 @@ public class TableSpaceJob extends Monitor {
/**
* 解析Oracle 表空间预警规则
**/
@Scheduled(cron = "${task.period-space:0 0/1 * * * ?}")
@Scheduled(cron = "${task.period-space:0 0 */1 * * ?}")
public void execute(){
init();