From 73501bf79337e35cb48818be4af87d7237e72452 Mon Sep 17 00:00:00 2001 From: xzb <223@qq.com> Date: Fri, 15 Dec 2023 14:24:14 +0800 Subject: [PATCH] =?UTF-8?q?ISCS=E7=81=AB=E8=AD=A6=E7=B3=BB=E7=BB=9Fecs?= =?UTF-8?q?=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/iscs_fas.go | 33 ++++++++++++++++++++++----------- component/iscs_pscada.go | 1 - consts/iscs_bas.go | 1 - fi/iscs_pscada.go | 5 ----- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/component/iscs_fas.go b/component/iscs_fas.go index 087af30..fd1393f 100644 --- a/component/iscs_fas.go +++ b/component/iscs_fas.go @@ -78,6 +78,8 @@ const ( type GasFireExtinguisher struct { State GfeState //气体灭火器状态 Exception consts.DeviceExceptionEnum //具体异常-故障、异常、通信中断 + Release bool //true-气体释放 + Auto bool //true-自动；false-手动 } // GfeState 气体灭火器状态 @@ -174,8 +176,7 @@ type PumpStartButton struct { // TemperatureSensingCable 感温电缆 type TemperatureSensingCable struct { - Normal bool //true-正常 - FireAlarm bool //true-火警 + State FdState //正常、火警故障 Exception consts.DeviceExceptionEnum //具体异常-故障、异常、通信中断 } @@ -183,8 +184,8 @@ type TemperatureSensingCable struct { // // 1、一般电梯应有的消防功能。归首的意思是指回归首层。2、该功能也就是说电梯在上行过程中，如果一旦触发了消防开关，电梯就立即返回基站（也就是归首层） type ElevatorToOriginalPosModule struct { - Normal bool //true-正常 - Exception consts.DeviceExceptionEnum //具体异常-火警故障、故障、异常、通信中断 + State FdState //正常、火警故障 + Exception consts.DeviceExceptionEnum //具体异常-故障、异常、通信中断 } //////////////////////////////////////////// @@ -193,23 +194,33 @@ type ElevatorToOriginalPosModule struct { // // 当烟气温度达到280℃时，人已基本疏散完毕，排烟已无实际意义，而烟气中此时已带火，阀门自动关闭，以避免火势蔓延 type FireDamper struct { - Normal bool //true-正常 - Isolate bool //true-隔离 - Exception consts.DeviceExceptionEnum //具体异常-火警故障、故障、异常、通信中断 + State FdState //正常、隔离、火警故障 + Exception consts.DeviceExceptionEnum //具体异常-故障、异常、通信中断 + Closed bool //true-防火阀关闭；false-防火阀打开(常态) } // ElectricSmokeFireDamper 电动防烟防火阀 type ElectricSmokeFireDamper struct { - Normal bool //true-正常 - Exception consts.DeviceExceptionEnum //具体异常-火警故障、故障、异常、通信中断 + State FdState //正常、火警故障 + Exception consts.DeviceExceptionEnum //具体异常-故障、异常、通信中断 + Closed bool //true-防火阀关闭；false-防火阀打开(常态) } +// FdState 防火阀状态定义 +type FdState = uint8 + +const ( + FdNormal FdState = iota //正常 + FdIsolate //隔离 + FdFireAlarm //火警故障(烟气温度超过阈值使阀门关闭) +) + //////////////////////////////////////////// // FireInterconnectionSignal 火灾互联互通信号 type FireInterconnectionSignal struct { - Normal bool //true-正常 - Exception consts.DeviceExceptionEnum //具体异常-火警故障、故障、异常、通信中断 + State FdState //正常、火警故障 + Exception consts.DeviceExceptionEnum //具体异常-故障、异常、通信中断 } ///////////////////////////////////////////// diff --git a/component/iscs_pscada.go b/component/iscs_pscada.go index 26099d7..319db01 100644 --- a/component/iscs_pscada.go +++ b/component/iscs_pscada.go @@ -166,7 +166,6 @@ var ( DeviceAlarmTag = ecs.NewTag() //报警 有事故信号产生 DeviceStartTimeoutTag = ecs.NewTag() //启动超时 DeviceModuleFaultTag = ecs.NewTag() //模块故障 - DeviceFireAlarmMalfunctionTag = ecs.NewTag() //火警故障 ) // 设备置牌标签定义 diff --git a/consts/iscs_bas.go b/consts/iscs_bas.go index fdad89f..802dbe7 100644 --- a/consts/iscs_bas.go +++ b/consts/iscs_bas.go @@ -11,5 +11,4 @@ const ( DeviceAlarm //报警 有事故信号产生 DeviceStartTimeout //启动超时 DeviceModuleFault //模块故障 - DeviceFireAlarmMalfunction //火警故障 ) diff --git a/fi/iscs_pscada.go b/fi/iscs_pscada.go index c1e13bd..92ad4b7 100644 --- a/fi/iscs_pscada.go +++ b/fi/iscs_pscada.go @@ -93,7 +93,6 @@ const ( DeviceExceptionAlarm //报警 有事故信号产生 DeviceExceptionStartTimeout //启动超时 DeviceExceptionModuleFault //模块故障 - DeviceExceptionFireAlarmMalfunction //火警故障 ) // DeviceExceptionOperate 设备例外操作 @@ -111,7 +110,6 @@ func DeviceExceptionOperate(w ecs.World, deviceId string, opt DeviceExceptionOpt deviceEntry.RemoveComponent(component.DeviceAlarmTag) deviceEntry.RemoveComponent(component.DeviceStartTimeoutTag) deviceEntry.RemoveComponent(component.DeviceModuleFaultTag) - deviceEntry.RemoveComponent(component.DeviceFireAlarmMalfunctionTag) } // switch opt { @@ -133,9 +131,6 @@ func DeviceExceptionOperate(w ecs.World, deviceId string, opt DeviceExceptionOpt case DeviceExceptionModuleFault: clearAllExceptions(deviceEntry) deviceEntry.AddComponent(component.DeviceModuleFaultTag) - case DeviceExceptionFireAlarmMalfunction: - clearAllExceptions(deviceEntry) - deviceEntry.AddComponent(component.DeviceFireAlarmMalfunctionTag) default: clearAllExceptions(deviceEntry) }