From 001f24d4efd7b818bc2224b976c82faf4f9e564c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 01 十一月 2024 11:25:00 +0800
Subject: [PATCH] 1、通信协议要增加版本号（目的为远程升级准备），原来没有版本号的协议默认为版本号为1，所以调整了程序命名； 2、流浪控制器与控制器数据库表都增加了协议版本号字段； 3、VO中Double和Float类型的属性增加注解@JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlCreate.java | 45 ++++++++++-----------------------------------
1 files changed, 10 insertions(+), 35 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..e473475 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
@@ -1,6 +1,6 @@
package com.dy.common.mw.protocol.p206V202404.parse.global;
-import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
+import com.dy.common.mw.protocol.p206V1.ProtocolConstantV206V1;
import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.util.ByteUtil;
@@ -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,24 +131,18 @@
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 {
- int len = bsNoTail.length - ProtocolConstantV206V1_0_0.lenHead2ctrl;
- bsNoTail[ProtocolConstantV206V1_0_0.dataLenIndex] = (byte)len ;
+ int len = bsNoTail.length - ProtocolConstantV206V1.lenHead2ctrl;
+ bsNoTail[ProtocolConstantV206V1.dataLenIndex] = (byte)len ;
}
public static byte[] createCrcTail(byte[] bsNoTail) throws Exception {
- int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1_0_0.ctrlIndex, bsNoTail.length -1) ;
- byte[] bytes = new byte[ProtocolConstantV206V1_0_0.lenTail] ;
+ int crc = new CRC8_for_2_0().CRC8(bsNoTail, ProtocolConstantV206V1.ctrlIndex, bsNoTail.length -1) ;
+ byte[] bytes = new byte[ProtocolConstantV206V1.lenTail] ;
bytes[0] = (byte)crc ;
- bytes[1] = ProtocolConstantV206V1_0_0.P_Tail_Byte ;
+ bytes[1] = ProtocolConstantV206V1.P_Tail_Byte ;
return bytes ;
}
--
Gitblit v1.8.0