From c70b92da60c0d00625da5fc2369b475e69e0b88e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 22 八月 2024 11:36:41 +0800
Subject: [PATCH] 1、完善代码和application.yml配置文件，去掉不用的引入文件； 2、init-config.xml配置中增加属性 enable,相应解析类也增加了解析与判断； 3、凡是有Server的应用，加载资源方式改为用springboot的工具类加载； 4、通信协议相关的扫描注解功能实现改为采用reflections-0.10.2，以实现可以在jar包情况下能够扫描类（.class）注解。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
index 4f5c820..deaeeed 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/Cd_8A_Up.java
@@ -83,7 +83,7 @@
*/
protected void doParse(byte[] bs, int bsLen, String dataCode, Data data) throws Exception {
DataV202404 dV1 = (DataV202404)data.getSubData() ;
- DataCd8AVo cdData = new DataCd8AVo() ;
+ DataCd8AVo cdData = new DataCd8AVo(CodeV202404.getCodeName(dataCode)) ;
dV1.subData = cdData ;
int index = ProtocolConstantV206V202404.dataIndex ;
cdData.controllerType = ByteUtil.bytes2Hex(bs, false, index, 1) ;
@@ -92,23 +92,23 @@
cdData.projectNo = (int)bs[index];
index++ ;
- int lng = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long lng = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.lng = lng/1000000.0D;
index += 5 ;
- int lat = ByteUtil.BCD2Int_BE(bs, index, index + 4) ;
+ Long lat = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
cdData.lat = lat/1000000.0D;
index += 5 ;
- int softVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ int softVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.softVersion = softVersion/10.0F;
index += 2 ;
- int hardVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ int hardVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.hardVersion = hardVersion/10.0F;
index += 2 ;
- int protocolVersion = ByteUtil.BCD2Int_BE(bs, index, index + 1) ;
+ int protocolVersion = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.protocolVersion = protocolVersion/10.0F;
}
--
Gitblit v1.8.0