From 107ef10e9309dd299e8983232dbec5beacecb06d Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 28 十一月 2024 15:14:19 +0800
Subject: [PATCH] 获取任务类型列表接口，获取工单列表接口返回值增加处理结果ID字段
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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 1b25086..3441197 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
@@ -3,7 +3,11 @@
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
@@ -27,6 +31,10 @@
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)){
@@ -53,8 +61,8 @@
* @throws Exception
*/
private Command onAllLine(Command command) throws Exception{
- RtuOnLineVo ol = new RtuOnLineDeal().dealAll() ;
- return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), ol) ;
+ HashMap<String, Boolean> map = new RtuOnLineDeal().dealAll() ;
+ return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), map) ;
}
/**
@@ -64,8 +72,8 @@
private Command onPartLine(Command command) throws Exception{
if(command.param != null && command.param instanceof String && !command.param.equals("")){
String[] rtuAddrGrp = ((String)command.param).split(",");
- RtuOnLineVo ol = new RtuOnLineDeal().dealPart(rtuAddrGrp) ;
- return ReturnCommand.successed("鏌ヨ閮ㄥ垎RTU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), ol) ;
+ 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()) ;
}
@@ -81,6 +89,29 @@
}
/**
+ * 鏌ヨ鎵�鏈塕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()) ;
+ }
+ }
+
+ /**
* 鏌ヨ鎵�鏈塕TU鍗忚閰嶇疆
* @throws Exception
*/
--
Gitblit v1.8.0