From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java index deb5d32..ffbb13f 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCdC0Vo.java @@ -1,12 +1,13 @@ package com.dy.common.mw.protocol.p206V1_0_0.upVos; +import com.dy.common.mw.protocol.UpDataVo; import lombok.Data; /** - * 閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹� + * 閬ユ祴绔欒嚜鎶�(鏁寸偣)瀹炴椂鏁版嵁 */ @Data -public class DataCdC0Vo { +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銆� @@ -19,7 +20,7 @@ public DataStateVo stateVo ;//鐘舵�� public String toString(){ StringBuilder sb = new StringBuilder() ; - sb.append(" 缁堢鑷姤瀹炴椂鏁版嵁:\n"); + sb.append(" 缁堢鑷姤(鏁寸偣)瀹炴椂鏁版嵁:\n"); sb.append(" 鐬椂娴侀噺锛�"); sb.append(instantAmount==null?"":instantAmount); sb.append("\n"); -- Gitblit v1.8.0