From 7f3cae29516a35e85e4b6fc02ec655882d4c2538 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 08 五月 2025 11:55:24 +0800
Subject: [PATCH] 1、测控一体阀协议功能码50补充实现； 2、RTU模拟器模拟实现50、91、92功能码上报； 3、remote模块：完善透传命令实现，完善接收通信中间件返回命令结果实现。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataStateVo.java | 45 +++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 45 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataStateVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataStateVo.java
new file mode 100644
index 0000000..7dc5896
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataStateVo.java
@@ -0,0 +1,45 @@
+package com.dy.common.mw.protocol.p206V2.upVos;
+
+import com.dy.common.mw.protocol.UpDataVo;
+import lombok.Data;
+
+@Data
+public class DataStateVo implements UpDataVo {
+ public static final byte ValveOpenState = 0 ;
+ public static final byte ValveCloseState = 1 ;
+
+ public Byte icCard;// IC鍗″姛鑳�
+ public Byte valveState;//闃�闂ㄧ姸鎬�
+ public Byte powerType ;//鐢垫簮鐘舵�侊紙0锛�220V渚涚數锛�1锛氱暅鐢垫睜渚涚數锛�
+
+ public String to1010(){
+ String s = "" ;
+ s += (icCard == null ? "0" : icCard.byteValue()) ;
+ s += (valveState == null ? "0" : valveState.byteValue()) ;
+ s += (powerType == null ? "0" : powerType.byteValue()) ;
+ return s ;
+ }
+ public String toString(){
+ StringBuilder str = new StringBuilder() ;
+ str.append(" 鐘舵��:\n");
+ str.append(" IC鍗″姛鑳斤細");
+ str.append(icCard ==null?"":(icCard ==1?"鏈夋晥(1)":"鏃犳晥(0)"));
+ str.append("\n");
+ str.append(" 闃�闂ㄧ姸鎬侊細");
+ 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() ;
+ }
+
+ public boolean hasDiff(DataStateVo oth){
+ if(this.icCard.byteValue() != oth.icCard.byteValue()
+ || this.valveState.byteValue() != oth.valveState.byteValue()
+ || this.powerType.byteValue() != oth.powerType.byteValue()){
+ return true ;
+ }else{
+ return false ;
+ }
+ }
+}
--
Gitblit v1.8.0