首页预警分布和重要预警排行优化

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/cache/AlarmInfoCache.java

@@ -6,7 +6,6 @@ import com.gyee.wisdom.alarm.sharding.entity.WindturbineParts;
 import com.gyee.wisdom.alarm.sharding.mapper.AlertKnowledgeMapper;
 import com.gyee.wisdom.alarm.sharding.mapper.Alertrule2Mapper;
 import com.gyee.wisdom.alarm.sharding.mapper.WindturbinePartsMapper;
-import com.gyee.wisdom.alarm.sharding.service.Alertrule2Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/entity/Alertrule2.java

@@ -4,9 +4,7 @@ import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.gyee.wisdom.alarm.sharding.config.MyConfig;
 import com.gyee.wisdom.alarm.sharding.util.ChineseDes;
-import com.gyee.wisdom.alarm.sharding.util.SpringContextUtil;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
@@ -80,7 +78,8 @@ public class Alertrule2 implements Serializable {
     @TableField("createtime")
     private Date createtime;//操作时间
     @ChineseDes("展示等级，低等级不展示规则明文")
-    @TableField("RULELEVEL")
+//    @TableField("RULELEVEL")
+    @TableField(exist = false)
     private Integer ruleLevel;
 
     //前端显示字段 防止报警规则泄漏

warning-web/src/main/java/com/gyee/wisdom/alarm/sharding/service/AlarmCountService.java

@@ -1,28 +1,22 @@
 package com.gyee.wisdom.alarm.sharding.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gyee.wisdom.alarm.sharding.cache.DataDictionaryCache;
 import com.gyee.wisdom.alarm.sharding.cache.WindturbineCache;
 import com.gyee.wisdom.alarm.sharding.entity.*;
 import com.gyee.wisdom.alarm.sharding.mapper.AlarmCountMapper;
-import com.gyee.wisdom.alarm.sharding.mapper.AlarmHisotryMapper;
 import com.gyee.wisdom.alarm.sharding.model.AlarmCountStat;
-import com.gyee.wisdom.alarm.sharding.model.AlarmHistoryInfo;
 import com.gyee.wisdom.alarm.sharding.model.CodeValue;
 import com.gyee.wisdom.alarm.sharding.model.HiddeDanger;
-import com.gyee.wisdom.alarm.sharding.util.ResponseWrapper;
 import com.gyee.wisdom.alarm.sharding.util.SnowflakeGenerator;
 import com.gyee.wisdom.common.utils.DateUtil;
 import com.gyee.wisdom.common.utils.StringUtil;
-import io.swagger.v3.oas.annotations.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.text.DecimalFormat;
 import java.text.ParseException;
@@ -65,17 +59,11 @@ public class AlarmCountService extends ServiceImpl<AlarmCountMapper, AlarmCount>
     private String alertIds;
 
     public List<Integer> getEdnValue(){
-        //分解规则id
-        String[] split = alertIds.split(",");
-        List<Alertrule2> alertrule2s = new ArrayList<>();
-        for (String id : split){
-            Alertrule2 alertrule2 = alertrule2Service.selectByAlertrule2Id(id);
-            if (alertrule2 != null){
-                alertrule2s.add(alertrule2);
-            }
-        }
+        QueryWrapper<Alertrule2> qw = new QueryWrapper<>();
+        qw.lambda().in(Alertrule2::getId, Arrays.asList(alertIds.split(",")));
+        List<Alertrule2> al2s = alertrule2Service.list(qw);
         List<Integer> list = new ArrayList<>();
-        for (Alertrule2 alertrule2 :alertrule2s){
+        for (Alertrule2 alertrule2 : al2s){
             list.add(alertrule2.getEdnaValue());
         }
         return list;