From 9a332594f1efa890997f9ba8d3a4d964f1b68b72 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期一, 30 六月 2025 08:57:39 +0800 Subject: [PATCH] 1、中间件设备日志文件针对FBox设备优化;2、表阀一体机功能码92返回结果判断bug修改;3、remote模块中实现表阀一体机协议的功能码9D(正常远程关阀)。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkFindPSdV1.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/pSdV1/TkFindPSdV1.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkFindPSdV1.java index eec2554..3ae2995 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkFindPSdV1.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/pSdV1/TkFindPSdV1.java @@ -1,6 +1,7 @@ package com.dy.rtuMw.server.rtuData.pSdV1; -import com.dy.common.mw.protocol4Mqtt.pSdV1.MqttSubMsgSdV1; +import com.dy.common.mw.protocol4Mqtt.MqttSubMsg; +import com.dy.common.mw.protocol4Mqtt.pSdV1.ProtocolConstantSdV1; import com.dy.rtuMw.server.rtuData.TaskSurpport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -24,8 +25,11 @@ @Override public void execute(Object data) { //鍓嶉潰鐨勪换鍔″凡缁忓垽鏂簡data涓嶄负绌� - MqttSubMsgSdV1 msg = (MqttSubMsgSdV1)data ; - log.info(msg.toString()); + MqttSubMsg msg = (MqttSubMsg)data ; + if(msg.protocol.equals(ProtocolConstantSdV1.protocolName + ProtocolConstantSdV1.protocolVer)){ + //灞变笢sd1鍗忚 + this.toNextTasks(data); + } } } -- Gitblit v1.8.0