feat：完善

2023-08-18 17:10:34 +08:00 · 2023-08-18 17:10:34 +08:00 · 2a8ccef920
commit 2a8ccef920
parent da69a39e95
6 changed files with 41 additions and 31 deletions
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/RuleDto.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/dto/RuleDto.java
@ -7,7 +7,8 @@ import lombok.experimental.Accessors;
 import org.jeecg.modules.base.enums.SourceType;

 import java.io.Serializable;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.Map;

@Data
@ -30,8 +31,14 @@ public class RuleDto implements Serializable{
    // 谱id
    private String sampleId;

+    // 谱Name
+    private String sampleName;
+
+    // 采样时间
+    private LocalDateTime collectionDate;
+
    // 数据源类型(ARMDARR=1|ARMDRRR=2|IDCARR=3|IDCRRR=4)
-    private String dataSourceType;
+    private String datasource;

    // 谱类型 (FULL|PREL)
    private String fullOrPrel;
@ -41,4 +48,11 @@ public class RuleDto implements Serializable{

    // 核素名称-浓度值
    private Map<String,String> nuclides;
+
+    /* 以下属性不需要传值 */
+    private String ruleId;
+
+    private String groupId;
+
+    private String conditions;
 }
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisLog.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisLog.java
@ -49,6 +49,8 @@ public class AlarmAnalysisLog implements Serializable{

 	private String datasource;

+	private String sampleName;
+
 	@TableField(exist = false)
 	private List<NuclideInfo> nuclideInfoList;
 }
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/postgre/AlarmAnalysisRule.java
@ -15,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import org.jeecg.common.system.base.entity.JeecgEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.scheduling.annotation.Scheduled;

@Data
@TableName("alarm_analysis_rule")
--- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
+++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/redisStream/AnalysisConsumer.java
@ -1,23 +1,19 @@
 package org.jeecg.modules.redisStream;

+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.map.MapUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.config.mqtoken.UserTokenContext;
 import org.jeecg.common.constant.CommonConstant;
-import org.jeecg.common.constant.RedisConstant;
 import org.jeecg.common.constant.SymbolConstant;
 import org.jeecg.common.util.RedisStreamUtil;
-import org.jeecg.common.util.RedisUtil;
 import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.base.dto.NuclideInfo;
 import org.jeecg.modules.base.dto.RuleDto;
@ -29,7 +25,6 @@ import org.jeecg.modules.service.AnalysisResultService;
 import org.jeecg.modules.service.IAlarmAnalysisLogService;
 import org.jeecg.modules.service.IAlarmAnalysisNuclideAvgService;
 import org.jeecg.modules.service.IAlarmAnalysisRuleService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.connection.stream.ObjectRecord;
 import org.springframework.data.redis.connection.stream.RecordId;
 import org.springframework.data.redis.stream.StreamListener;
@ -38,8 +33,6 @@ import static org.jeecg.common.constant.enums.MessageTypeEnum.*;
 import static org.jeecg.common.util.TokenUtils.getTempToken;

 import java.math.BigDecimal;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;

@ -101,8 +94,7 @@ public class AnalysisConsumer implements StreamListener<String, ObjectRecord<Str
        String stationId = ruleDto.getStationId();
        String sampleId = ruleDto.getSampleId();
        String fullOrPrel = ruleDto.getFullOrPrel();
-        String betaOrGamma = ruleDto.getBetaOrGamma();
-        String dataSourceType = ruleDto.getDataSourceType();
+        String datasource = ruleDto.getDatasource();
        Map<String, String> nuclides = ruleDto.getNuclides();
        if (StrUtil.isBlank(stationId)) return;
        if (StrUtil.isBlank(sampleId)) return;
@ -118,7 +110,7 @@ public class AnalysisConsumer implements StreamListener<String, ObjectRecord<Str
                continue;
            // 是否在当前规则关注的数据源内
            String source = rule.getSource();
-            if (!StrUtil.contains(source,dataSourceType))
+            if (!StrUtil.contains(source,datasource))
                continue;
            // 是否在当前规则关注的谱类型内
            String spectralQualifier = rule.getSpectralQualifier();
@ -136,34 +128,32 @@ public class AnalysisConsumer implements StreamListener<String, ObjectRecord<Str
                    .filter(entry -> cross.contains(entry.getKey()))
                    .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
            // 开始对交集中的核素进行条件判断
-            List<String> conditions = ListUtil.toList(conditionStr.split(comma));
-            String ruleId = rule.getId();
-            String groupId = rule.getContactGroup();
-            judge(ruleId,groupId,sampleId,betaOrGamma,dataSourceType,conditions,nuclidesCross);
+            ruleDto.setRuleId(rule.getId());
+            ruleDto.setGroupId(rule.getContactGroup());
+            ruleDto.setConditions(rule.getConditions());
+            judge(ruleDto,nuclidesCross);
        }
    }

-    private void judge(String ruleId,
-                       String groupId,
-                       String sampleId,
-                       String betaOrGamma,
-                       String dataSourceType,
-                       List<String> conditions,
-                       Map<String,String> nuclidesCross){
+    private void judge(RuleDto ruleDto, Map<String,String> nuclidesCross){
        String ONE = "1";String TWO = "2";String THREE = "3";
        Set<String> nuclideNames = nuclidesCross.keySet();
        String alarmInfo = "";
        List<String> firstDetected;
        List<NuclideInfo> moreThanAvg = new ArrayList<>();
+        String conditionStr = ruleDto.getConditions();
+        String betaOrGamma = ruleDto.getBetaOrGamma();
+        String datasource = ruleDto.getDatasource();
+        List<String> conditions = ListUtil.toList(conditionStr.split(comma));
        for (String con : conditions) {
            if (ONE.equals(con)){ // 首次发现该元素
-                firstDetected = firstDetected(betaOrGamma,dataSourceType,nuclideNames);
+                firstDetected = firstDetected(betaOrGamma,datasource,nuclideNames);
                if (CollUtil.isNotEmpty(firstDetected)){
                    String message = "核素"+StrUtil.join(comma,firstDetected)+"首次发现";
                    alarmInfo += message;
                }
            } else if (TWO.equals(con)) { // 元素浓度高于均值
-                moreThanAvg = moreThanAvg(dataSourceType,nuclidesCross);
+                moreThanAvg = moreThanAvg(datasource,nuclidesCross);
                if (CollUtil.isNotEmpty(moreThanAvg)){
                    for (NuclideInfo nuclideInfo : moreThanAvg) {
                        String nuclide = nuclideInfo.getNuclide();
@ -182,8 +172,7 @@ public class AnalysisConsumer implements StreamListener<String, ObjectRecord<Str
        if (StrUtil.isNotBlank(alarmInfo)){
            // 保存报警日志
            AlarmAnalysisLog logInfo = new AlarmAnalysisLog();
-            logInfo.setRuleId(ruleId);
-            logInfo.setSampleId(sampleId);
+            BeanUtil.copyProperties(ruleDto,logInfo);
            if (alarmInfo.startsWith(comma))
                alarmInfo = StrUtil.sub(alarmInfo, 1, alarmInfo.length());
            logInfo.setAlarmInfo(alarmInfo);
@ -191,6 +180,7 @@ public class AnalysisConsumer implements StreamListener<String, ObjectRecord<Str
                logInfo.setNuclideInfoList(moreThanAvg);
            logService.saveLog(logInfo);
            // 发送报警信息
+            String groupId = ruleDto.getGroupId();
            if (StrUtil.isNotBlank(groupId))
                systemClient.sendMessage(alarmInfo,groupId, ALL.getValue());
        }
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/Test.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/quartz/job/Test.java
@ -6,6 +6,7 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.modules.base.dto.RuleDto;
 import org.quartz.*;

+import java.time.LocalDateTime;
 import java.util.Map;

 /**
@ -22,11 +23,13 @@ public class Test implements Job {
    public void execute(JobExecutionContext context) throws JobExecutionException {
        init();
        RuleDto ruleDto = new RuleDto();
-        ruleDto.setStationId("101");
-        ruleDto.setSampleId("424249");
+        ruleDto.setStationId("205");
+        ruleDto.setSampleId("425496");
        ruleDto.setBetaOrGamma("Gamma");
        ruleDto.setFullOrPrel("FULL");
-        ruleDto.setDataSourceType("1");
+        ruleDto.setDatasource("1");
+        ruleDto.setSampleName("CAX05_001-20230624_0220_Q_FULL_299.3.PHD");
+        ruleDto.setCollectionDate(LocalDateTime.now());
        Map<String, String> nuclides = MapUtil.newHashMap();
        nuclides.put("Be7","1000000");
        nuclides.put("sss","1000000");
--- a/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/doc/db/tables_xxl_job.sql
+++ b/jeecg-server-cloud/jeecg-visual/jeecg-cloud-xxljob/doc/db/tables_xxl_job.sql