From bf1b78168478f802a7413d438b16ab64b27b7f4a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 02 四月 2025 14:32:38 +0800
Subject: [PATCH] 代码优化
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 e81594f..960178c 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
@@ -1,5 +1,6 @@
package com.dy.common.mw.protocol.p206V202404.parse.global;
+import com.dy.common.mw.protocol.p206V202404.CommonV202404;
import com.dy.common.mw.protocol.p206V202404.ProtocolConstantV206V202404;
import com.dy.common.mw.protocol.p206V202404.upVos.*;
import com.dy.common.util.ByteUtil;
@@ -70,12 +71,16 @@
b = bs[index + 1] ;
vo.alarm0MoneyRemain = (byte)(b & 0x1) ;
- vo.alarmInnerDoor = (byte)((b >> 1) & 1) ;
- vo.alarmOuterDoor = (byte)((b >> 2) & 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 +154,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 +170,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) ;
@@ -237,7 +242,9 @@
cdData.projectNo = (int)bs[index];
index ++ ;
- cdData.opType = bs[index];
+ cdData.clType = bs[index];
+ //杩涜鍏煎杞崲
+ cdData.clType = CommonV202404.closeType2P206V1(cdData.clType) ;
index++ ;
cdData.icCardAddr = ByteUtil.bytes2Hex(bs, false, index, 4) ;
@@ -261,7 +268,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,7 +280,7 @@
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) ;
@@ -295,10 +302,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) ;
@@ -312,7 +319,7 @@
index += 8 ;
cdData.startDt = GlParse.parseRtuDt(bs, index) ;
- if(cdData.opResult == (byte)0x81){
+ if(cdData.clResult == (byte)0x81){
//澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
return ;
}
--
Gitblit v1.8.0