From ba2c5cb35e1bd1a81bf4027b7aeab16a0a26bb05 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期三, 13 十一月 2024 10:00:43 +0800
Subject: [PATCH] 获取未关阀记录接口，返回多条记录

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 53 insertions(+), 7 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 927c1b0..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
@@ -21,10 +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)){
@@ -50,9 +60,23 @@
      * 鏌ヨ鎵�鏈塕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()) ;
+        }
     }
 
     /**
@@ -61,7 +85,30 @@
      */
     private Command onLineStateStatistics(Command command) throws Exception{
         RtuOnLineStateStatisticsVo vo = new RtuOnLineStateStatisticsDeal().deal() ;
-        return ReturnCommand.successed("鏌ヨ鎵�鏈夋祴绔欏湪绾挎儏鍐电粨鏋�", command.getId(), command.getCode(), vo) ;
+        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()) ;
+        }
     }
 
     /**
@@ -80,7 +127,6 @@
     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) ;

--
Gitblit v1.8.0