From 22acc39ce207d951c6dcadbcb1cc68e27059d595 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 17:19:20 +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/p206V202404/parse/global/GlCreate.java | 33 ++++-----------------------------
1 files changed, 4 insertions(+), 29 deletions(-)
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 9a0db38..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,35 +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) ;
+
+ byte week = DateTime.week_Int().byteValue() ;
byte month = Byte.parseByte(DateTime.MM()) ;
- byte week = (byte)(DateTime.week_Int().byteValue() << 1) ;
- String month1 = "0" ;
- String month2 = "0" ;
if(month < 10){
- month1 = "" + month ;
+ bs[index + 4] = (byte)((week << 5) | month) ;
}else{
- if(month == 10){
- month1 = "0" ;
- }else if(month == 11){
- month1 = "1" ;
- }else if(month == 12){
- month1 = "2" ;
- }
- week = (byte)(week | 0x01) ;
+ bs[index + 4] = (byte)((week << 5) | 0x10 | (month - 10)) ;
}
- month2 = "" + week ;
- ByteUtil.string2BCD_BE(bs, month2 + month1, index + 4) ;
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()) ;
- */
}
public static void createS2D(byte[] bs, int index) throws Exception {
@@ -150,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