From dd694b8a3d05e2d785413182e1c28b25a5b3f431 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 20 十二月 2023 17:24:08 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java
index 263786c..cca3779 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/console/Command.java
@@ -20,7 +20,8 @@
commands = new String[]{
"config 鏌ョ湅閰嶇疆淇℃伅",
"show 鏄剧ずmwTest鎯呭喌",
- "start 鍚姩mwTest涓婃姤鏁版嵁",
+ "start 鍚姩mwTest寤虹珛TCP杩炴帴鏁版嵁",
+ "report 鍚姩mwTest RTU涓婃姤鏁版嵁",
"exit 閫�鍑�",
};
}
@@ -35,7 +36,9 @@
} else if (command.equals("show")) {
show(prtWrt);
} else if (command.equals("start")) {
- start(prtWrt);
+ startNetConnect(prtWrt);
+ } else if (command.equals("report")) {
+ startRtuReport(prtWrt);
} else if(command.equals("exit")){
exit = true ;
} else {
@@ -101,9 +104,14 @@
prtWrt.println(" rtuAddr鑼冨洿锛�" + sta.confVo.rtuAddrStart + "--" + sta.confVo.rtuAddrEnd);
}
if(sta.startVo != null){
- prtWrt.println(" 涓婃姤鏁版嵁锛�" + (sta.startVo.start?"宸茬粡寮�濮�":"鏈紑濮�"));
+ prtWrt.println(" TCP杩炴帴锛�" + (sta.startVo.start?"宸茬粡寮�濮�":"鏈紑濮�"));
}else{
- prtWrt.println(" 涓婃姤鏁版嵁锛氭湭寮�濮�") ;
+ prtWrt.println(" TCP杩炴帴锛氭湭寮�濮�") ;
+ }
+ if(sta.reportVo != null){
+ prtWrt.println(" RTU涓婃姤鏁版嵁锛�" + (sta.reportVo.report?"宸茬粡寮�濮�":"鏈紑濮�"));
+ }else{
+ prtWrt.println(" RTU涓婃姤鏁版嵁锛氭湭寮�濮�") ;
}
if(sta.count != null){
prtWrt.println(" 宸茬粡涓婃姤鏁版嵁锛�" + sta.count + "鏉�");
@@ -120,11 +128,18 @@
prtWrt.println("");
}
- private static void start(PrintWriter prtWrt){
+ private static void startNetConnect(PrintWriter prtWrt){
prtWrt.println("");
- prtWrt.println(" 宸茬粡鍏佽mwTest涓婃姤鏁版嵁浜�");
+ prtWrt.println(" 宸茬粡鍏佽mwTest寤虹珛TCP杩炴帴");
prtWrt.println("");
- Manager.enablemwTestStart = true ;
+ Manager.enablemwTestStartTcpConnect = true ;
+ }
+
+ private static void startRtuReport(PrintWriter prtWrt){
+ prtWrt.println("");
+ prtWrt.println(" 宸茬粡鍏佽mwTest RTU涓婃姤鏁版嵁浜�");
+ prtWrt.println("");
+ Manager.enablemwTestStartRtuReport = true ;
}
--
Gitblit v1.8.0