From 6cf345bc8fe98d393320b89182f9293171aa19ff Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 22 四月 2025 16:39:55 +0800
Subject: [PATCH] 1、根据江海协议中开阀类型变化，修改相应代码； 2、江海协议RTU模拟器启动参数注释。
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCd83CloseVo.java | 73 ++++++++++++++++++++++++++++++++++++
1 files changed, 73 insertions(+), 0 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCd83CloseVo.java
new file mode 100644
index 0000000..fd75731
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCd83CloseVo.java
@@ -0,0 +1,73 @@
+package com.dy.common.mw.protocol.p206V1.upVos;
+
+import com.dy.common.mw.protocol.UpDataVo;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
+import lombok.Data;
+
+@Data
+public class DataCd83CloseVo implements UpDataVo {
+ // 寮�鍏抽榾绫诲瀷锛氳CommonV1.openCloseValveType()
+ public Byte type ;
+ public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ public String icCardNo;//IC鍗＄紪鍙�
+ public String icCardAddr;//ic鍗″湴鍧�
+ public Double remainMoney ;//鍓╀綑閲戦锛氱敤鎴蜂綑棰�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏�
+ public String openDt ;//鐢ㄦ按鎴风敤姘村紑濮嬫椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
+ public String closeDt ;//鐢ㄦ按鎴风敤姘寸粨鏉熸椂闂达細6瀛楄妭BCD鐮侊紝椤哄簭鏄勾鏈堟棩鏃跺垎绉掞紝鍏朵腑鍏厓骞�=2000+骞淬��
+ public Double thisAmount ;//鐢ㄦ按鎴锋湰娆＄敤姘撮噺锛氱疮璁℃祦閲�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
+ public Double thisMoney ;//鐢ㄦ按鎴锋湰娆℃秷璐归噾棰濓細鐢ㄦ埛浣欓4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0.00~999999.99锛屽崟浣嶄负鍏冦��
+ public Integer thisTime ;//鐢ㄦ按鎴锋湰娆＄敤姘存椂闀匡細鐢ㄦ按鏃堕暱2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999锛屽崟浣嶄负鍒嗛挓銆�
+ public Byte priceType ;//姘翠环绫诲瀷锛�1锛氭按鍗℃按浠凤紝2锛氭帶鍒跺櫒姘翠环锛�
+ public Double price ;//姘翠环
+ public Byte cardType ;//鍗＄被鍨�
+ public String rtuDt ;//鎺у埗鍣ㄦ椂閽�
+
+ public String toString(){
+ StringBuilder sb = new StringBuilder() ;
+ sb.append(" 缁堢鍏抽榾鑷姤:\n");
+ sb.append(" 鍏抽榾绫诲瀷锛�");
+ sb.append(CommonV1.openCloseValveType(type)) ;
+ sb.append("\n");
+ sb.append(" 绱娴侀噺锛�");
+ sb.append(totalAmount==null?"":totalAmount);
+ sb.append("\n");
+ sb.append(" IC鍗＄紪鍙凤細");
+ sb.append(icCardNo);
+ sb.append("\n");
+ sb.append(" IC鍗″湴鍧�锛�");
+ sb.append(icCardAddr);
+ sb.append("\n");
+ sb.append(" 鍓╀綑閲戦锛堝厓锛夛細");
+ sb.append(remainMoney ==null?"": remainMoney);
+ sb.append("\n");
+ sb.append(" 寮�闃�鏃堕棿锛�");
+ sb.append(openDt);
+ sb.append("\n");
+ sb.append(" 鍏抽榾鏃堕棿锛�");
+ sb.append(closeDt);
+ sb.append("\n");
+ sb.append(" 鏈鐢ㄦ按閲忥細");
+ sb.append(thisAmount==null?"":thisAmount);
+ sb.append("\n");
+ sb.append(" 鏈鑺辫垂閲戦锛堝厓锛夛細");
+ sb.append(thisMoney==null?"":thisMoney);
+ sb.append("\n");
+ sb.append(" 鏈鐢ㄦ按鏃堕暱锛堝垎閽燂級锛�");
+ sb.append(thisTime==null?"":thisTime);
+ sb.append("\n");
+ sb.append(" 姘翠环绫诲瀷锛�");
+ sb.append(priceType ==null?"": (priceType==1?"IC鍗℃按浠�":(priceType==2?"鎺у埗鍣ㄦ按浠�":"鏈煡")));
+ sb.append("\n");
+ sb.append(" 姘翠环锛�");
+ sb.append(price ==null?"": price);
+ sb.append("\n");
+ sb.append(" 鍗＄被鍨嬶細");
+ sb.append(cardType==null?"鏈煡": CommonV1.icCardType(cardType)) ;
+ sb.append("\n");
+ sb.append(" 鎺у埗鍣ㄦ椂閽燂細");
+ sb.append(rtuDt==null?"":rtuDt);
+ sb.append("\n");
+
+ return sb.toString() ;
+ }
+}
--
Gitblit v1.8.0