From fc320221d1972a3e799abc5eefd74946f8e93603 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 01 七月 2024 14:22:25 +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 | 6 ++++--
1 files changed, 4 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 1828835..f2fe40d 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
@@ -106,7 +106,8 @@
alarmVo==null?null:alarmVo.alarmEleLowVolt,
alarmVo==null?null:alarmVo.stateIcEnable,
(byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
- (byte)0//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0//渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
) ;
sv.saveRmAlarmStateLast(po) ;
}else{
@@ -153,7 +154,8 @@
alarmVo==null?null:alarmVo.alarmEleLowVolt,
alarmVo==null?null:alarmVo.stateIcEnable,
(byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
- (byte)0//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0,//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
+ (byte)0//渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
) ;
sv.saveRmAlarmStateHistory(po) ;
}
--
Gitblit v1.8.0