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

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java
index b64845e..a9f28c9 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealWorkingReportV202404.java
@@ -39,12 +39,11 @@
             DbSv sv = (DbSv) objs[0];
             PrController controller = (PrController) objs[1];
             if (cdObj instanceof DataCd80_5BVo) {
-                //璁惧缁堢瀹氱偣涓婃姤, 姣忓ぉ12鐐逛笂鎶ユ暟鎹�
                 DataCd80_5BVo cdData = (DataCd80_5BVo) (cdObj);
                 this.doDeal(sv, controller, d.getRtuAddr(), dV202404, (DataCd80_5BVo)cdObj);
             }
         } catch (Exception e) {
-            log.error("淇濆瓨鎺у埗鍣ㄦ姤璀﹀拰鐘舵�佹暟鎹椂鍙戠敓寮傚父", e);
+            log.error("淇濆瓨澶勭悊鎺у埗鍣ㄥ伐浣滄姤鏁版嵁鏃跺彂鐢熷紓甯�", e);
         }
     }
     /**
@@ -69,7 +68,7 @@
      * @param cdData 鍔熻兘鏁版嵁
      */
     private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd80_5BVo cdData)throws Exception {
-        RmWorkReportLast po = sv.getRmWorkReportLast(rtuAddr) ;
+        RmWorkReportLast po = sv.getRmWorkReportLast(controller.getIntakeId()) ;
         if(po == null){
             po = new RmWorkReportLast();
             po.controllerId = controller==null?null:controller.getId();

--
Gitblit v1.8.0