From 6cf345bc8fe98d393320b89182f9293171aa19ff Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 四月 2025 16:39:55 +0800
Subject: [PATCH] 1、根据江海协议中开阀类型变化，修改相应代码； 2、江海协议RTU模拟器启动参数注释。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java | 9 +++++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java | 34 ++++++++++++++++++----------------
2 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
index 1e71d09..f21a76e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/CommonV202404.java
@@ -253,19 +253,21 @@
}
/**
- * 0x01锛氬埛鍗″紑闃�
- * 0x02锛氫腑蹇冪珯寮�闃�
- * 0x08锛氱敤鎴稟pp杩滅▼寮�闃�
- * 0x0B锛氬贰妫�鍗″紑闃�
+ * 0x00:姝ｅ父鍒峰崱寮�娉�/闃�鐢ㄦ按
+ * 0x01:骞冲彴杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x02:鐢ㄦ埛杩滅▼寮�娉�/闃�鐢ㄦ按
+ * 0x03:娴嬭瘯鍗★紝
+ * 0x04:鍏跺畠
* @param type
* @return
*/
public static String openValveType(byte type){
return switch (type) {
- case 1 -> "鍒峰崱寮�闃�";
- case 2 -> "涓績绔欏紑闃�";
- case 8 -> "鐢ㄦ埛App杩滅▼寮�闃�";
- case 11 -> "宸℃鍗″紑闃�";
+ case 0 -> "鍒峰崱寮�闃�";
+ case 1 -> "涓績绔欏紑闃�";
+ case 2 -> "鐢ㄦ埛杩滅▼寮�闃�";
+ case 3 -> "娴嬭瘯鍗″紑闃�";
+ case 4 -> "鍏跺畠寮�闃�";
default -> "鏈煡";
};
}
@@ -279,10 +281,10 @@
*/
public static byte openType2P206V1(byte type){
return switch (type) {
- case 1 -> (byte)1 ;
- case 2 -> (byte)3 ;
- case 8 -> (byte)3 ;
- case 11 -> (byte)11 ;
+ case 0 -> (byte)1 ;
+ case 1 -> (byte)3 ;
+ case 2 -> (byte)8 ;
+ case 3 -> (byte)11 ;
default -> (byte)-1;
};
}
@@ -344,13 +346,13 @@
public static byte closeType2P206V1(byte type){
return switch (type) {
case 0 -> (byte)2;
- case 1,2 -> (byte)4;
+ case 1,11 -> (byte)4;
+ case 2 -> (byte)9;
case 3 -> (byte)12;
- case 4,5 -> (byte)6;
- case 6,7,10 -> (byte)5;
+ case 4,5,10 -> (byte)6;
+ case 6,7 -> (byte)5;
case 8 -> (byte)16;
case 9,12 -> (byte)7;
- case 11 -> (byte)9;
default -> (byte)-1;
};
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java
index 1473f15..5c994c3 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu202404/src/main/java/com/dy/simRtu202404/PipIrrMwSimulateRtu202404Application.java
@@ -33,6 +33,15 @@
)
public class PipIrrMwSimulateRtu202404Application implements CommandLineRunner {
+ /**
+ * 鍙傛暟0锛歳tu鍦板潃
+ * 鍙傛暟1锛欼C鍗″湴鍧�
+ * 鍙傛暟2锛欼C鍗＄紪鍙�
+ * 鍙傛暟3锛氶�氫俊涓棿浠禝P
+ * 鍙傛暟4锛氶�氫俊涓棿浠剁鍙�
+ * 鍙傛暟5锛氳繍琛屾柟寮忥紙0锛氬彧涓婃姤蹇冭烦锛�1锛氫笂鎶ュ績璺� + 1娆★紙寮�闃�锛夛紱2锛氫笂鎶ュ績璺� + 1娆★紙鍏抽榾锛夛紱3锛氫笂鎶ュ績璺� + 1娆★紙寮�闃� + 鍏抽榾锛夛紱4锛氫笂鎶ュ績璺� +
+ * @param args
+ */
public static void main(String[] args) {
parseArg0(args, 0) ;
parseArg1(args, 1) ;
--
Gitblit v1.8.0