From a4e8fdfb30294b4812ef972606e7ae7ff5d2b5f8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 12 一月 2022 11:39:58 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java b/ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java
index 5f566d6..7d3eca0 100644
--- a/ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java
+++ b/ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java
@@ -58,6 +58,7 @@
// 璁惧娉ㄥ唽
@Test
void register() {
+ // 1鑾峰彇鏂扮殑Mac
String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
@@ -66,18 +67,22 @@
throw new BusinessException("璇诲彇璁惧鍞竴ID澶辫触");
}
A1DeviceMacRespInnerFrame a1DeviceMacRespInnerFrame = new A1DeviceMacRespInnerFrame().transformFrame(commonFrame.getPayload());
-
log.info(commonFrame.toString());
String uniqueMac = a1DeviceMacRespInnerFrame.getMac();
uniqueMac = uniqueMac.toLowerCase();
log.info("鍞竴鐮亄}",uniqueMac);
+
+ // 2 浠庨樋閲屾敞鍐�
MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
+
+ // 3 鑾峰彇璁惧璇︽儏
QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
if(deviceDetail == null){
throw new BusinessException("娉ㄥ唽澶辫触");
}
-
log.info(deviceDetail.toString());
+
+ // 4 閰嶇疆Mac鈶�
WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
@@ -88,6 +93,7 @@
throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
}
+ // 5 閰嶇疆Mac鈶�
WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
@@ -98,6 +104,7 @@
throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
}
+ // 6 閰嶇疆Mac鈶�
WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
@@ -108,6 +115,7 @@
throw new BusinessException("璁惧瀵嗛挜澶辫触");
}
+ // 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
--
Gitblit v1.9.3