From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
index 572ec61..7e8f23f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java
@@ -37,6 +37,7 @@
Data d = (Data)data ;
Object subD = d.getSubData() ;
if(subD != null){
+ boolean toNext = false ;
DataV2 dV2 = (DataV2)subD ;
if(dV2 != null && dV2.subData != null){
//dV2.dataCd81Vo銆� dV2.dataCd84Vo 涓� dV2.dataCdC0Vo 涓嶄細鍚屾椂鏈夊��
@@ -57,6 +58,7 @@
if(dataCd02Vo.stateVo != null && dataCd02Vo.stateVo.valveState != null && dataCd02Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
if(controller != null && controller.getIntakeId() != null){
this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
}
}
}
@@ -73,6 +75,7 @@
if(dataCd81Vo.stateVo != null && dataCd81Vo.stateVo.valveState != null && dataCd81Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
if(controller != null && controller.getIntakeId() != null){
this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
}
}
}
@@ -106,6 +109,7 @@
if(dataCdC0Vo.stateVo != null && dataCdC0Vo.stateVo.valveState != null && dataCdC0Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
if(controller != null && controller.getIntakeId() != null){
this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
}
}
}
@@ -113,6 +117,9 @@
} catch (Exception e) {
log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
}
+ }
+ if(toNext){
+ this.toNextTasks(d);
}
}
}
@@ -126,7 +133,7 @@
* @param stateVo 鐘舵�佸璞�
*/
private void toMsCenter(PrController controller, String rtuAddr, DataV2 dV12, DataAlarmVo alarmVo, DataStateVo stateVo){
- if(alarmVo != null && controller != null){
+ if(alarmVo != null && controller != null && alarmVo.hasAlarm()){
MsObj msObj = new MsObj() ;
msObj.put("name", "鎶ヨ");
msObj.put("rtuAddr", rtuAddr);
--
Gitblit v1.8.0