From 14d7f0df63340ede75458c0e91b902376ef4dd64 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 20 十一月 2024 11:26:32 +0800
Subject: [PATCH] 1、优化代码；2、修改长级测试中发现的bug；3、通信中间件配置文件配置项修改
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-simulate-rtu/src/main/java/com/dy/simRtu/tcpClient/downData/DownData.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 33709d1..6211d7b 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
@@ -12,7 +12,7 @@
public class DownData {
public void parseData(byte[] bs){
- if(bs != null && bs.length >= ProtocolConstantV206V1.lenHead2Code){
+ if(bs != null && bs.length > 0){
if(bs.length >= (ProtocolConstantV206V1.ctrlIndex)
&& bs[0] == ProtocolConstantV206V1.P_Head_Byte
&& bs[2] == ProtocolConstantV206V1.P_Head_Byte){
@@ -29,12 +29,12 @@
//搴旇鏄摼璺娴嬫暟鎹�
}
private void dealUpgrade(byte[] bs){
- String cdPre = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.codeIndex, 1);
+ String cdPre = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.UG_codeIndex, 1);
if(cdPre.equals("16")){
//鍗囩骇鍔熻兘鐮�
UpHeartBeat.upHeartBeat = false ;//涓嶄笂琛屽績璺�
- if(bs.length >= ProtocolConstantV206V1.lenHead2Code + 1){
- String cdSuf = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.codeIndex + 1, 1);
+ if(bs.length >= ProtocolConstantV206V1.UG_lenHead2Cmd + 1){
+ String cdSuf = ByteUtil.bytes2Hex(bs, false, ProtocolConstantV206V1.UG_codeIndex + 1, 1);
String cd = cdPre + cdSuf;
if(cd.equals("1601")){
//鍗囩骇閰嶇疆
--
Gitblit v1.8.0