From 70cd3733e8d72a6bbcfcbfa78f8eecbdec7ee8f9 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 06 六月 2024 15:51:42 +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/DataCd84Vo.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
index 789350f..49d0b67 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd84Vo.java
@@ -2,19 +2,38 @@
import lombok.Data;
+/**
+ * 闃�寮�宸ヤ綔鎶ワ紙姣忓嚑鍗佺涓婃姤涓�娆★紝涓婃姤闂撮殧鍙缃級
+ */
@Data
public class DataCd84Vo {
- public String clientNum ;//鍐滄埛缂栧彿
+
+ public Byte opType;//寮�鍏抽榾绫诲瀷(1:鍒峰崱寮�闃�锛�2:鍒峰崱鍏抽榾锛�3:涓績绔欏紑闃�锛�4:涓績绔欏叧闃�锛�5:娆犺垂鍏抽榾锛�6:娴侀噺璁℃晠闅滃叧闃�锛�7:绱ф�ュ叧闂紱8:鐢ㄦ埛杩滅▼寮�闃�锛�9:鐢ㄦ埛杩滅▼鍏抽榾锛�10:寮�鍏抽榾鍗″叧闃�锛�11:寮�鍏抽榾鍗″埛鍗″崱寮�闃�锛�)
+ public Byte cardType ;//鍗＄被鍨�(1:鐢ㄦ埛鍗★紱2锛氱鐞嗗憳鍗★紱3锛氳皟璇曞崱锛�4锛氬紑鍏抽榾鍗★紱5锛氭竻绌哄崱)
+ public String cardAddr ;//IC鍗″湴鍧�锛�8浣嶅瓧绗︼級
+ public String cardNo ;//IC鍗＄紪鍙�
public Double remainMoney ;//鍓╀綑閲戦锛氱敤鎴蜂綑棰�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�
- public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ public Double totalAmount; //绱娴侀噺锛堟湰娆″紑闃�浠ユ潵鐨勭疮璁℃祦閲忥級锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public Double instantAmount; //鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆�
public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
+
+ public DataAlarmVo alarmVo ;//鎶ヨ
+ public DataStateVo stateVo ;//鐘舵��
public String toString(){
StringBuilder sb = new StringBuilder() ;
sb.append(" 缁堢寮�闃�宸ヤ綔鎶�:\n");
- sb.append(" 鍐滄埛缂栧彿锛�");
- sb.append(clientNum);
+ sb.append(" 寮�闃�绫诲瀷锛�");
+ sb.append(opType==null?"鏈煡":CommonV1_0_1.openCloseValveType(opType));
+ sb.append("\n");
+ sb.append(" IC鍗＄被鍨嬶細");
+ sb.append(cardType==null?"鏈煡":CommonV1_0_1.icCardType(cardType)) ;
+ sb.append("\n");
+ sb.append(" IC鍗″湴鍧�锛�");
+ sb.append(cardAddr);
+ sb.append("\n");
+ sb.append(" IC鍗＄紪鍙凤細");
+ sb.append(cardNo);
sb.append("\n");
sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
sb.append(remainMoney==null?"":remainMoney);
@@ -28,6 +47,14 @@
sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
sb.append(rtuDt==null?"":rtuDt);
sb.append("\n");
+ if(alarmVo != null){
+ sb.append(alarmVo.toString());
+ sb.append("\n");
+ }
+ if(stateVo != null){
+ sb.append(stateVo.toString());
+ sb.append("\n");
+ }
return sb.toString() ;
}
}
--
Gitblit v1.8.0