From 0c870ae5b2af348e19b10cc1a99f103f95c5a1cc Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期六, 21 六月 2025 11:47:09 +0800 Subject: [PATCH] 1、通信中间件重构MQTT相关下行命令的逻辑; 2、remote模块完善MQTT相关下行命令解除报警、搅拌启停、注肥启停、灌溉启停功能类; --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/DevStatusDealer.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/mqtt/DevStatusDealer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/DevStatusDealer.java index c164c0a..d3b2f2b 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/DevStatusDealer.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/DevStatusDealer.java @@ -1,6 +1,6 @@ package com.dy.rtuMw.server.mqtt; -import com.dy.common.mw.protocol4Mqtt.status.DevRunSt; +import com.dy.common.mw.protocol4Mqtt.status.DevRunInfo; import com.dy.rtuMw.server.forTcp.RtuLogDealer; import com.dy.rtuMw.server.local.localProtocol.RtuOnLineStateStatisticsVo; @@ -55,7 +55,7 @@ Map.Entry<String, DevStatus> entry = null ; while(it.hasNext()){ entry = it.next() ; - if(((DevStatus)entry).onLine != null && ((DevStatus)entry).onLine.booleanValue()){ + if((entry.getValue()).onLine != null && (entry.getValue()).onLine.booleanValue()){ vo.onLineNum++ ; }else{ vo.offLineNum++ ; @@ -166,7 +166,7 @@ } } - public static void setStatus(String devId, DevRunSt st){ + public static void setStatus(String devId, DevRunInfo st){ DevStatus vo = map.get(devId) ; if(vo != null) { if(st.stirRunning != null){ -- Gitblit v1.8.0