From 33e1f47419d28736b17d6947bb15ccc290b2905a Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期三, 26 二月 2025 17:42:45 +0800 Subject: [PATCH] 1、代码完善; 2、江海协议解析不正确处修改,如金额是4位小数; 3、根据江海协议,新建RTU模拟器模块,可以上报心跳、开阀、关阀数据。 --- pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java index 2045a91..3fe03b0 100644 --- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java +++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/channel/tcp/PrefixedDataAvailableStatus.java @@ -9,6 +9,8 @@ private Integer status ; private Integer dataLen ; + public String protocolName; + public Short protocolVersion; public PrefixedDataAvailableStatus(){ status = null ; @@ -44,9 +46,11 @@ * @return 鐘舵�� */ @SuppressWarnings("unused") - public PrefixedDataAvailableStatus adjoined(Integer dataLen){ + public PrefixedDataAvailableStatus adjoined(Integer dataLen, String protocolName, Short protocolVersion){ this.status = status_adjoin ; this.dataLen = dataLen ; + this.protocolName = protocolName ; + this.protocolVersion = protocolVersion ; return this ; } @@ -56,9 +60,11 @@ * @return 鐘舵�� */ @SuppressWarnings("unused") - public PrefixedDataAvailableStatus completed(Integer dataLen){ + public PrefixedDataAvailableStatus completed(Integer dataLen, String protocolName, Short protocolVersion){ this.status = status_complete ; this.dataLen = dataLen ; + this.protocolName = protocolName ; + this.protocolVersion = protocolVersion ; return this ; } -- Gitblit v1.8.0