From 656aa4f953eb52502a6414965e46642c31b6e8ee Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 29 四月 2025 15:33:09 +0800
Subject: [PATCH] 设备会在多种功能码上报数据中携带报警与状态数据,这样数据库保存设备报警与状态数据可能很多,为此修改逻辑,当前实现为一设备一个小时内只保存一条报警与状态数据。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
index 21a6d95..7ef41eb 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
@@ -43,9 +43,9 @@
         Data d = (Data)data ;
         String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
         if(d.subData != null && d.subData instanceof DataV202404){
-            DataV202404 dataV1 = (DataV202404)d.subData ;
-            if(dataV1.subData != null && dataV1.subData instanceof DataCd02Vo){
-                //杩囨护鎺夊績璺虫暟鎹�
+            DataV202404 dataV202404 = (DataV202404)d.subData ;
+            if(dataV202404.subData != null && (dataV202404.subData instanceof DataCd8AVo || dataV202404.subData instanceof DataCd02Vo)){
+                //杩囨护鎺夌櫥褰曞拰蹇冭烦鏁版嵁锛屼絾绗竴娆′笉杩囨护
                 if(onceUpDataRtus.containsKey(rtuAddr)){
                     return ;
                 }

--
Gitblit v1.8.0