From 4e4b7d9d255c5c4f26106784417afdc32643cedd Mon Sep 17 00:00:00 2001 From: lxw Date: Mon, 28 Oct 2024 10:30:15 +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 --- Common/Const/EquipmentType.cs | 3 ++- Service/Charger/Handler/RemoteSignalingHandler.cs | 3 ++- Service/Charger/Handler/UpAlarmHandler.cs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Common/Const/EquipmentType.cs b/Common/Const/EquipmentType.cs index f14e24b..492a0b2 100644 --- a/Common/Const/EquipmentType.cs +++ b/Common/Const/EquipmentType.cs @@ -6,5 +6,6 @@ public enum EquipmentType Ammeter, WaterCool, Plc, - BMS + BMS, + Fire, } diff --git a/Service/Charger/Handler/RemoteSignalingHandler.cs b/Service/Charger/Handler/RemoteSignalingHandler.cs index 0d86c06..8e09a1f 100644 --- a/Service/Charger/Handler/RemoteSignalingHandler.cs +++ b/Service/Charger/Handler/RemoteSignalingHandler.cs @@ -35,7 +35,8 @@ namespace Service.Charger.Handler if (StaticStationInfo.AutoFireRelocation == 1) { - if (msg.MaximumAlarmLevel == 3) + if (msg.MaximumAlarmLevel == 3|| msg.FireAlarm==1 || msg.SmokeAlarm==1 ) + { Log.Info($"receive msg.MaximumAlarmLevel = {msg.MaximumAlarmLevel} 触发自动消防移仓"); HttpUtil.SendPostRequest(client.BinNo,HttpUtil.MAIN_UER+"api/SwapMonitor/FireProtectionRelocation/"); diff --git a/Service/Charger/Handler/UpAlarmHandler.cs b/Service/Charger/Handler/UpAlarmHandler.cs index 02d391f..7fda740 100644 --- a/Service/Charger/Handler/UpAlarmHandler.cs +++ b/Service/Charger/Handler/UpAlarmHandler.cs @@ -259,7 +259,7 @@ namespace Service.Charger.Handler { EquipTypeCode = alarmDefine.EquipTypeCode, EquipCode = alarmDefine.EquipCode, - ErrorCode = alarmDefine.ErrorCode, + ErrorCode = errorCode, ErrorLevel = alarmDefine.ErrorLevel, ErrorMsg = alarmDefine.ErrorMsg, ProcessMethod = alarmDefine.ProcessMethod,