From 4513ef24bf9b188c2a77d6ce94f1a6b7e9ebf0e6 Mon Sep 17 00:00:00 2001 From: zuoxiao <470321431@qq.com> Date: 星期日, 27 四月 2025 20:40:19 +0800 Subject: [PATCH] fix(irrigatePlan): 修正灌溉计划开始时间逻辑 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java | 73 ++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 0 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 new file mode 100644 index 0000000..83be31a --- /dev/null +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V202404/upVos/DataCd84Vo.java @@ -0,0 +1,73 @@ +package com.dy.common.mw.protocol.p206V202404.upVos; + +import com.dy.common.mw.protocol.p206V202404.CommonV202404; +import lombok.Data; +import lombok.EqualsAndHashCode; + +//鍒峰崱寮�娉�/闃�涓婃姤 +@Data +@EqualsAndHashCode(callSuper=false) +public class DataCd84Vo extends AlarmVo { + + public String controllerType;//鎺у埗鍣ㄧ被鍨� + public Integer projectNo ;//椤圭洰缂栧彿 + public Byte opType; + public String openDt;//寮�娉�/闃�鏃堕棿(yyyy-mm-dd HH:MM:SS) + public String icCardAddr ;//IC鍗″湴鍧�锛堣繙绋嬪叧闂椂涓�0锛� + public String icCardNo ;//IC鍗$紪鍙凤紙17浣嶆暟瀛楋級 + public String orderNo ;//璁㈠崟鍙凤紙16浣嶆暟瀛楋級 + public Double waterTotalAmount ;//姘磋〃绱姘撮噺锛屽崟浣�0.01绔嬫柟绫� + public Double eleTotalAmount ;//鐢佃〃绱鐢甸噺锛屽崟浣�0.01搴� + public Double moneyRemainUser ;//鐢ㄦ埛鍓╀綑閲戦锛� 鍗曚綅0.01鍏� + public Double waterRemainUser ;//鐢ㄦ埛鍓╀綑姘撮噺锛� 鍗曚綅0.01m3 + public Double price ;//姘翠环 + + public String comName ;//鍛戒护鍚嶇О + + public DataCd84Vo(String comName){ + this.comName = comName ; + } + + public String toString(){ + StringBuffer sb = new StringBuffer() ; + sb.append(" " + comName + " : \n") ; + sb.append(" 鎺у埗鍣ㄧ被鍨� : ") ; + sb.append(CommonV202404.ctrlDevType(controllerType)) ; + sb.append("\n") ; + sb.append(" 椤圭洰缂栧彿 : ") ; + sb.append(projectNo == null?"鏈煡":projectNo) ; + sb.append("\n") ; + sb.append(" 寮�闃�绫诲瀷锛�"); + sb.append(opType==null?"鏈煡": CommonV202404.openValveType(opType)); + sb.append("\n"); + sb.append(" IC鍗″湴鍧� : ") ; + sb.append(icCardAddr == null?"鏈煡":icCardAddr) ; + sb.append("\n") ; + sb.append(" IC鍗$紪鍙� : ") ; + sb.append(icCardNo == null?"鏈煡":icCardNo) ; + sb.append("\n") ; + sb.append(" 璁㈠崟鍙� : ") ; + sb.append(orderNo == null?"鏈煡":orderNo) ; + sb.append("\n") ; + sb.append(" 寮�娉�/闃�鏃堕棿 : ") ; + sb.append(openDt == null?"鏈煡":openDt) ; + sb.append("\n") ; + sb.append(" 姘磋〃绱姘撮噺 : ") ; + sb.append(waterTotalAmount == null?"鏈煡":waterTotalAmount) ; + sb.append("\n") ; + sb.append(" 鐢佃〃绱鐢甸噺 : ") ; + sb.append(eleTotalAmount == null?"鏈煡":eleTotalAmount) ; + sb.append("\n") ; + sb.append(" 鐢ㄦ埛鍓╀綑閲戦 : ") ; + sb.append(moneyRemainUser == null?"鏈煡":moneyRemainUser) ; + sb.append("\n") ; + sb.append(" 鐢ㄦ埛鍓╀綑姘撮噺 : ") ; + sb.append(waterRemainUser == null?"鏈煡":waterRemainUser) ; + sb.append("\n") ; + sb.append(" 姘翠环 : ") ; + sb.append(price == null?"鏈煡":price) ; + sb.append("\n") ; + return sb.toString() + super.toString() ; + } + +} -- Gitblit v1.8.0