From 42155cb925930831293dd10ac5037c04619e92c9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 17 十月 2024 16:05:08 +0800
Subject: [PATCH] 修改通信中间件上行数据的漏损量处理逻辑，对于当天绑定（发现并绑定）的控制器，控制器计算的漏损量一定不正确，强制设置成0，本次修改是把原实现用发现日期时间控制，变成绑定日期时间控制。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 54 insertions(+), 1 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 c6ee776..927c1b0 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,7 +1,9 @@
package com.dy.rtuMw.server.local;
-import com.dy.rtuMw.server.local.localProtocol.*;
+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.*;
/**
* @Author liurunyu
@@ -21,8 +23,16 @@
return this.clock(com) ;
}else if(code.equals(CodeLocal.onLine)){
return this.onLine(com) ;
+ }else if(code.equals(CodeLocal.onLineStatistics)){
+ return this.onLineStateStatistics(com) ;
}else if(code.equals(CodeLocal.allProtocols)){
return this.allProtocols(com) ;
+ }else if(code.equals(CodeLocal.stopTcpSv)){
+ 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()) ;
}
@@ -46,6 +56,15 @@
}
/**
+ * 缁熻鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
+ * @throws Exception
+ */
+ private Command onLineStateStatistics(Command command) throws Exception{
+ RtuOnLineStateStatisticsVo vo = new RtuOnLineStateStatisticsDeal().deal() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈夋祴绔欏湪绾挎儏鍐电粨鏋�", command.getId(), command.getCode(), vo) ;
+ }
+
+ /**
* 鏌ヨ鎵�鏈塕TU鍗忚閰嶇疆
* @throws Exception
*/
@@ -54,4 +73,38 @@
return ReturnCommand.successed("鏌ヨ鎵�鏈夐�氫俊鍗忚閰嶇疆", command.getId(), command.getCode(), mc) ;
}
+ /**
+ * 鍋滄TCP鏈嶅姟锛屼笉鍐嶆帴鍏ユ柊鐨凾CP杩炴帴锛屽凡缁廡CP杩炴帴鐨勫叏閮ㄦ柇杩炴帴
+ * @throws Exception
+ */
+ private Command stopTcpSv(Command command) throws Exception{
+ TcpUnit.getInstance().stop(new UnitCallbackInterface(){
+ public void call(Object obj) throws Exception {
+
+ }
+ });
+ return ReturnCommand.successed("宸茬粡鍚姩鍋滄TCP鏈嶅姟", command.getId(), command.getCode(), null) ;
+ }
+
+ /**
+ * 鎭㈠TCP鏈嶅姟锛屾帴鍏ユ柊鐨凾CP杩炴帴
+ * @throws Exception
+ */
+ private Command recoverTcpSv(Command command) throws Exception{
+ TcpUnit.getInstance().recover();
+ return ReturnCommand.successed("宸茬粡鍚姩鎭㈠TCP鏈嶅姟", command.getId(), command.getCode(), null) ;
+ }
+
+
+
+ /**
+ * 鏌ヨ閫氫俊涓棿浠惰繍琛屾儏鍐�
+ * @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