From 9bf5df94f1a8ae360ccb07a54031eead9132de23 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 18 三月 2022 14:16:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
index 3137165..d591e72 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java
@@ -462,22 +462,17 @@
                 .build();
         CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
                 .sendRRPC(deviceName, build);
+
         System.out.println(commonFrame.toString());
+
         CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
                 .sendRRPC(deviceName,
                         FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
                                 .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
-        if ("00".equals(rebootFrame.getPayload())) {
-            System.out.println("閲嶅惎鎴愬姛");
-        }
 
-        CommonFrame result = MainBoardInvokeSyncService.getInstance()
-                .sendRRPC(deviceName,
-                        FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
-                                .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
 
         boolean b = false;
-        if ("00".equals(result.getPayload())) {
+        if ("00".equals(rebootFrame.getPayload())) {
             byId.setDeviceCode(null);
             b = updateById(byId);
             System.out.println("閲嶅惎鎴愬姛");

--
Gitblit v1.9.3