From c42614978ff12013a1eabebd0289b27169a5784f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 06 五月 2025 17:25:56 +0800
Subject: [PATCH] 1、实现万功能token（0000-0000-1234-9876-5）； 2、web端单独实现命令结果等待器，并相应修改相关部分； 3、web端实现透传命令； 4、修改一些不当注释； 5、优化一些代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 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 3148b1d..d2f4740 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
@@ -3,9 +3,11 @@
import com.dy.common.mw.UnitCallbackInterface;
import com.dy.common.mw.channel.tcp.TcpUnit;
import com.dy.common.mw.protocol.Command;
+import com.dy.common.mw.protocol.rtuState.RtuStatus;
import com.dy.rtuMw.server.local.localProtocol.*;
import java.util.HashMap;
+import java.util.Map;
/**
* @Author liurunyu
@@ -29,6 +31,12 @@
return this.onPartLine(com) ;
}else if(code.equals(CodeLocal.onLineStatistics)){
return this.onLineStateStatistics(com) ;
+ }else if(code.equals(CodeLocal.allRtuStates)){
+ return this.allRtuStates(com) ;
+ }else if(code.equals(CodeLocal.partRtuStates)){
+ return this.someRtuStates(com) ;
+ }else if(code.equals(CodeLocal.oneRtuStates)){
+ return this.oneRtuStates(com) ;
}else if(code.equals(CodeLocal.allProtocols)){
return this.allProtocols(com) ;
}else if(code.equals(CodeLocal.stopTcpSv)){
@@ -83,6 +91,43 @@
}
/**
+ * 鏌ヨ鎵�鏈塕TU鐘舵��
+ * @throws Exception
+ */
+ private Command allRtuStates(Command command) throws Exception{
+ Map<String, RtuStatus> map = new RtuStatusDeal().dealAll() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鐘舵�佺粨鏋�", command.getId(), command.getCode(), map) ;
+ }
+
+ /**
+ * 鏌ヨ閮ㄥ垎RTU鐘舵��
+ * @throws Exception
+ */
+ private Command someRtuStates(Command command) throws Exception{
+ if(command.param != null && command.param instanceof String && !command.param.equals("")){
+ String[] rtuAddrGrp = ((String)command.param).split(",");
+ Map<String, RtuStatus> map = new RtuStatusDeal().dealSome(rtuAddrGrp) ;
+ return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鐘舵�佺粨鏋�", command.getId(), command.getCode(), map) ;
+ }else{
+ return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�涓�", command.getId(), command.getCode()) ;
+ }
+ }
+
+ /**
+ * 鏌ヨ閮ㄥ垎RTU鐘舵��
+ * @throws Exception
+ */
+ private Command oneRtuStates(Command command) throws Exception{
+ if(command.param != null && command.param instanceof String && !command.param.equals("")){
+ String rtuAddr = (String)command.param;
+ RtuStatus rtuStatus = new RtuStatusDeal().dealOne(rtuAddr) ;
+ return ReturnCommand.successed("鏌ヨ涓�涓猂TU鐘舵�佺粨鏋�", command.getId(), command.getCode(), rtuStatus) ;
+ }else{
+ return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�", command.getId(), command.getCode()) ;
+ }
+ }
+
+ /**
* 鏌ヨ鎵�鏈塕TU鍗忚閰嶇疆
* @throws Exception
*/
--
Gitblit v1.8.0