From e4f6e4128c0133f5562d3532b902a7872ec78819 Mon Sep 17 00:00:00 2001
From: yang_shj <1069818635@QQ.com>
Date: Wed, 24 Apr 2024 16:20:12 +0800
Subject: [PATCH] =?UTF-8?q?#=E5=BC=80=E5=85=B3=E6=9C=BA=E5=8F=91=E7=94=B5?=
 =?UTF-8?q?=E9=87=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hzims/scheduled/service/alarm/impl/AlarmServiceImpl.java     | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmServiceImpl.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmServiceImpl.java
index cf46488..c78f300 100644
--- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmServiceImpl.java
+++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/alarm/impl/AlarmServiceImpl.java
@@ -79,11 +79,11 @@ public class AlarmServiceImpl implements AlarmService {
         }
         // 查询开关机默认告警配置
         AlarmDefaultConfigEntity start = defaulConfigService.getOne(Wrappers.<AlarmDefaultConfigEntity>lambdaQuery()
-                .eq(AlarmDefaultConfigEntity::getSource,5)
+                .eq(AlarmDefaultConfigEntity::getSource,6)
                 .eq(AlarmDefaultConfigEntity::getAlarmChiledType,60)
         );
         AlarmDefaultConfigEntity stop = defaulConfigService.getOne(Wrappers.<AlarmDefaultConfigEntity>lambdaQuery()
-                .eq(AlarmDefaultConfigEntity::getSource,5)
+                .eq(AlarmDefaultConfigEntity::getSource,6)
                 .eq(AlarmDefaultConfigEntity::getAlarmChiledType,61)
         );
         // 获取站点设备实时数据
@@ -113,7 +113,7 @@ public class AlarmServiceImpl implements AlarmService {
             }
             // 比对开机状态
             if(real.getActivePower() > 0){
-                if(startStopMap.get(real.getDeviceCode()) == 0){
+                if(startStopMap.containsKey(real.getDeviceCode())  && startStopMap.get(real.getDeviceCode()) == 0){
                     refresh.put(real.getDeviceCode(),1);
                     // 记录开机告警
                     this.saveStartStopAlarm(station,real,start,1);
@@ -121,7 +121,7 @@ public class AlarmServiceImpl implements AlarmService {
                     refresh.put(real.getDeviceCode(),1);
                 }
             }else{
-                if(startStopMap.get(real.getDeviceCode()) == 1){
+                if(startStopMap.containsKey(real.getDeviceCode()) && startStopMap.get(real.getDeviceCode()) == 1){
                     refresh.put(real.getDeviceCode(),0);
                     // 记录关机告警
                     this.saveStartStopAlarm(station,real,stop,0);
@@ -134,6 +134,7 @@ public class AlarmServiceImpl implements AlarmService {
         redisTemplate.opsForValue().set(start_stop_cache_final,refresh);
     }
 
+
     /**
      * 清理历史告警数据
      * @param param