From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 03 六月 2025 16:46:24 +0800
Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容； 2、虚拟卡状态写入时机进行修改，由原来的阶段写簇变成随时写入。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1/TkDealAlarmStatus.java | 56 ++++++++++++++++++++++++++++----------------------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java | 4 +++-
2 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
index 4ba11fd..2b29f20 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/AlarmVo.java
@@ -162,7 +162,9 @@
public String toStr(){
StringBuffer sb = new StringBuffer() ;
sb.append("娉�/闃�鐘舵�� : ") ;
- sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
+ //瑙ｆ瀽鏃跺凡缁忓仛浜嗗吋瀹�
+ //sb.append(statePump == null?"鏈煡":(statePump.byteValue()==1?"娉�/闃�寮�":(statePump.byteValue()==0?"娉�/闃�鍏�":"鏈煡"))) ;
+ sb.append(statePump == null?"鏈煡":(statePump.byteValue()==0?"娉�/闃�寮�":(statePump.byteValue()==1?"娉�/闃�鍏�":"鏈煡"))) ;
sb.append("\n") ;
sb.append("鍓╀綑姘撮噺鎶ヨ : ") ;
sb.append(alarmWaterRemain == null?"鏈煡":(alarmWaterRemain.byteValue() == 0 ? "姝ｅ父":(alarmWaterRemain.byteValue() == 1 ? "鎶ヨ":"鏈煡"))) ;
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 0498b50..23808df 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
@@ -54,64 +54,64 @@
//闅忔満鑷姤鎶�
DataCd81Vo dataCd81Vo = (DataCd81Vo)cdObj ;
if (dataCd81Vo.alarmVo != null || dataCd81Vo.stateVo != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ 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 ;
+ }
+ }
if(this.needSave2Db( d.getRtuAddr())){
//鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCd81Vo.rtuDt, dV1, dataCd81Vo.alarmVo, dataCd81Vo.stateVo);
this.cacheSaveTime(d.getRtuAddr());
- 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 ;
- }
- }
}
}
} else if (cdObj instanceof DataCd84Vo) {
//闃�寮�宸ヤ綔鎶�
DataCd84Vo dataCd84Vo = (DataCd84Vo)cdObj ;
if (dataCd84Vo.alarmVo != null || dataCd84Vo.stateVo != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
+ 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 ;
+ }
+ }*/
if(this.needSave2Db( d.getRtuAddr())) {
//鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCd84Vo.rtuDt, dV1, dataCd84Vo.alarmVo, dataCd84Vo.stateVo);
this.cacheSaveTime(d.getRtuAddr());
- /** 闃�寮�宸ヤ綔鎶ワ紝闃�闂ㄧ姸鎬佷竴瀹氭槸鎵撳紑鐘舵�侊紝鎵�浠ヤ笉璁剧疆涓嬮潰鏁版嵁浠ュ鍚庣画浠诲姟璁剧疆铏氭嫙鍗＄姸鎬�
- 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 ;
- }
- }*/
}
}
} else if (cdObj instanceof DataCdC0Vo) {
//鏁寸偣鎶�
DataCdC0Vo dataCdC0Vo = (DataCdC0Vo)cdObj ;
if (dataCdC0Vo.alarmVo != null || dataCdC0Vo.stateVo != null) {
+ Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
+ DbSv sv = (DbSv) objs[0];
+ PrController controller = (PrController) objs[1];
+ 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 ;
+ }
+ }
if(this.needSave2Db( d.getRtuAddr())) {
//鍦ㄤ竴涓皬鏃跺唴娌℃湁瀛樺偍鎶ヨ鏁版嵁
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId);
- DbSv sv = (DbSv) objs[0];
- PrController controller = (PrController) objs[1];
this.toMsCenter(controller, d.getRtuAddr(), dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
this.saveOrUpdateLast(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
this.saveHistory(sv, controller, d.getRtuAddr(), dataCdC0Vo.rtuDt, dV1, dataCdC0Vo.alarmVo, dataCdC0Vo.stateVo);
this.cacheSaveTime(d.getRtuAddr());
- 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 ;
- }
- }
}
}
}
--
Gitblit v1.8.0