From e9bbdda945e1afc6d52d45566e577bd309f1aaab Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 18:05:09 +0800
Subject: [PATCH] 修改通信中间件的查询在线情况返回数据类型
---
/dev/null | 39 ---------------------------------------
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineDeal.java | 10 ++++++----
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 10 ++++++----
3 files changed, 12 insertions(+), 47 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java
index 1b25086..3148b1d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java
@@ -5,6 +5,8 @@
import com.dy.common.mw.protocol.Command;
import com.dy.rtuMw.server.local.localProtocol.*;
+import java.util.HashMap;
+
/**
* @Author liurunyu
* @Date 2023/12/21 15:56
@@ -53,8 +55,8 @@
* @throws Exception
*/
private Command onAllLine(Command command) throws Exception{
- RtuOnLineVo ol = new RtuOnLineDeal().dealAll() ;
- return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), ol) ;
+ HashMap<String, Boolean> map = new RtuOnLineDeal().dealAll() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), map) ;
}
/**
@@ -64,8 +66,8 @@
private Command onPartLine(Command command) throws Exception{
if(command.param != null && command.param instanceof String && !command.param.equals("")){
String[] rtuAddrGrp = ((String)command.param).split(",");
- RtuOnLineVo ol = new RtuOnLineDeal().dealPart(rtuAddrGrp) ;
- return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), ol) ;
+ HashMap<String, Boolean> map = new RtuOnLineDeal().dealPart(rtuAddrGrp) ;
+ return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), map) ;
}else{
return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�涓�", command.getId(), command.getCode()) ;
}
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) ;
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineVo.java
deleted file mode 100644
index b8ee880..0000000
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/localProtocol/RtuOnLineVo.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.dy.rtuMw.server.local.localProtocol;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map.Entry;
-
-public class RtuOnLineVo implements Serializable{
-
- private static final long serialVersionUID = 202312211559001L;
-
- private HashMap<String , Boolean> onLineMap ;
-
- public String toString(){
- String s = "" ;
- if(onLineMap != null){
- Iterator<Entry<String, Boolean>> it = onLineMap.entrySet().iterator() ;
- Entry<String, Boolean> entry = null ;
- while(it.hasNext()){
- entry = it.next() ;
- s += entry.getKey() + ": " + (entry.getValue().booleanValue()?"鍦ㄧ嚎":"绂荤嚎") + "\n";
- }
- }
- return s ;
- }
- /**
- * 瀛樺叆RTU鍦ㄧ嚎鎯呭喌
- * @param onLineMap 鍦ㄧ嚎闆嗗悎
- */
- public RtuOnLineVo setOnLine(HashMap<String , Boolean> onLineMap){
- this.onLineMap = onLineMap ;
- return this ;
- }
-
- public HashMap<String, Boolean> getOnLineMap() {
- return onLineMap;
- }
-
-}
--
Gitblit v1.8.0