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/local/CommandInnerDeaLer.java | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 9 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 7d5ced8..d2f4740 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,9 +1,13 @@
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.common.mw.protocol.rtuState.RtuStatus;
import com.dy.rtuMw.server.local.localProtocol.*;
+
+import java.util.HashMap;
+import java.util.Map;
/**
* @Author liurunyu
@@ -21,15 +25,25 @@
String code = com.getCode() ;
if(code.equals(CodeLocal.clock)){
return this.clock(com) ;
- }else if(code.equals(CodeLocal.onLine)){
- return this.onLine(com) ;
+ }else if(code.equals(CodeLocal.onAllLine)){
+ return this.onAllLine(com) ;
+ }else if(code.equals(CodeLocal.onPartLine)){
+ return this.onPartLine(com) ;
+ }else if(code.equals(CodeLocal.onLineStatistics)){
+ return this.onLineStateStatistics(com) ;
+ }else if(code.equals(CodeLocal.allRtuStates)){
+ return this.allRtuStates(com) ;
+ }else if(code.equals(CodeLocal.partRtuStates)){
+ return this.someRtuStates(com) ;
+ }else if(code.equals(CodeLocal.oneRtuStates)){
+ return this.oneRtuStates(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.mwInfo)){
+ }else if(code.equals(CodeLocal.mwState)){
return this.mwInfo(com) ;
}
return ReturnCommand.errored("鍑洪敊锛屾敹鍒板唴閮ㄥ懡浠ょ殑鍔熻兘鐮佷笉鑳借瘑鍒紒", com.getId(), com.getCode()) ;
@@ -48,9 +62,69 @@
* 鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌
* @throws Exception
*/
- private Command onLine(Command command) throws Exception{
- RtuOnLineVo ol = new RtuOnLineDeal().deal() ;
- return ReturnCommand.successed("鏌ヨ鎵�鏈夋祴绔欏湪绾挎儏鍐电粨鏋�", command.getId(), command.getCode(), ol) ;
+ private Command onAllLine(Command command) throws Exception{
+ HashMap<String, Boolean> map = new RtuOnLineDeal().dealAll() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), map) ;
+ }
+
+ /**
+ * 鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌
+ * @throws Exception
+ */
+ private Command onPartLine(Command command) throws Exception{
+ if(command.param != null && command.param instanceof String && !command.param.equals("")){
+ String[] rtuAddrGrp = ((String)command.param).split(",");
+ HashMap<String, Boolean> map = new RtuOnLineDeal().dealPart(rtuAddrGrp) ;
+ return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), map) ;
+ }else{
+ return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�涓�", command.getId(), command.getCode()) ;
+ }
+ }
+
+ /**
+ * 缁熻鍦ㄧ嚎涓庝笉鍦ㄧ嚎鎯呭喌
+ * @throws Exception
+ */
+ private Command onLineStateStatistics(Command command) throws Exception{
+ RtuOnLineStateStatisticsVo vo = new RtuOnLineStateStatisticsDeal().deal() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), vo) ;
+ }
+
+ /**
+ * 鏌ヨ鎵�鏈塕TU鐘舵��
+ * @throws Exception
+ */
+ private Command allRtuStates(Command command) throws Exception{
+ Map<String, RtuStatus> map = new RtuStatusDeal().dealAll() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鐘舵�佺粨鏋�", command.getId(), command.getCode(), map) ;
+ }
+
+ /**
+ * 鏌ヨ閮ㄥ垎RTU鐘舵��
+ * @throws Exception
+ */
+ private Command someRtuStates(Command command) throws Exception{
+ if(command.param != null && command.param instanceof String && !command.param.equals("")){
+ String[] rtuAddrGrp = ((String)command.param).split(",");
+ Map<String, RtuStatus> map = new RtuStatusDeal().dealSome(rtuAddrGrp) ;
+ return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鐘舵�佺粨鏋�", command.getId(), command.getCode(), map) ;
+ }else{
+ return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�涓�", command.getId(), command.getCode()) ;
+ }
+ }
+
+ /**
+ * 鏌ヨ閮ㄥ垎RTU鐘舵��
+ * @throws Exception
+ */
+ private Command oneRtuStates(Command command) throws Exception{
+ if(command.param != null && command.param instanceof String && !command.param.equals("")){
+ String rtuAddr = (String)command.param;
+ RtuStatus rtuStatus = new RtuStatusDeal().dealOne(rtuAddr) ;
+ return ReturnCommand.successed("鏌ヨ涓�涓猂TU鐘舵�佺粨鏋�", command.getId(), command.getCode(), rtuStatus) ;
+ }else{
+ return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�", command.getId(), command.getCode()) ;
+ }
}
/**
@@ -67,9 +141,8 @@
* @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 {
-
}
});
return ReturnCommand.successed("宸茬粡鍚姩鍋滄TCP鏈嶅姟", command.getId(), command.getCode(), null) ;
--
Gitblit v1.8.0