From b2c928eac40c4b7f495f8164eeb59005219fa350 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 11 六月 2025 17:55:29 +0800
Subject: [PATCH] 1、MQTT协议,增加设备参数命令及相关数据; 2、完善上行数据值对象; 3、完善其他代码。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java
index 661696d..8085e91 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/MqttManager.java
@@ -3,8 +3,8 @@
 import com.dy.common.mw.channel.mqtt.MqttClientPool;
 import com.dy.common.mw.protocol4Mqtt.MqttNotify;
 import com.dy.common.mw.protocol4Mqtt.MqttNotifyInfo;
-import com.dy.common.mw.protocol4Mqtt.status.DevOnLineSt;
-import com.dy.common.mw.protocol4Mqtt.status.DevRunSt;
+import com.dy.common.mw.protocol4Mqtt.status.DevOnLineInfo;
+import com.dy.common.mw.protocol4Mqtt.status.DevRunInfo;
 import com.dy.rtuMw.server.ServerProperties;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -77,15 +77,15 @@
                             public void notify(String devId, MqttNotifyInfo... infos) {
                                 if(devId != null && infos != null && infos.length > 0){
                                     for(MqttNotifyInfo info : infos){
-                                        if(info instanceof DevOnLineSt){
-                                            DevOnLineSt onLineSt = (DevOnLineSt)info;
+                                        if(info instanceof DevOnLineInfo){
+                                            DevOnLineInfo onLineSt = (DevOnLineInfo)info;
                                             if(onLineSt.onLine != null && onLineSt.onLine.booleanValue()){
-                                                DevStatusDealer.onLine(devId, ((DevOnLineSt)info).protocol);
+                                                DevStatusDealer.onLine(devId, ((DevOnLineInfo)info).protocol);
                                             }else{
                                                 DevStatusDealer.offLine(devId);
                                             }
-                                        } else if(info instanceof DevRunSt){
-                                            DevStatusDealer.setStatus(devId, (DevRunSt)info);
+                                        } else if(info instanceof DevRunInfo){
+                                            DevStatusDealer.setStatus(devId, (DevRunInfo)info);
                                         }
                                     }
                                 }

--
Gitblit v1.8.0