From ff55f15de19cb5bf02fa4d2313f4882ef9b3a452 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 30 四月 2025 10:47:34 +0800
Subject: [PATCH] 表阀一体机上报心跳数据最小间隔经常改动，时常不通知软件开发人员，所以通信中间件根据最小上报数据间隔会切断设备网络连接，为此改变中间件配置，最小心跳间隔改为在properties文件中配置。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/parse/global/GlParse.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 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 960178c..a2df974 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
@@ -61,6 +61,14 @@
public static void parseAlarmAndState(byte[] bs, int index, AlarmVo vo){
byte b = bs[index] ;
vo.statePump = (byte)(b & 0x1) ;
+
+ //涓庢祴鎺т竴浣撻榾鍏煎
+ if(vo.statePump == 0){
+ vo.statePump = (byte)1;
+ }else{
+ vo.statePump = (byte)0;
+ }
+
vo.alarmWaterRemain = (byte)((b >> 1) & 1) ;
vo.alarm0WaterRemain = (byte)((b >> 2) & 1) ;
vo.alarmExceedYear = (byte)((b >> 3) & 1) ;
@@ -287,6 +295,10 @@
index += 2 ;
GlParse.parseAlarmAndState(bs, index, cdData) ;//鍥涗釜瀛楄妭
+
+ index += 4 ;
+ cdData.price = ByteUtil.BCD2Int_LE(bs, index, index + 1)/100.0 ;
+
}
/**
* 鍒嗘瀽鍔熻兘93銆丄3鏁版嵁
--
Gitblit v1.8.0