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/TkDealAlarmStatusV202404.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java index 3686852..837e2f0 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealAlarmStatusV202404.java @@ -12,6 +12,8 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import java.util.Date; + /** * @Author liurunyu * @Date 2024/5/8 14:18 @@ -82,7 +84,7 @@ String rtuDt, AlarmVo alarmVo, String receiveDt) throws Exception { - RmAlarmStateLast po = sv.getRmAlarmStateLast(rtuAddr) ; + RmAlarmStateLast po = sv.getRmAlarmStateLast(controller.getIntakeId()) ; if(po == null){ po = new RmAlarmStateLast(null, controller==null?null:controller.getId(), @@ -107,7 +109,8 @@ alarmVo==null?null:alarmVo.stateIcEnable, (byte)0,//鐢垫睜鐢靛帇(1锛氭姤璀︼紝0锛氭甯�) (byte)0,//闃�闂ㄦ姤璀�(1锛氭姤璀︼紝0锛氭甯�) - (byte)0//渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛� + (byte)0,//渚涚數鏂瑰紡锛�0: 220V锛�1锛氳搫鐢垫睜锛� + System.currentTimeMillis() ) ; sv.saveRmAlarmStateLast(po) ; }else{ @@ -210,7 +213,8 @@ //闃�闂ㄥ叧闂姸鎬� if(controller != null && controller.getIntakeId() != null){ //铏氭嫙鍗″湪鍙栨按涓殑鍗犵敤鐘舵�佹敼涓洪潪搴旂敤鐘舵�� - sv.updateVirCardNoUseState(controller.getIntakeId()); + Date now = new Date() ; + sv.updateVirCardNoUseState(controller.getIntakeId(), now); } } } -- Gitblit v1.8.0