From 981a099cdced2be1c87f4c4bdeab4f83705d7e83 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 05 十一月 2024 11:56:29 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Notify.java | 4 ++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java | 6 ++++--
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java | 2 +-
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/NotifyInfo.java | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Notify.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Notify.java
index a6a1006..e1b1bde 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Notify.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Notify.java
@@ -3,7 +3,7 @@
/**
* @Author: liurunyu
* @Date: 2024/11/3 13:12
- * @Description 鍙湁椹卞姩+鍗忚瑙ｆ瀽鍣ㄦ墠鐭ラ亾RTU鐪熷疄鐨勭姸鎬侊紝鎵�璁ゆ彁渚涙鎺ュ彛锛屽悜澶栭�氱煡璁惧鐨勪竴浜涚姸鎬�
+ * @Description 鍙湁椹卞姩+鍗忚瑙ｆ瀽鍣ㄦ墠鐭ラ亾RTU鐪熷疄鐨勭姸鎬侊紝鎵�浠ユ彁渚涙鎺ュ彛锛屽悜澶栭�氱煡璁惧鐨勪竴浜涚姸鎬�
*/
public interface Notify {
/**
@@ -13,7 +13,7 @@
* @param protocolVersion
* @param info
*/
- public void notify(String rtuAddr,
+ void notify(String rtuAddr,
String protocolName,
Short protocolVersion,
NotifyInfo ...info) ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/NotifyInfo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/NotifyInfo.java
index 7e88e17..87b209b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/NotifyInfo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/NotifyInfo.java
@@ -3,7 +3,7 @@
/**
* @Author: liurunyu
* @Date: 2024/11/3 13:12
- * @Description
+ * @Description 椹卞姩妯″潡閫氱煡鐨勪俊鎭紝鏍囪瘑绫绘帴鍙ｏ紝鏃犲叿浣撴柟娉�
*/
public interface NotifyInfo {
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java
index 43fd2db..fb408c2 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/CommonV1.java
@@ -15,7 +15,7 @@
public Boolean isThisProtocolHead(byte[] bs) throws Exception{
if(bs == null){
return null ;
- }else if(bs.length >= (ProtocolConstantV206V1.ctrlIndex - 1)
+ }else if(bs.length >= (ProtocolConstantV206V1.ctrlIndex)
&& bs[0] == ProtocolConstantV206V1.P_Head_Byte
&& bs[2] == ProtocolConstantV206V1.P_Head_Byte){
//String vs = this.parseVersion(bs) ;
@@ -32,7 +32,9 @@
* @throws Exception 寮傚父
*/
public void checkHead(byte[] bs) throws Exception{
- if(bs.length < ProtocolConstantV206V1.onLineDataMinLength || bs[0] != ProtocolConstantV206V1.P_Head_Byte || bs[2] != ProtocolConstantV206V1.P_Head_Byte){
+ if(bs.length < ProtocolConstantV206V1.onLineDataMinLength
+ || bs[0] != ProtocolConstantV206V1.P_Head_Byte
+ || bs[2] != ProtocolConstantV206V1.P_Head_Byte){
throw new Exception("涓婅鏁版嵁甯уご涓嶆纭紒") ;
}
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
index 1381905..a0d3c47 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/CommonV2.java
@@ -15,7 +15,7 @@
public Boolean isThisProtocolHead(byte[] bs) throws Exception{
if(bs == null){
return null ;
- }else if(bs.length >= (ProtocolConstantV206V2.ctrlIndex - 1)
+ }else if(bs.length >= (ProtocolConstantV206V2.ctrlIndex)
&& bs[ProtocolConstantV206V2.headFlag1Index] == ProtocolConstantV206V2.P_Head_Byte
&& bs[ProtocolConstantV206V2.headFlag2Index] == ProtocolConstantV206V2.P_Head_Byte){
Short vs = this.parseVersion(bs) ;
--
Gitblit v1.8.0