From 9860dd8d6a437ba7e11168f490f86d4cc6edf584 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 13 六月 2024 22:34:47 +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/p206V202404/TkDealAlarmStatusV202404.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
index 193e8d8..e3033ee 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java
@@ -105,11 +105,14 @@
alarmVo==null?null:alarmVo.alarmEleMiss,
alarmVo==null?null:alarmVo.alarmEleExceed,
alarmVo==null?null:alarmVo.alarmEleLowVolt,
- alarmVo==null?null:alarmVo.stateIcEnable
+ alarmVo==null?null:alarmVo.stateIcEnable,
+ (byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
) ;
sv.saveRmAlarmStateLast(po) ;
}else{
po = this.update(po, controller, rtuDt, alarmVo, receiveDt) ;
+ this.updateVirCardNoUseState(sv, controller, alarmVo) ;
sv.updateRmAlarmStateLast(po);
}
}
@@ -149,7 +152,9 @@
alarmVo==null?null:alarmVo.alarmEleMiss,
alarmVo==null?null:alarmVo.alarmEleExceed,
alarmVo==null?null:alarmVo.alarmEleLowVolt,
- alarmVo==null?null:alarmVo.stateIcEnable
+ alarmVo==null?null:alarmVo.stateIcEnable,
+ (byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
) ;
sv.saveRmAlarmStateHistory(po) ;
}
@@ -192,4 +197,22 @@
}
return po ;
}
+
+ /**
+ * 铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ */
+ private void updateVirCardNoUseState(DbSv sv,
+ PrController controller,
+ AlarmVo alarmVo){
+ if(alarmVo != null){
+ if(alarmVo.statePump != null && alarmVo.statePump.byteValue() == 0){
+ //闃�闂ㄥ叧闂姸鎬�
+ if(controller != null && controller.getIntakeId() != null){
+ //铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
+ sv.updateVirCardNoUseState(controller.getIntakeId());
+ }
+ }
+ }
+
+ }
}
--
Gitblit v1.8.0