From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 31 十月 2024 08:34:42 +0800
Subject: [PATCH] 1、协议解析中，关阀报（83）中的RTU时钟改为关阀时间，但代码误注解掉了这行代码，修改之； 2、通信中间件测试web系统增加查询所在在线情况的命令下发。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
index d6fdf2c..60cf969 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_83_Up.java
@@ -196,7 +196,7 @@
//cdData.rtuDt = GlParse.parseTp(bs, index) ;
//2024-10-27 鍒樻鼎鐜夛細鑻忔湁鍕嬫妸鍗忚涓殑鎺у埗鍣ㄦ椂閽熺粰鍒犻櫎鎺変簡锛堢洰鐨勬槸鑺傜害瀛樺偍绌洪棿锛�
//澶勭悊鍔炴硶鏄妸鍏抽榾鏃堕棿浣滀负鎺у埗鍣ㄦ椂閽燂紝杩欎袱涓椂闂寸浉宸笉鍒颁竴鍒嗛挓
- //cdData.rtuDt = cdData.closeDt ;
+ cdData.rtuDt = cdData.closeDt ;
//index += 6 ;
}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
index f84e95a..b58b9f6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-mwTest-web/src/main/java/com/dy/pipIrrMwTestWeb/p206V1_0_0/CommandP206V1_0_0Ctrl.java
@@ -37,6 +37,8 @@
rt = this.recoverTcpSv() ;
}else if(com.equals(CodeLocal.mwState)){
rt = this.mwState() ;
+ }else if(com.equals(CodeLocal.onLine)){
+ rt = this.mwAllOnLine() ;
}else if(com.equals("10")){
rt = this.cd10() ;
}else if(com.equals("21")){
@@ -114,6 +116,10 @@
return this.sendCom2Mw(this.commandLocal(CodeLocal.mwState, null, null)) ;
}
+ private BaseResponse mwAllOnLine(){
+ return this.sendCom2Mw(this.commandLocal(CodeLocal.onLine, null, null)) ;
+ }
+
private BaseResponse cd10(){
Com10Vo comVo = new Com10Vo() ;
comVo.rtuAddr = "532328059995" ;//鍓�6浣嶆槸琛屾斂鍖哄垝鐮侊紝鍚�6浣嶆槸搴忓垪鍙锋渶澶ф槸065535
--
Gitblit v1.8.0