From c3a0cb8e8d8025e3937149b64a604b8989b2de18 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 03 六月 2025 16:46:24 +0800 Subject: [PATCH] 1、表阀一体机阀门状态命令结果输出与测控一体阀做兼容; 2、虚拟卡状态写入时机进行修改,由原来的阶段写簇变成随时写入。 --- 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