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/DataCdC0Vo.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 60 insertions(+), 0 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCdC0Vo.java new file mode 100644 index 0000000..5341566 --- /dev/null +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1/upVos/DataCdC0Vo.java @@ -0,0 +1,60 @@ +package com.dy.common.mw.protocol.p206V1.upVos; + +import com.dy.common.mw.protocol.UpDataVo; +import lombok.Data; + +/** + * 閬ユ祴绔欒嚜鎶�(鏁寸偣)瀹炴椂鏁版嵁 + */ +@Data +public class DataCdC0Vo implements UpDataVo { + public Double instantAmount; //鐬椂娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999.999锛屽崟浣嶄负m3/h銆� + public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆� + public Double lossAmount; //鎹熷け娴侀噺(浠�0鏃跺埌褰撳墠鐨勬紡鎹熺疮璁℃祦閲忥紝24鏃朵竴涓懆鏈燂紝0鏃跺綊0)锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆� + public Double waterPress; //姘村帇锛�4瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~999999.99锛屽崟浣嶄负KPa銆� + public Double batteryVolt;//钃勭數姹犵數鍘�:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆� + public Integer signalValue; //淇″彿寮哄害锛�1瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99銆� + public Double waterPrice ;//姘翠环:2瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~99.99锛屽崟浣嶄负V銆� + public String rtuDt ;//鎺у埗鍣ㄦ椂閽� + public DataAlarmVo alarmVo ;//鎶ヨ + public DataStateVo stateVo ;//鐘舵�� + public String toString(){ + StringBuilder sb = new StringBuilder() ; + sb.append(" 缁堢鑷姤(鏁寸偣)瀹炴椂鏁版嵁:\n"); + sb.append(" 鐬椂娴侀噺锛�"); + sb.append(instantAmount==null?"":instantAmount); + sb.append("\n"); + sb.append(" 绱娴侀噺锛�"); + sb.append(totalAmount==null?"":totalAmount); + sb.append("\n"); + sb.append(" 鎹熷け娴侀噺锛�"); + sb.append(lossAmount==null?"":lossAmount); + sb.append("\n"); + sb.append(" 姘村帇锛�"); + sb.append(waterPress==null?"":waterPress); + sb.append("\n"); + sb.append(" 钃勭數姹犵數鍘嬶細"); + sb.append(batteryVolt==null?"":batteryVolt); + sb.append("\n"); + sb.append(" 淇″彿寮哄害锛�"); + sb.append(signalValue ==null?"": signalValue); + sb.append("\n"); + sb.append(" 姘翠环锛�"); + sb.append(waterPrice ==null?"": waterPrice); + 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