From d9d08181a94d727a4fe5933ac9efd1ff5c8a7c5a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 16 七月 2025 13:49:13 +0800
Subject: [PATCH] 中间件修改内容： 1、当没农业综合站时即没相关配置项目内容为空时，启动时会产生bug； 2、整理优化代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/mqtt/DevStatusDealer.java | 16 +++++++++++++---
1 files changed, 13 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..35f3c71 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;
@@ -43,6 +43,16 @@
return rsMap ;
}
}
+
+ public static Boolean oneOnLine(String devId){
+ synchronized (map){
+ DevStatus st = map.get(devId) ;
+ if(st != null){
+ return st.onLine ;
+ }
+ return false ;
+ }
+ }
/**
* 缁熻鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
*/
@@ -55,7 +65,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 +176,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