From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 82e681d..c431d83 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] ;
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 + 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){
@@ -312,6 +316,11 @@
index += 8 ;
cdData.startDt = GlParse.parseRtuDt(bs, index) ;
+ if(cdData.opResult == (byte)0x81){
+ //澶辫触浜嗭紝涓嬮潰灏辨病鏈夋暟鎹簡
+ return ;
+ }
+
index += 6 ;
cdData.endDt = GlParse.parseRtuDt(bs, index) ;
--
Gitblit v1.8.0