From 18fc70a0c4f2bd6c69ccfd58c1b01edc03d87e73 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 23 七月 2024 15:45:45 +0800
Subject: [PATCH] 2024-07-23 朱宝民 PC端及小程序自动关阀（定时、定量），项目信息移入配置文件
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
index 551f49d..ac2df0b 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java
@@ -4,22 +4,28 @@
//鍒峰崱寮�娉�/闃�涓婃姤
@Data
-public class DataCd84Vo {
+public class DataCd84Vo extends AlarmVo {
public String controllerType;//鎺у埗鍣ㄧ被鍨� 01锛�0x01锛�:娴嬫帶涓�浣撻榾锛�57(0x57):浜曠數鎺у埗鍣�
public Integer projectNo ;//鎺у埗鍣ㄧ被鍨� 0x01:娴嬫帶涓�浣撻榾锛�0x57:浜曠數鎺у埗鍣�
+ public String openDt;//寮�娉�/闃�鏃堕棿(yyyy-mm-dd HH:MM:SS)
public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛�
public String icCardNo ;//IC鍗＄紪鍙凤紙17浣嶆暟瀛楋級
public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級
- public String opDt ;//寮�娉�/闃�鏃堕棿(鍒嗘椂鏃ユ湀)
public Double waterTotalAmount ;//姘磋〃绱姘撮噺锛屽崟浣�0.01绔嬫柟绫�
public Double eleTotalAmount ;//鐢佃〃绱鐢甸噺锛屽崟浣�0.01搴�
public Double moneyRemainUser ;//鐢ㄦ埛鍓╀綑閲戦锛� 鍗曚綅0.01鍏�
public Double waterRemainUser ;//鐢ㄦ埛鍓╀綑姘撮噺锛� 鍗曚綅0.01m3
+ public String comName ;//鍛戒护鍚嶇О
+
+ public DataCd84Vo(String comName){
+ this.comName = comName ;
+ }
+
public String toString(){
StringBuffer sb = new StringBuffer() ;
- sb.append(" 鏈轰簳瀹氱偣涓婃姤(姣忓ぉ12鐐逛笂鎶�) : \n") ;
+ sb.append(" " + comName + " : \n") ;
sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ;
sb.append(controllerType == null?"鏈煡":(controllerType.equals("01")?"娴嬫帶涓�浣撻榾":(controllerType.equals("57")?"浜曠數鎺у埗鍣�":"鏈煡"))) ;
sb.append("\n") ;
@@ -36,7 +42,7 @@
sb.append(orderNo == null?"鏈煡":orderNo) ;
sb.append("\n") ;
sb.append(" 寮�娉�/闃�鏃堕棿 : ") ;
- sb.append(opDt == null?"鏈煡":opDt) ;
+ sb.append(openDt == null?"鏈煡":openDt) ;
sb.append("\n") ;
sb.append(" 姘磋〃绱姘撮噺 : ") ;
sb.append(waterTotalAmount == null?"鏈煡":waterTotalAmount) ;
@@ -50,7 +56,7 @@
sb.append(" 鐢ㄦ埛鍓╀綑姘撮噺 : ") ;
sb.append(waterRemainUser == null?"鏈煡":waterRemainUser) ;
sb.append("\n") ;
- return sb.toString() ;
+ return sb.toString() + super.toString() ;
}
}
--
Gitblit v1.8.0