From 3cf13ad3251d86fa4025e4a248f600c6b56c7e8f Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 17:11:45 +0800
Subject: [PATCH] 江海协议相关完善代码
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 22 ++++------------------
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java | 1 -
2 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
index 7966f6f..a212efb 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_80_Down.java
@@ -52,7 +52,6 @@
bs[0] = (byte)(Integer.parseInt(cdData.getControllerType(), 16));
bs[1] = cdData.projectNo.byteValue() ;
bs[2] = 0x01 ;//01:鎴愬姛 81:澶辫触
- //GlCreate.createTp(bs, 2) ;
bytes = ByteUtil.bytesMerge(bytes, bs) ;
}else{
throw new Exception("涓嬭鍛戒护鍙傛暟鎹负null") ;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
index df5a0b8..17e4e73 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java
@@ -114,24 +114,16 @@
ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
- //浠ヤ笅鍐欐硶鑷劧涔熸槸BCD
+
byte week = DateTime.week_Int().byteValue() ;
byte month = Byte.parseByte(DateTime.MM()) ;
if(month < 10){
- bs[index + 4] = (byte)(week << 5 | month) ;
+ bs[index + 4] = (byte)((week << 5) | month) ;
}else{
- bs[index + 4] = (byte)(week << 5 | 0x10 | (month - 10)) ;
+ bs[index + 4] = (byte)((week << 5) | 0x10 | (month - 10)) ;
}
- ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
- /*
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
- bs[index + 4] = (byte)(DateTime.week_Int().byteValue() << 5 | Byte.parseByte(DateTime.MM())) ;
- bs[index + 5] = Byte.parseByte(DateTime.yy()) ;
- */
+ ByteUtil.string2BCD_BE(bs, DateTime.yy(), index + 5) ;
}
public static void createS2D(byte[] bs, int index) throws Exception {
@@ -139,12 +131,6 @@
ByteUtil.string2BCD_BE(bs, DateTime.mm(), index + 1) ;
ByteUtil.string2BCD_BE(bs, DateTime.HH(), index + 2) ;
ByteUtil.string2BCD_BE(bs, DateTime.dd(), index + 3) ;
- /*
- bs[index] = Byte.parseByte(DateTime.ss()) ;
- bs[index + 1] = Byte.parseByte(DateTime.mm()) ;
- bs[index + 2] = Byte.parseByte(DateTime.HH()) ;
- bs[index + 3] = Byte.parseByte(DateTime.dd()) ;
- */
}
public static void createLen(byte[] bsNoTail) throws Exception {
--
Gitblit v1.8.0