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/p206V1_0_0/parse/Cd_84_Up.java | 70 ++++++++--------------------------
1 files changed, 17 insertions(+), 53 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
index e4fd9cd..a5f7245 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/Cd_84_Up.java
@@ -88,70 +88,34 @@
dV1.subData = cdData ;
short index = ProtocolConstantV206V1_0_0.dataIndex ;
- cdData.opType = bs[index] ;
+ cdData.opType = (byte)ByteUtil.BCD2Int_LE(bs[index]) ;
index++ ;
cdData.cardType = bs[index] ;
index++ ;
- cdData.cardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
+ cdData.cardAddr = ByteUtil.bytes2Hex_LE(bs, false, index, 4) ;
index += 4 ;
- //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�5瀛楄妭BCD鐮佷綆浣嶅湪鍓嶉珮浣嶅湪鍚庛��
- cdData.cardNo = ByteUtil.BCD2String_LE(bs, index, index + 4) ;
+ //鐢ㄦ按鎴峰彿鏁版嵁鏍煎紡锛�8瀛楄妭浣庝綅鍦ㄥ墠楂樹綅鍦ㄥ悗銆�
+ cdData.cardNo = GlParse.parseIcCardNo(bs, index) ;
+
+ index += 8 ;
+ //鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
+ int tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
+ cdData.remainMoney = tpInt/100.0 ;
+
+ index += 4 ;
+ //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
+ cdData.totalAmount = tpInt/100.0;
index += 5 ;
- //鐢ㄦ按鎴蜂綑棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
- cdData.remainMoney = 0.0D ;
- int tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.remainMoney += tpInt/100.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.remainMoney += tpInt;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.remainMoney += tpInt * 100.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.remainMoney += tpInt * 10000.0 ;
-
- //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
- cdData.totalAmount = 0.0D ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.totalAmount += tpInt;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.totalAmount += tpInt * 100.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.totalAmount += tpInt * 10000.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.totalAmount += tpInt * 1000000.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.totalAmount += tpInt * 100000000.0 ;
-
//鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
- cdData.instantAmount = 0.0D ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.instantAmount += tpInt/1000.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.instantAmount += tpInt/10.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.instantAmount += tpInt * 10.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.instantAmount += tpInt * 1000.0 ;
- tpInt = ByteUtil.BCD2Int_LE(bs, index, index) ;
- index++ ;
- cdData.instantAmount += tpInt * 100000.0 ;
+ tpInt = ByteUtil.BCD2Int_LE(bs, index, index + 4) ;
+ cdData.instantAmount = tpInt/1000.0 ;
+ index += 5 ;
cdData.alarmVo = GlParse.parseAlarm(bs, index) ;
index += 2 ;
cdData.stateVo = GlParse.parseState(bs, index) ;
--
Gitblit v1.8.0