From 39be193dece5ad6314aa22a41a2c8675e8057be3 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 12 十一月 2024 15:19:36 +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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 3686852..837e2f0 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
@@ -12,6 +12,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.util.Date;
+
/**
* @Author liurunyu
* @Date 2024/5/8 14:18
@@ -82,7 +84,7 @@
String rtuDt,
AlarmVo alarmVo,
String receiveDt) throws Exception {
- RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ;
+ RmAlarmStateLast po = sv.getRmAlarmStateLast(controller.getIntakeId()) ;
if(po == null){
po = new RmAlarmStateLast(null,
controller==null?null:controller.getId(),
@@ -107,7 +109,8 @@
alarmVo==null?null:alarmVo.stateIcEnable,
(byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�)
(byte)0,//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�)
- (byte)0//渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
+ (byte)0,//渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛�
+ System.currentTimeMillis()
) ;
sv.saveRmAlarmStateLast(po) ;
}else{
@@ -210,7 +213,8 @@
//闃�闂ㄥ叧闂姸鎬�
if(controller != null && controller.getIntakeId() != null){
//铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵��
- sv.updateVirCardNoUseState(controller.getIntakeId());
+ Date now = new Date() ;
+ sv.updateVirCardNoUseState(controller.getIntakeId(), now);
}
}
}
--
Gitblit v1.8.0