From 3fe912a1d0ceca7cd0281e26b798b55b539ec2cd Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 15 十月 2024 15:19:56 +0800
Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑,对于当天发现的控制器,控制器计算的漏损量一定不正确,强制设置成0;

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java |    5 +++--
 1 files changed, 3 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 3686852..3dd8e8b 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
@@ -82,7 +82,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 +107,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{

--
Gitblit v1.8.0