From d736d220008f3ddaed44ac6bfa8a19eb8ca61e96 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 12 十月 2024 14:09:39 +0800
Subject: [PATCH] 1、江海协议功能C2增加订单号数据项； 2、下行命令构造时标TP当月份大于等于10时有错，进行修改。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 49 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index ee77255..2484a8f 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -1,8 +1,9 @@
package com.dy.common.mw.protocol.p206V1_0_0.parse.global;
-import com.dy.common.mw.protocol.p206V1_0_0.DataAlarmVo;
-import com.dy.common.mw.protocol.p206V1_0_0.DataStateVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataAlarmVo;
+import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataStateVo;
import com.dy.common.util.ByteUtil;
+import com.dy.common.util.ByteUtilUnsigned;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -11,28 +12,52 @@
private static final Logger log = LogManager.getLogger(GlParse.class);
public static DataAlarmVo parseAlarm(byte[] bs, short index){
+ /*
+ 11011111 (DF) + 11111001 (F9)
+ 鎶ヨ:
+ 钃勭數姹犵數鍘嬶細鎶ヨ
+ 婕忔崯锛氭姤璀�
+ 浠〃锛氭姤璀�
+ 闃�闂細鎶ヨ
+ */
DataAlarmVo avo = new DataAlarmVo() ;
byte b = bs[index] ;
- index++ ;
- avo.batteryVolt = (byte)(b & 0x2) ;
- avo.loss = (byte)(b & 0x8) ;
- avo.meter = (byte)(b & 0x20) ;
+ avo.batteryVolt = (byte)((b & 0x2) >> 1) ;
+ avo.meter = (byte)((b & 0x20) >> 5) ;
- b = bs[index] ;
- avo.valve = (byte)(b & 0x20) ;
+ b = bs[index + 1] ;
+ avo.loss = (byte)((b & 0x2) >> 1) ;
+ avo.valve = (byte)((b & 0x4) >> 2) ;
return avo ;
}
public static DataStateVo parseState(byte[] bs, short index){
DataStateVo avo = new DataStateVo() ;
byte b = bs[index] ;
- index++ ;
- avo.icCard = (byte)(b & 0x4) ;
- avo.working = (byte)(b & 0x8) ;
- avo.valve = (byte)(b & 0x20) ;
+ avo.icCard = (byte)((b & 0x4) >> 2) ;
+ avo.valveState = (byte)((b & 0x10) >> 4) ;
+ avo.powerType = (byte)((b & 0x40) >> 6) ;
return avo ;
}
+ /**
+ * 鍒嗘瀽IC鍗＄紪鍙�
+ * @param bs 涓婅瀛楄妭鏁扮粍
+ * @param index 鍚浣�
+ * @return 鎺у埗鍣ㄥ湴鍧�
+ * @throws Exception 寮傚父
+ */
+ public static String parseIcCardNo(byte[] bs, int index)throws Exception{
+ String icNoStr = "" + ByteUtilUnsigned.bytes2Short_LE(bs, index) ;
+ String icNoBCD = "" + ByteUtil.BCD2Long_LE(bs, index + 2, index + 7) ;
+ while(icNoStr.length() < 5){
+ icNoStr = "0" + icNoStr ;
+ }
+ return icNoBCD + icNoStr ;
+ }
+
+
+
public static String parseTp(byte[] bs, short index){
String dt = "" ;
try{
--
Gitblit v1.8.0