From c2976b80e8850be2d28dc2132c6659856b871f3c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 08 五月 2025 21:10: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/p206V2/upVos/DataCd84Vo.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataCd84Vo.java
new file mode 100644
index 0000000..dd9308a
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V2/upVos/DataCd84Vo.java
@@ -0,0 +1,62 @@
+package com.dy.common.mw.protocol.p206V2.upVos;
+
+import com.dy.common.mw.protocol.UpDataVo;
+import com.dy.common.mw.protocol.p206V2.CommonV2;
+import lombok.Data;
+
+/**
+ * 闃�寮�宸ヤ綔鎶ワ紙姣忓嚑鍗佺涓婃姤涓�娆★紝涓婃姤闂撮殧鍙缃級
+ */
+@Data
+public class DataCd84Vo implements UpDataVo {
+
+ public Byte opType;
+ public Byte cardType ;//鍗＄被鍨�(0:鏃犲崱锛�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 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(opType==null?"鏈煡": CommonV2.openCloseValveType(opType));
+ sb.append("\n");
+ sb.append(" IC鍗＄被鍨嬶細");
+ sb.append(cardType==null?"鏈煡": CommonV2.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);
+ sb.append("\n");
+ sb.append(" 绱娴侀噺锛�");
+ sb.append(totalAmount==null?"":totalAmount);
+ sb.append("\n");
+ sb.append(" 鐬椂娴侀噺锛�");
+ sb.append(instantAmount==null?"":instantAmount);
+ sb.append("\n");
+ 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