From 7f3cae29516a35e85e4b6fc02ec655882d4c2538 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 08 五月 2025 11:55:24 +0800
Subject: [PATCH] 1、测控一体阀协议功能码50补充实现； 2、RTU模拟器模拟实现50、91、92功能码上报； 3、remote模块：完善透传命令实现，完善接收通信中间件返回命令结果实现。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java
index c4aeaf7..7f64bf3 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java
@@ -30,7 +30,16 @@
}
}
private void dealP206V1(byte[] bs){
- //搴旇鏄摼璺娴嬫暟鎹�
+ String cdPre = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.codeIndex, 1);
+ if(cdPre.equals("50")){
+ UpCd50.upData() ;
+ }else if(cdPre.equals("66")){
+ UpCd66.upData() ;
+ }else if(cdPre.equals("91")){
+ UpCd91.upData() ;
+ }else if(cdPre.equals("92")){
+ UpCd92.upData() ;
+ }
}
private void dealUpgrade(byte[] bs){
String cdPre = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.UG_codeIndex, 1);
@@ -42,20 +51,27 @@
String cd = cdPre + cdSuf;
if(cd.equals("1601")){
//鍗囩骇閰嶇疆
- if(ServerProperties.argOneDie){
- UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
- }
UpCd9601.upData() ;
+
}else if(cd.equals("1602")){
//鍗囩骇鏁版嵁
- UpCd9602.upData() ;
count9602 ++ ;
- if(ServerProperties.argMultiDie){
- if(count9602 > 10){
- int random = CreateRandom.create_between(10, 100) ;
- if(random > 50){
- UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ if(ServerProperties.argOneDie){
+ UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ }else{
+ if(ServerProperties.argMultiDie){
+ if(count9602 > 10){
+ int random = CreateRandom.create_between(10, 100) ;
+ if(random > 90){
+ UpHeartBeat.upHeartBeat = true ;//浣胯兘涓婅蹇冭烦
+ }else{
+ UpCd9602.upData() ;
+ }
+ }else{
+ UpCd9602.upData() ;
}
+ }else{
+ UpCd9602.upData() ;
}
}
}else if(cd.equals("1603")){
--
Gitblit v1.8.0