From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中,出现一些大数,明显不正确,发析系统日志,发现一些阀控器会上报一些累计流量为0的数据,且无规律,推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值,间歇上报一些非0值,非0值减去0值,就会出现大数,一天中出现几次那么会大数进行累加,数值将更大。为此变更算法,规避这种情况,但也会丢失一些流量值。

---
 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