From 080c76ddb23b9f199ed2f59f3871b0058347d43e Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 05 六月 2025 20:27:52 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/local/CommandInnerDeaLer.java |   53 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 48 insertions(+), 5 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 595cb98..9e21c81 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,8 +3,9 @@
 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.common.mw.protocol.rtuState.RtuStatus;
 import com.dy.rtuMw.server.local.localProtocol.*;
+import com.dy.rtuMw.server.mqtt.MqttUnit;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -34,13 +35,17 @@
         }else if(code.equals(CodeLocal.allRtuStates)){
             return this.allRtuStates(com) ;
         }else if(code.equals(CodeLocal.partRtuStates)){
-            return this.partRtuStates(com) ;
+            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.recoverMqttSv)){
+            return this.stopMqttSv(com) ;
         }else if(code.equals(CodeLocal.mwState)){
             return this.mwInfo(com) ;
         }
@@ -94,20 +99,34 @@
      */
     private Command allRtuStates(Command command) throws Exception{
         Map<String, RtuStatus> map =  new RtuStatusDeal().dealAll() ;
-        return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鍦ㄧ嚎鎯呭喌缁撴灉", command.getId(), command.getCode(), map) ;
+        return ReturnCommand.successed("鏌ヨ鎵�鏈塕TU鐘舵�佺粨鏋�", command.getId(), command.getCode(), map) ;
     }
 
     /**
      * 鏌ヨ閮ㄥ垎RTU鐘舵��
      * @throws Exception
      */
-    private Command partRtuStates(Command command) 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().dealPart(rtuAddrGrp) ;
+            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()) ;
         }
     }
 
@@ -141,6 +160,30 @@
         return ReturnCommand.successed("宸茬粡鍚姩鎭㈠TCP鏈嶅姟", command.getId(), command.getCode(), null) ;
     }
 
+    /**
+     * 鍋滄TCP鏈嶅姟锛屼笉鍐嶆帴鍏ユ柊鐨凾CP杩炴帴锛屽凡缁廡CP杩炴帴鐨勫叏閮ㄦ柇杩炴帴
+     * @throws Exception
+     */
+    private Command stopMqttSv(Command command) throws Exception{
+        MqttUnit.getInstance().stop(new UnitCallbackInterface(){
+            public void call(Object obj) throws Exception {
+            }
+        });
+        return ReturnCommand.successed("宸茬粡鍚姩鍋滄Mqtt鏈嶅姟", command.getId(), command.getCode(), null) ;
+    }
+
+
+    /**
+     * 鎭㈠TCP鏈嶅姟锛屾帴鍏ユ柊鐨凾CP杩炴帴
+     * @throws Exception
+     */
+    private Command recoverMqttSv(Command command) throws Exception{
+        MqttUnit.getInstance().recover(new UnitCallbackInterface(){
+            public void call(Object obj) throws Exception {
+            }
+        });
+        return ReturnCommand.successed("宸茬粡鍚姩鎭㈠Mqtt鏈嶅姟", command.getId(), command.getCode(), null) ;
+    }
 
 
     /**

--
Gitblit v1.8.0