From 7a30cb7329eb065d9a95213b327818412c2d5d0e Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 03 三月 2025 14:22:22 +0800
Subject: [PATCH] 1、表阀一体机新协议解析优化； 2、取水口实体编辑更新逻辑修改，去除引起bug的代码。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
index 6f32f1c..97dcc4e 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java
@@ -53,29 +53,33 @@
/**
* 鍒嗘瀽鐘舵�佷笌鎶ヨ
- * @param bs
- * @param index
+ * @param bs 涓婃姤鏁版嵁鐨勫瓧鑺傛暟缁�
+ * @param index 褰撳墠瑙ｆ瀽鏁扮粍涓嬫爣浣嶇疆
* @return
*/
public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){
- byte b = bs[index + 1] ;
+ byte b = bs[index] ;
vo.statePump = (byte)(b & 0x1) ;
- vo.alarmWaterRemain = (byte)(b >> 1 & 1) ;
- vo.alarm0WaterRemain = (byte)(b >> 2 & 1) ;
- vo.alarmExceedYear = (byte)(b >> 3 & 1) ;
- vo.alarmWaterMeterFault = (byte)(b >> 4 & 1) ;
- vo.alarmSteal = (byte)(b >> 5 & 1) ;
- vo.alarmWaterMeterBreak = (byte)(b >> 6 & 1) ;
- vo.alarmEleMeterFault = (byte)(b >> 7 & 1) ;
+ vo.alarmWaterRemain = (byte)((b >> 1) & 1) ;
+ vo.alarm0WaterRemain = (byte)((b >> 2) & 1) ;
+ vo.alarmExceedYear = (byte)((b >> 3) & 1) ;
+ vo.alarmWaterMeterFault = (byte)((b >> 4) & 1) ;
+ vo.alarmSteal = (byte)((b >> 5) & 1) ;
+ vo.alarmWaterMeterBreak = (byte)((b >> 6) & 1) ;
+ vo.alarmEleMeterFault = (byte)((b >> 7) & 1) ;
- b = bs[index] ;
+ b = bs[index + 1] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
- vo.alarmInnerDoor = (byte)(b >> 1 & 1) ;
- vo.alarmOuterDoor = (byte)(b >> 2 & 1) ;
- vo.alarmEleMiss = (byte)(b >> 3 & 1) ;
- vo.alarmEleExceed = (byte)(b >> 4 & 1) ;
- vo.alarmEleLowVolt = (byte)(b >> 5 & 1) ;
- vo.stateIcEnable = (byte)(b >> 6 & 1) ;
+ vo.alarmDoor = (byte)((b >> 1) & 1) ;
+ vo.alarmBatteryVolt = (byte)((b >> 2) & 1) ;
+ vo.alarmEleMiss = (byte)((b >> 3) & 1) ;
+ vo.alarmEleExceed = (byte)((b >> 4) & 1) ;
+ vo.alarmEleLowVolt = (byte)((b >> 5) & 1) ;
+ vo.stateIcEnable = (byte)((b >> 6) & 1) ;
+ vo.stateOpClValve = (byte)((b >> 7) & 1) ;
+
+ b = bs[index + 2] ;
+ vo.alarmBlockValve = (byte)(b & 0x1) ;
}
public static String parseTp(byte[] bs, short index){
@@ -149,7 +153,7 @@
index += 5 ;
Long moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
- cdData.moneyRemain = moneyRemain/100.0D;
+ cdData.moneyRemain = moneyRemain/10000.0D;
index += 5 ;
Long waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4) ;
@@ -165,7 +169,7 @@
index += 4 ;
int thisMoney = ByteUtil.BCD2Int_LE(bs, index, index + 3) ;
- cdData.thisMoney = thisMoney/100.0D;
+ cdData.thisMoney = thisMoney/10000.0D;
index += 4 ;
cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
@@ -179,9 +183,9 @@
cdData.elePrice = elePrice/100.0D;
index += 2 ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
- index += 2 ;
+ index += 4 ;
int aVolt = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
cdData.aVolt = aVolt/10.0D;
@@ -237,7 +241,7 @@
cdData.projectNo = (int)bs[index];
index ++ ;
- cdData.opType = bs[index];
+ cdData.clType = bs[index];
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -261,7 +265,7 @@
cdData.eleTotalAmount = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
index += 5 ;
- cdData.moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
+ cdData.moneyRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4)/10000.0D ;
index += 5 ;
cdData.waterRemain = ByteUtil.BCD2Long_LE(bs, index, index + 4)/100.0D ;
@@ -273,13 +277,13 @@
cdData.thisWater = ByteUtil.BCD2Long_LE(bs, index, index + 3)/100.0D ;
index += 4 ;
- cdData.thisMoney = ByteUtil.BCD2Long_LE(bs, index, index + 3)/100.0D ;
+ cdData.thisMoney = ByteUtil.BCD2Long_LE(bs, index, index + 3)/10000.0D ;
index += 4 ;
cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
index += 2 ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
}
/**
* 鍒嗘瀽鍔熻兘93銆丄3鏁版嵁
@@ -295,10 +299,10 @@
cdData.projectNo = (int)bs[index];
index ++ ;
- cdData.opResult = bs[index];
+ cdData.clResult = bs[index];
index ++ ;
- cdData.opType = bs[index];
+ cdData.clType = bs[index];
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -311,6 +315,11 @@
index += 8 ;
cdData.startDt = GlParse.parseRtuDt(bs, index) ;
+
+ if(cdData.clResult == (byte)0x81){
+ //澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
+ return ;
+ }
index += 6 ;
cdData.endDt = GlParse.parseRtuDt(bs, index) ;
@@ -340,6 +349,6 @@
cdData.thisDuration = ByteUtil.BCD2Int_LE(bs, index, index + 1) ;
index += 2 ;
- GlParse.parseAlarmAndState(bs, index, cdData) ;
+ GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
}
}
--
Gitblit v1.8.0