From c6b6e81247f4f65cf80ae8e25b3aee5bb3a950f0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 28 六月 2024 11:13:07 +0800
Subject: [PATCH] 1、靳总协议上行数据处理修改完善 2、SSO系统，实现缓存最大值，缓存时长可配置化
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
index 2f087bc..5336505 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java
@@ -20,11 +20,11 @@
闃�闂細鎶ヨ
*/
DataAlarmVo avo = new DataAlarmVo() ;
- byte b = bs[index + 1] ;
+ byte b = bs[index] ;
avo.batteryVolt = (byte)((b & 0x2) >> 1) ;
avo.meter = (byte)((b & 0x20) >> 5) ;
- b = bs[index] ;
+ b = bs[index + 1] ;
avo.loss = (byte)((b & 0x2) >> 1) ;
avo.valve = (byte)((b & 0x4) >> 2) ;
return avo ;
@@ -32,7 +32,7 @@
public static DataStateVo parseState(byte[] bs, short index){
DataStateVo avo = new DataStateVo() ;
- byte b = bs[index + 1] ;
+ byte b = bs[index] ;
avo.icCard = (byte)((b & 0x4) >> 2) ;
avo.working = (byte)((b & 0x10) >> 4) ;
avo.powerType = (byte)((b & 0x40) >> 6) ;
--
Gitblit v1.8.0