From 0857b855609b1735a1583d69f8289a2d26950419 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 23 五月 2024 11:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_26_Down.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_26_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_26_Down.java
index fa0f86b..41e76da 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_26_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_26_Down.java
@@ -55,23 +55,17 @@
if(cvo == null){
throw new Exception("json杞珻omCd22Vo涓簄ull") ;
}
- if(cvo.ipChannel != 1 && cvo.ipChannel !=2){
- throw new Exception("IP閫氶亾鍙峰彧鑳芥槸1鎴�2") ;
- }
if(cvo.maxAmountYear < 0 || cvo.maxAmountYear > 99999999){
throw new Exception("璁惧缁堢骞寸敤姘撮噺蹇呴』鏄�0~99999999鑼冨洿鍐呯殑鏁存暟") ;
}
- byte[] bs = new byte[15] ;
+ byte[] bs = new byte[14] ;
int index = 0 ;
bs[index] = (byte)(Integer.parseInt(cvo.controllerType, 16));
index ++ ;
bs[index] = cvo.projectNo.byteValue() ;
-
- index ++ ;
- bs[index] = cvo.ipChannel.byteValue() ;
index ++ ;
String strTemp = "" + cvo.maxAmountYear ;
--
Gitblit v1.8.0