From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10:42 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-com-creator/src/main/java/com/dy/pipirrComCreator/console/Command.java | 107 ++++++-----------------------------------------------
1 files changed, 12 insertions(+), 95 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-com-creator/src/main/java/com/dy/pipirrComCreator/console/Command.java b/pipIrr-platform/pipIrr-mw/pipIrr-com-creator/src/main/java/com/dy/pipirrComCreator/console/Command.java
index 9a1622a..3a2aaa6 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-com-creator/src/main/java/com/dy/pipirrComCreator/console/Command.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-com-creator/src/main/java/com/dy/pipirrComCreator/console/Command.java
@@ -3,14 +3,9 @@
import com.dy.common.mw.protocol.p206V1.CodeV1;
import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.pipirrComCreator.ServerProperties;
-import com.dy.pipirrComCreator.p206V1.Cd02;
-import com.dy.pipirrComCreator.p206V1.Cd10;
-import com.dy.pipirrComCreator.p206V1.Cd92;
-import com.dy.pipirrComCreator.p206V1.Cd93;
+import com.dy.pipirrComCreator.p206V1.P206V1Deal;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
public class Command {
@@ -20,6 +15,7 @@
commands = new String[]{
"config 鏌ョ湅閰嶇疆淇℃伅",
"XY ... 鍗忚鍛戒护",
+ "XY -h 鍗忚鍛戒护甯姪",
"exit 閫�鍑�",
};
}
@@ -35,13 +31,17 @@
}else if(command.equals("exit")){
exit = true ;
}else if(isProtocolCom(command)){
- dealProtocolCom(command, prtWrt);
+ if(ServerProperties.protocolName.equals(ProtocolConstantV206V1.protocolName)){
+ P206V1Deal.dealProtocolCom(command, prtWrt);
+ }else{
+ out("褰撳墠涓嶆敮鎸佸崗璁�" + ServerProperties.protocolName, prtWrt) ;
+ }
}else {
outNoIdentify(prtWrt);
}
return exit ;
}
- private static boolean isProtocolCom(String command){
+ public static boolean isProtocolCom(String command){
if(ServerProperties.protocolName.equals(ProtocolConstantV206V1.protocolName)){
String[] coms = command.split(" ");
for (String com : coms){
@@ -56,89 +56,8 @@
}
return false ;
}
- private static void dealProtocolCom(String command, PrintWriter prtWrt) throws Exception{
- String[] coms = command.split(" ");
- List<String> comList = new ArrayList<>();
- for (String com : coms){
- if(!com.equals("")){
- comList.add(com) ;
- }
- }
- String com = comList.get(0) ;
- switch (com) {
- case CodeV1.cd_02: cd02(comList, prtWrt); break;
- case CodeV1.cd_10: cd10(comList, prtWrt); break;
- case CodeV1.cd_92: cd92(comList, prtWrt); break;
- case CodeV1.cd_93: cd93(comList, prtWrt); break;
- default: outNoIdentify(prtWrt); break;
- }
- }
- private static void cd02(List<String> comList, PrintWriter prtWrt)throws Exception{
- if(comList.size() > 1){
- String p = comList.get(1);
- if(p.equals("-h")){
- prtWrt.println("02[Enter](蹇冭烦鍛戒护搴旂瓟锛堥摼璺淮鎸佹姤搴旂瓟锛�)");
- }else{
- outNoIdentify(prtWrt) ;
- }
- }else{
- out(new Cd02().hex(ServerProperties.rtuAddr), prtWrt);
- }
- }
- private static void cd10(List<String> comList, PrintWriter prtWrt)throws Exception{
- if(comList.size() > 1){
- String p1 = comList.get(1);
- if(p1.equals("-h")){
- prtWrt.println("10 *...*[Enter](璁剧疆鎺у埗鍣ㄥ湴鍧�)");
- }else{
- String[] ps = params2Grp(comList) ;
- Cd10 cd = new Cd10() ;
- String msg = cd.checkParams(ps) ;
- if(msg == null){
- out(new Cd10().hex(ServerProperties.rtuAddr, ps), prtWrt);
- }else{
- out(msg, prtWrt);
- }
- }
- }else{
- outNoParams(prtWrt); ;
- }
- }
- private static void cd92(List<String> comList, PrintWriter prtWrt)throws Exception{
- if(comList.size() > 1){
- String p = comList.get(1);
- if(p.equals("-h")){
- prtWrt.println("92[Enter](骞冲彴杩滅▼寮�鍚榾闂�)");
- }else{
- outNoIdentify(prtWrt) ;
- }
- }else{
- out(new Cd92().hex(ServerProperties.rtuAddr), prtWrt);
- }
- }
- private static void cd93(List<String> comList, PrintWriter prtWrt)throws Exception{
- if(comList.size() > 1){
- String p = comList.get(1);
- if(p.equals("-h")){
- prtWrt.println("93[Enter](骞冲彴杩滅▼鍏抽棴闃�闂�)");
- }else{
- outNoIdentify(prtWrt) ;
- }
- }else{
- out(new Cd93().hex(ServerProperties.rtuAddr), prtWrt);
- }
- }
-
- private static String[] params2Grp(List<String> comList){
- String[] ps = new String[comList.size()-1] ;
- for(int i = 1; i < comList.size(); i++){
- ps[i-1] = comList.get(i) ;
- }
- return ps ;
- }
-
- private static void out(String str, PrintWriter prtWrt){
+ public static void out(String str, PrintWriter prtWrt){
prtWrt.println(str==null?"":str);
}
private static void outHelp(PrintWriter prtWrt){
@@ -149,7 +68,7 @@
}
prtWrt.println("");
}
- private static void outConfig(PrintWriter prtWrt){
+ public static void outConfig(PrintWriter prtWrt){
prtWrt.println("");
prtWrt.println("棰勫厛璁剧疆");
prtWrt.println(" 鍗忚锛�" + ServerProperties.protocolName);
@@ -159,18 +78,16 @@
prtWrt.println(" IC鍗＄紪鍙凤細" + ServerProperties.icCardNo);
prtWrt.println("");
}
- private static void outNoIdentify(PrintWriter prtWrt){
+ public static void outNoIdentify(PrintWriter prtWrt){
prtWrt.println("");
prtWrt.println("鍛戒护涓嶅彲璇嗗埆锛�");
prtWrt.println("");
}
- private static void outNoParams(PrintWriter prtWrt){
+ public static void outNoParams(PrintWriter prtWrt){
prtWrt.println("");
prtWrt.println("璇疯緭鍏ュ懡浠ゅ弬鏁帮紒");
prtWrt.println("");
}
-
-
public static void main(String[] args) {
--
Gitblit v1.8.0