From 356331d8401267aa7aeb409d1314537aa25ac5ad Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 二月 2025 14:33:03 +0800
Subject: [PATCH] 解决控制器报警与状态SQL语句的错误

---
 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 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..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
@@ -70,12 +70,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){

--
Gitblit v1.8.0