From 9de447f96e739c002a5f7760b67280b6ff81bba3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 07 五月 2024 14:56:23 +0800
Subject: [PATCH] 修改 分水房添加接口 村可以为空 分水房修改接口 手机号可以为空
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/parse/global/GlParse.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 43785ec..ee77255 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
@@ -27,8 +27,8 @@
DataStateVo avo = new DataStateVo() ;
byte b = bs[index] ;
index++ ;
- avo.idCard = (byte)(b & 0x4) ;
- avo.work = (byte)(b & 0x8) ;
+ avo.icCard = (byte)(b & 0x4) ;
+ avo.working = (byte)(b & 0x8) ;
avo.valve = (byte)(b & 0x20) ;
return avo ;
}
@@ -40,11 +40,11 @@
index++ ;
dt = ByteUtil.BCD2String_BE(bs, index, index) + ":" + dt ;//鍒�
index++ ;
- dt = ByteUtil.BCD2String_BE(bs, index, index) + " " + dt ;//鏃�
+ dt = ByteUtil.BCD2String_BE(bs, index, index) + ":" + dt ;//鏃�
index++ ;
- dt = ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//鏃�
+ dt = ByteUtil.BCD2String_BE(bs, index, index) + " " + dt ;//鏃�
index++ ;
- bs[index] = (byte)(bs[index] & 0x10);
+ //bs[index] = (byte)(bs[index] & 0x10);
dt = ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//鏈�
index++ ;
dt = "20" + ByteUtil.BCD2String_BE(bs, index, index) + "-" + dt ;//骞�
--
Gitblit v1.8.0