From af136a73561c05342e87f35845539128bd40b41b Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Tue, 9 May 2023 20:12:55 +0800
Subject: [PATCH] =?UTF-8?q?#bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hnac/hzims/operational/alert/mapper/AbnormalAlarmMapper.xml | 1 +
 .../operational/station/service/impl/RealMonitorServiceImpl.java    | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AbnormalAlarmMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AbnormalAlarmMapper.xml
index 5519b3d..034ec61 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AbnormalAlarmMapper.xml
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/alert/mapper/AbnormalAlarmMapper.xml
@@ -11,6 +11,7 @@
     <select id="getAbnormalAlarmList" resultType="java.lang.String">
         select distinct station_id from hzims_abnormal_alarm
         where is_deleted = 0
+        and type in (13,14)
         and `STATUS` = 0
     </select>
 </mapper>
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
index 49939a5..f3f2bc7 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/service/impl/RealMonitorServiceImpl.java
@@ -178,12 +178,6 @@ public class RealMonitorServiceImpl implements IRealMonitorService {
 				List<String> objects = redisClient.getBatchRealDataByRealId(stationReal.getStation(),realIds);
 				for(int i = 0; i < realIds.size() ;i++){
 					if(ObjectUtil.isEmpty(objects.get(i))){
-						Map<String,String> attribute = new ConcurrentHashMap<>();
-						attribute.put("realId",realIds.get(i));
-						attribute.put("value","0");
-						attribute.put("time",DateUtil.format(new Date(),"yyyy-MM-dd HH:mm:ss.s"));
-						valueMap.put(realIdArr[i],attribute.get("value"));
-						keyMap.put(realIdArr[i],attribute);
 						log.error(realIds.get(i) + "is null");
 					}else{
 						Map<String,String> attribute = (Map<String, String>) JSONObject.parse(objects.get(i));