From 7efbf921192559cad13a4f8086c46c3617ad2a05 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期四, 31 十月 2024 08:34:42 +0800 Subject: [PATCH] 1、协议解析中,关阀报(83)中的RTU时钟改为关阀时间,但代码误注解掉了这行代码,修改之; 2、通信中间件测试web系统增加查询所在在线情况的命令下发。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java index a83db48..a737325 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/upVos/DataCd83CloseVo.java @@ -1,13 +1,12 @@ package com.dy.common.mw.protocol.p206V1_0_0.upVos; +import com.dy.common.mw.protocol.UpDataVo; import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1; import lombok.Data; @Data -public class DataCd83CloseVo { - // 寮�鍏抽榾绫诲瀷锛� - // 1銆佸埛鍗″紑闃�锛�2鍒峰崱鍏抽榾锛�3銆佷腑蹇冪珯寮�闃�锛�4銆佷腑蹇冪珯鍏抽榾锛�5銆佹瑺璐瑰叧闃�锛� - // 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛� +public class DataCd83CloseVo implements UpDataVo { + // 寮�鍏抽榾绫诲瀷锛氳CommonV1_0_1.openCloseValveType() public Byte type ; public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆� public String icCardNo;//IC鍗$紪鍙� @@ -35,7 +34,7 @@ sb.append(" IC鍗$紪鍙凤細"); sb.append(icCardNo); sb.append("\n"); - sb.append(" ic鍗″湴鍧�锛�"); + sb.append(" IC鍗″湴鍧�锛�"); sb.append(icCardAddr); sb.append("\n"); sb.append(" 鍓╀綑閲戦锛堝厓锛夛細"); -- Gitblit v1.8.0