From 3fe912a1d0ceca7cd0281e26b798b55b539ec2cd Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期二, 15 十月 2024 15:19:56 +0800 Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑,对于当天发现的控制器,控制器计算的漏损量一定不正确,强制设置成0; --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java index 9ae2f68..5b498e3 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java @@ -1,6 +1,6 @@ package com.dy.rtuMw.server.local; -import com.dy.common.mw.UnitStartedCallbackInterface; +import com.dy.common.mw.UnitCallbackInterface; import com.dy.common.mw.channel.tcp.TcpUnit; import com.dy.common.mw.protocol.Command; import com.dy.rtuMw.server.local.localProtocol.*; @@ -29,6 +29,8 @@ return this.stopTcpSv(com) ; }else if(code.equals(CodeLocal.recoverTcpSv)){ return this.recoverTcpSv(com) ; + }else if(code.equals(CodeLocal.mwState)){ + return this.mwInfo(com) ; } return ReturnCommand.errored("鍑洪敊锛屾敹鍒板唴閮ㄥ懡浠ょ殑鍔熻兘鐮佷笉鑳借瘑鍒紒", com.getId(), com.getCode()) ; } @@ -65,7 +67,7 @@ * @throws Exception */ private Command stopTcpSv(Command command) throws Exception{ - TcpUnit.getInstance().stop(new UnitStartedCallbackInterface(){ + TcpUnit.getInstance().stop(new UnitCallbackInterface(){ public void call(Object obj) throws Exception { } @@ -84,4 +86,14 @@ + /** + * 鏌ヨ閫氫俊涓棿浠惰繍琛屾儏鍐� + * @throws Exception + */ + private Command mwInfo(Command command) throws Exception{ + MwInfoVo mwInfo = new MwInfoDeal().deal() ; + return ReturnCommand.successed("鏌ヨ閫氫俊涓棿浠惰繍琛屾儏鍐�", command.getId(), command.getCode(), mwInfo) ; + } + + } -- Gitblit v1.8.0