From 16449f5c0e2df4de79b907c9c47e2e8e5ab9f9b8 Mon Sep 17 00:00:00 2001 From: nieziyan Date: Mon, 4 Mar 2024 16:44:54 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A0=B8=E7=B4=A0=E6=B5=93?= =?UTF-8?q?=E5=BA=A6=E8=AE=A1=E7=AE=97=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IGardsXeResultsAutoService.java | 2 +- .../service/IGardsXeResultsManService.java | 2 +- .../impl/CalculateConcServiceImpl.java | 12 +++++----- .../impl/GardsXeResultsAutoServiceImpl.java | 22 ++++++++++++++++--- .../impl/GardsXeResultsManServiceImpl.java | 21 ++++++++++++++++-- .../modules/quartz/jobs/TableSpaceJob.java | 2 +- 6 files changed, 46 insertions(+), 15 deletions(-) diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsAutoService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsAutoService.java index 66c86bee..e66886e2 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsAutoService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsAutoService.java @@ -11,7 +11,7 @@ import java.util.Set; public interface IGardsXeResultsAutoService extends IService { - List getConc(Map params); + List getConc(Map params, Set nuclides); List nuclideNames(Set nuclideNames); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsManService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsManService.java index 269b42ed..34997d5d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsManService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IGardsXeResultsManService.java @@ -11,7 +11,7 @@ import java.util.Set; public interface IGardsXeResultsManService extends IService { - List getConc(Map params); + List getConc(Map params, Set nuclides); List nuclideNames(Set nuclideNames); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java index e4466601..8f13884b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/CalculateConcServiceImpl.java @@ -96,7 +96,7 @@ public class CalculateConcServiceImpl implements CalculateConcService { // 查询指定台站的所有的核素浓度 并计算核素浓度均值 params.put("nuclideName", nuclides); params.put("stationId", station); - List xeConcAuto = xeResultsAutoService.getConc(params); // beta-gamma + List xeConcAuto = xeResultsAutoService.getConc(params, nuclides); // beta-gamma List nuclConcAuto = nuclIdedAutoService.getConc(params); // gamma Map 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 xeConcMan = xeResultsManService.getConc(params); // beta-gamma + List xeConcMan = xeResultsManService.getConc(params, nuclides); // beta-gamma List nuclConcMan = nuclIdedManService.getConc(params); // gamma Map manResult = new HashMap<>(); manResult.putAll(calculate(concDto(xeConcMan), index)); @@ -180,12 +180,10 @@ public class CalculateConcServiceImpl implements CalculateConcService { } private String log(List nuclideAvgs){ - List nuclideNames = nuclideAvgs.stream() + Set 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 + "] 进行了浓度均值计算"; } } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsAutoServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsAutoServiceImpl.java index 59d5c5dd..7d3d6627 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsAutoServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsAutoServiceImpl.java @@ -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 implements IGardsXeResultsAutoService { - @Override - public List getConc(Map params) { - return baseMapper.getConc(params); + public List getConc(Map params, Set nuclides) { + List 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 m = ListUtil.toList("Xe131m", "Xe133m"); + List 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 diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsManServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsManServiceImpl.java index 4ab3ca7d..88e8d4f1 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsManServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/GardsXeResultsManServiceImpl.java @@ -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 getConc(Map params) { - return baseMapper.getConc(params); + public List getConc(Map params ,Set nuclides) { + List 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 m = ListUtil.toList("Xe131m", "Xe133m"); + List 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 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/jobs/TableSpaceJob.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/jobs/TableSpaceJob.java index 9705aceb..307b1ffe 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/jobs/TableSpaceJob.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/jobs/TableSpaceJob.java @@ -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();