From e2a6779e69ca96a6d538d415613c8c09963ab659 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期五, 13 十二月 2024 16:56:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
index e0b89ce..354af9f 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java
@@ -34,6 +34,7 @@
Data d = (Data)data ;
Object subD = d.getSubData() ;
if(subD != null){
+ boolean toNext = false ;
DataV1 dV1 = (DataV1)subD ;
if(dV1 != null && dV1.subData != null){
//dV1.dataCd81Vo銆� dV1.dataCd84Vo 涓� dV1.dataCdC0Vo 涓嶄細鍚屾椂鏈夊��
@@ -51,6 +52,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 ;
}
}
}
@@ -67,6 +69,7 @@
if(dataCd84Vo.stateVo != null && dataCd84Vo.stateVo.valveState != null && dataCd84Vo.stateVo.valveState.byteValue() == DataStateVo.ValveCloseState){
if(controller != null && controller.getIntakeId() != null){
this.taskResult = new Object[]{controller.getIntakeId(), DataStateVo.ValveCloseState} ;
+ toNext = true ;
}
}*/
}
@@ -82,6 +85,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 ;
}
}
}
@@ -90,6 +94,9 @@
log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
}
}
+ if(toNext){
+ this.toNextTasks(d);
+ }
}
}
/**
--
Gitblit v1.8.0