From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中,关阀报(83)中的RTU时钟改为关阀时间,但代码误注解掉了这行代码,修改之; 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
index 20c1317..7ddfe10 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java
@@ -2,20 +2,22 @@
import com.dy.rtuMw.server.forTcp.TcpSessionCache;
+import java.util.HashMap;
+
public class RtuOnLineDeal {
/**
* 鏌ヨ鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
*/
- public RtuOnLineVo dealAll(){
- return (new RtuOnLineVo()).setOnLine(TcpSessionCache.allOnLine());
+ public HashMap<String, Boolean> dealAll(){
+ return TcpSessionCache.allOnLine();
}
/**
* 鏌ヨ鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
*/
- public RtuOnLineVo dealPart(String[] rtuAddrGrp){
- return (new RtuOnLineVo()).setOnLine(TcpSessionCache.partOnLine(rtuAddrGrp));
+ public HashMap<String, Boolean> dealPart(String[] rtuAddrGrp){
+ return TcpSessionCache.partOnLine(rtuAddrGrp) ;
}
}
--
Gitblit v1.8.0