From 7bce3a96c4a1a61a2c299be033c3fb798648ad78 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 十月 2024 15:05:49 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 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..927c1b0 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.*;
@@ -23,12 +23,16 @@
return this.clock(com) ;
}else if(code.equals(CodeLocal.onLine)){
return this.onLine(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()) ;
}
@@ -52,6 +56,15 @@
}
/**
+ * 缁熻鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
+ * @throws Exception
+ */
+ private Command onLineStateStatistics(Command command) throws Exception{
+ RtuOnLineStateStatisticsVo vo = new RtuOnLineStateStatisticsDeal().deal() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈夋祴绔欏湪绾挎儏鍐电粨鏋�", command.getId(), command.getCode(), vo) ;
+ }
+
+ /**
* 鏌ヨ鎵�鏈塕TU鍗忚閰嶇疆
* @throws Exception
*/
@@ -65,7 +78,7 @@
* @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 {
}
@@ -84,4 +97,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