From db88628e7bb03f334fa65826bd655c27859a9973 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 03 十一月 2024 16:52:04 +0800 Subject: [PATCH] 1、协议版本号增加到协议解析与命令构造中; 2、增加RTU状态记录功能,为RTU远程升级做准备。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 73 ++++++++++++++++++++++++++++++++---- 1 files changed, 65 insertions(+), 8 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 a2dfc3a..595cb98 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.rtuMw.server.forTcp.RtuStatus; import com.dy.rtuMw.server.local.localProtocol.*; + +import java.util.HashMap; +import java.util.Map; /** * @Author liurunyu @@ -21,8 +25,16 @@ 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.partRtuStates(com) ; }else if(code.equals(CodeLocal.allProtocols)){ return this.allProtocols(com) ; }else if(code.equals(CodeLocal.stopTcpSv)){ @@ -48,9 +60,55 @@ * 鏌ヨ鎵�鏈塕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 partRtuStates(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().dealPart(rtuAddrGrp) ; + return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鐘舵�佺粨鏋�", command.getId(), command.getCode(), map) ; + }else{ + return ReturnCommand.errored("鍑洪敊锛屽懡浠ゅ弬鏁板簲璇ユ槸鎵�鏌ヨRTU鐨勫湴鍧�涓�", command.getId(), command.getCode()) ; + } } /** @@ -67,9 +125,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