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-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java
index 33c8cb4..2ea92e3 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java
@@ -1,8 +1,10 @@
 package com.dy.rtuMw.server.rtuData.p206V202404;
 
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V202404.DataV202404;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd02Vo;
 import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
-import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -26,10 +28,22 @@
      */
     @Override
     public void execute(Object data) {
+        Data d = (Data)data ;
         Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ;
         PrControllerTramp tramp = (PrControllerTramp)objs[2] ;
         if(tramp == null){
-            this.toNextTasks(data);
+            //鏃犲懡浠D
+            boolean toNext = true ;
+            if(d.getSubData() != null) {
+                DataV202404 dataV202404 = (DataV202404)d.getSubData() ;
+                if(dataV202404 != null && dataV202404.subData != null && dataV202404.subData instanceof DataCd02Vo){
+                    //杩囨护鎺夊績璺虫暟鎹�
+                    toNext = false ;
+                }
+            }
+            if(toNext){
+                this.toNextTasks(data);
+            }
         }
     }
 }

--
Gitblit v1.8.0