From dc86d90bdd25025ad44fc777c9956cac2e219bec Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 23 十月 2024 16:23:42 +0800
Subject: [PATCH] 通信中间件增加查询部分RTU在线情况内部命令
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 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 9ae2f68..1b25086 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
@@ -1,6 +1,6 @@
package com.dy.rtuMw.server.local;
-import com.dy.common.mw.UnitStartedCallbackInterface;
+import com.dy.common.mw.UnitCallbackInterface;
import com.dy.common.mw.channel.tcp.TcpUnit;
import com.dy.common.mw.protocol.Command;
import com.dy.rtuMw.server.local.localProtocol.*;
@@ -21,14 +21,20 @@
String code = com.getCode() ;
if(code.equals(CodeLocal.clock)){
return this.clock(com) ;
- }else if(code.equals(CodeLocal.onLine)){
- return this.onLine(com) ;
+ }else if(code.equals(CodeLocal.onAllLine)){
+ return this.onAllLine(com) ;
+ }else if(code.equals(CodeLocal.onPartLine)){
+ return this.onPartLine(com) ;
+ }else if(code.equals(CodeLocal.onLineStatistics)){
+ return this.onLineStateStatistics(com) ;
}else if(code.equals(CodeLocal.allProtocols)){
return this.allProtocols(com) ;
}else if(code.equals(CodeLocal.stopTcpSv)){
return this.stopTcpSv(com) ;
}else if(code.equals(CodeLocal.recoverTcpSv)){
return this.recoverTcpSv(com) ;
+ }else if(code.equals(CodeLocal.mwState)){
+ return this.mwInfo(com) ;
}
return ReturnCommand.errored("鍑洪敊锛屾敹鍒板唴閮ㄥ懡浠ょ殑鍔熻兘鐮佷笉鑳借瘑鍒紒", com.getId(), com.getCode()) ;
}
@@ -46,9 +52,32 @@
* 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌
* @throws Exception
*/
- private Command onLine(Command command) throws Exception{
- RtuOnLineVo ol = new RtuOnLineDeal().deal() ;
- return ReturnCommand.successed("鏌ヨ鎵�鏈夋祴绔欏湪绾挎儏鍐电粨鏋�", command.getId(), command.getCode(), ol) ;
+ private Command onAllLine(Command command) throws Exception{
+ RtuOnLineVo ol = new RtuOnLineDeal().dealAll() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), ol) ;
+ }
+
+ /**
+ * 鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌
+ * @throws Exception
+ */
+ 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) ;
+ }else{
+ return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�涓�", command.getId(), command.getCode()) ;
+ }
+ }
+
+ /**
+ * 缁熻鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
+ * @throws Exception
+ */
+ private Command onLineStateStatistics(Command command) throws Exception{
+ RtuOnLineStateStatisticsVo vo = new RtuOnLineStateStatisticsDeal().deal() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), vo) ;
}
/**
@@ -65,9 +94,8 @@
* @throws Exception
*/
private Command stopTcpSv(Command command) throws Exception{
- TcpUnit.getInstance().stop(new UnitStartedCallbackInterface(){
+ TcpUnit.getInstance().stop(new UnitCallbackInterface(){
public void call(Object obj) throws Exception {
-
}
});
return ReturnCommand.successed("宸茬粡鍚姩鍋滄TCP鏈嶅姟", command.getId(), command.getCode(), null) ;
@@ -84,4 +112,14 @@
+ /**
+ * 鏌ヨ閫氫俊涓棿浠惰繍琛屾儏鍐�
+ * @throws Exception
+ */
+ private Command mwInfo(Command command) throws Exception{
+ MwInfoVo mwInfo = new MwInfoDeal().deal() ;
+ return ReturnCommand.successed("鏌ヨ閫氫俊涓棿浠惰繍琛屾儏鍐�", command.getId(), command.getCode(), mwInfo) ;
+ }
+
+
}
--
Gitblit v1.8.0