From e407fcf19e50ed0972e7262d99da4b3a83d08706 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 11 十月 2024 17:08:23 +0800
Subject: [PATCH] 1、修改协议驱动RTU上行数据解析出错时，RTU上下行数据日志中的RTU地址不正确的bug; 2、83功能码上行数据测试main方法实现。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataStateVo.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 1e12bd4..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 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(" IC鍗″姛鑳斤細");
+ str.append(icCard ==null?"":(icCard ==1?"鏈夋晥(1)":"鏃犳晥(0)"));
str.append("\n");
- str.append(" 宸ヤ綔鐘舵�侊細");
- str.append(working ==null?"":(working ==1?"鍚姩":"鍋滄"));
+ str.append(" 闃�闂ㄧ姸鎬侊細");
+ str.append(valveState ==null?"":(valveState ==1?"鍏抽棴(1)":"鎵撳紑(0)"));
str.append("\n");
str.append(" 鐢垫簮鐘舵�侊細");
- str.append(powerType==null?"":(powerType==1?"鐣滅數姹犱緵鐢�":"220V渚涚數"));
+ str.append(powerType==null?"":(powerType==1?"鐣滅數姹犱緵鐢�(1)":"220V渚涚數(0)"));
return str.toString() ;
}
}
--
Gitblit v1.8.0