From 9fb370afff71f4d5659d8904e8751479280d5b48 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 09:26:50 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealAlarmStatusV2.java | 19 ++++++++++++++++++-
1 files changed, 18 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..aadb5ec 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);
@@ -135,6 +142,16 @@
msObj.put("dt", dV12.dt);
MsCenterUnit.getInstance().pushMs(msObj);
}
+ if(stateVo != null && controller != null && stateVo.valveState != null){
+ MsObj msObj = new MsObj() ;
+ msObj.put("name", "闃�鎬�");
+ msObj.put("rtuAddr", rtuAddr);
+ msObj.put("intakeId", controller.getIntakeId());
+ msObj.put("state", stateVo.valveState);
+ msObj.put("stateName", stateVo.valveState==0?"寮�":"鍏�");
+ msObj.put("dt", dV12.dt);
+ MsCenterUnit.getInstance().pushMs(msObj);
+ }
}
/**
* 淇濆瓨鎶ヨ鐘舵�佹渶鏂版暟鎹�
--
Gitblit v1.8.0