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/softUpgrade/state/UpgradeTaskVo.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
index b4d0d16..e6ea9c8 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeTaskVo.java
@@ -15,6 +15,7 @@
     public String softFileName ;//鍗囩骇绋嬪簭鏂囦欢鍚�
     public String softStoreAddr ;//鍗囩骇绋嬪簭瀛樻斁鍦板潃
     public String softStartAddr ;//绋嬪簭瑕嗙洊璧峰鍦板潃
+    public String softFileData64 ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁扮粍
     public byte[] softFileData ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁扮粍
     public Integer softBytesCalculate ;//鏍规嵁鍏紡璁$畻寰楀埌鐨勬湁鏁堝崌绾х▼搴忓瓧鑺傛暟
     public Integer softByteSrc16 ;//鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁癈RC16鏍¢獙鍊�
@@ -27,7 +28,7 @@
                 "   鍗囩骇绋嬪簭鏂囦欢鍚�=" + softFileName + "\n" +
                 "   鍗囩骇绋嬪簭瀛樻斁鍦板潃=" + softStoreAddr + "\n" +
                 "   绋嬪簭瑕嗙洊璧峰鍦板潃=" + softStartAddr + "\n" +
-                "   鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁�=" + softFileData.length + "\n" +
+                "   鏈夋晥鍗囩骇绋嬪簭瀛楄妭鏁�(base64)=" + softFileData64 + "\n" +
                 "   鍏紡璁$畻绋嬪簭瀛楄妭鏁�=" + softBytesCalculate +
                 "   绋嬪簭CRC16鏍¢獙鍊�=" + softByteSrc16 + "\n" +
                 "   鍗囩骇鎺у埗鍣ㄦ暟閲�=" + rtuAddrList.size() + "\n" +

--
Gitblit v1.8.0