From 22acc39ce207d951c6dcadbcb1cc68e27059d595 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期六, 12 十月 2024 17:19:20 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
index 33bf869..4a733f3 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java
@@ -4,21 +4,24 @@
@Data
public class DataStateVo {
+ public static final byte ValveOpenState = 0 ;
+ public static final byte ValveCloseState = 1 ;
+
public Byte icCard;// IC鍗″姛鑳�
- public Byte working;//宸ヤ綔鐘舵��
- public Byte valve ;//闃�闂�
+ public Byte valveState;//闃�闂ㄧ姸鎬�
+ public Byte powerType ;//鐢垫簮鐘舵�侊紙0锛�220V渚涚數锛�1锛氱暅鐢垫睜渚涚數锛�
public String toString(){
StringBuilder str = new StringBuilder() ;
str.append(" 鐘舵��:\n");
- str.append(" IC 鍗″姛鑳斤細");
- str.append(icCard ==null?"":(icCard ==1?"鏈夋晥":"鏃犳晥"));
- str.append("\n");
- str.append(" 宸ヤ綔鐘舵�侊細");
- str.append(working ==null?"":(working ==1?"鍚姩":"鍋滄"));
+ str.append(" IC鍗″姛鑳斤細");
+ str.append(icCard ==null?"":(icCard ==1?"鏈夋晥(1)":"鏃犳晥(0)"));
str.append("\n");
str.append(" 闃�闂ㄧ姸鎬侊細");
- str.append(valve==null?"":(valve==1?"鎵撳紑":"鍏抽棴"));
+ str.append(valveState ==null?"":(valveState ==1?"鍏抽棴(1)":"鎵撳紑(0)"));
+ str.append("\n");
+ str.append(" 鐢垫簮鐘舵�侊細");
+ str.append(powerType==null?"":(powerType==1?"鐣滅數姹犱緵鐢�(1)":"220V渚涚數(0)"));
return str.toString() ;
}
}
--
Gitblit v1.8.0