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/UpgradeState.java |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
index cc1c4b1..eaefce6 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/softUpgrade/state/UpgradeState.java
@@ -16,10 +16,19 @@
     public int runningTotal ;//鎵�鏈夋鍦ㄥ崌绾�
     public int overTotal ;//鎵�鏈夌粨鏉燂紙鍖呮嫭鎴愬姛涓庢墍鏈夊け璐ワ級
     public int successTotal ;//鎵�鏈夋垚鍔�
-    public int failTotal ;//鎵�鏈夊け璐�
-    public int failOneTotal ;//鎵�鏈変竴鍖呮澶辫触
+    public int failTotal ;//鎵�鏈夊け璐ワ紙涓�鍖呮澶辫触+澶氬寘姝诲け璐�+绂荤嚎澶辫触锛�
+    public int dieOneTotal;//鎵�鏈変竴鍖呮
+    public int dieMultiTotal;//鎵�鏈夊鍖呮
+    public int failOffTotal ;//鎵�鏈夌绾垮け璐�
+    public int failOpenTotal ;//鎵�鏈夐榾寮�澶辫触
+
+    public Boolean allOver ;//鎵�鏈夐兘缁撴潫锛坱rue:鏄紝false:鍚︼級
 
     public UpgradeState() {
+        this.init();
+    }
+
+    public void init(){
         this.rtuTotal = 0;
         this.offLineTotal = 0;
         this.unStartTotal = 0;
@@ -27,6 +36,11 @@
         this.overTotal = 0;
         this.successTotal = 0;
         this.failTotal = 0;
+        this.dieOneTotal = 0;
+        this.dieMultiTotal = 0;
+        this.failOffTotal = 0;
+        this.failOpenTotal = 0;
+        this.allOver = false ;
     }
 
     public String toString(){
@@ -39,7 +53,11 @@
         sb.append("    \n宸茬粨鏉熸�绘暟锛�" + overTotal) ;
         sb.append("    \n鎴愬姛鎬绘暟锛�" + successTotal) ;
         sb.append("    \n澶辫触鎬绘暟锛�" + failTotal) ;
-        sb.append("    \n1鍖呮鎬绘暟锛�" + failOneTotal) ;
+        sb.append("    \n涓�鍖呮澶辫触鎬绘暟锛�" + dieOneTotal) ;
+        sb.append("    \n澶氬寘姝诲け璐ユ�绘暟锛�" + dieMultiTotal) ;
+        sb.append("    \n绂荤嚎澶辫触鎬绘暟锛�" + failOffTotal) ;
+        sb.append("    \n闃�寮�澶辫触鎬绘暟锛�" + failOpenTotal) ;
+        sb.append("    \n鍏ㄧ粨鏉燂細" + allOver) ;
         return sb.toString() ;
     }
 

--
Gitblit v1.8.0