From f8555ffb6f16017b62c48d5b90e3716029eef6ff Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期三, 08 十二月 2021 11:45:13 +0800
Subject: [PATCH] 通信协议完善
---
ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 95 insertions(+), 16 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 8ef4e5c..4ba3f59 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
@@ -1,40 +1,44 @@
package com.sandu.ximon.admin;
import com.aliyuncs.iot.model.v20180120.QueryDeviceDetailResponse;
+import com.aliyuncs.iot.model.v20180120.RegisterDeviceResponse;
+import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.manager.iot.frame.A1Frame;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.EmptyRequestInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.LightBrightnessReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.request.LightHeartbeatReqInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.response.LightBrightnessRespInnerFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.response.LightHeartbeatRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.request.*;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1DeviceMacRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A1TernaryCodeRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightBrightnessRespInnerFrame;
+import com.sandu.ximon.admin.manager.iot.frame.inner.response.A5LightHeartbeatRespInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A1OrderEnum;
-import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5LightDataEnum;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.A2OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
+import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
@SpringBootTest
+@Slf4j
class BaseTopicTests {
@Test
void queryDeviceDetail() {
- QueryDeviceDetailResponse.Data data = MainBoardInvokeSyncService.getInstance().queryDeviceDetail("32313243305005ff0431ffff", null);
+ QueryDeviceDetailResponse.Data data = MainBoardInvokeSyncService.getInstance().queryDeviceDetail("32313243305007ff3055ffff01", null);
System.out.println(data.toString());
}
@Test
void rrpcLightControl() {
- LightBrightnessReqInnerFrame lightControlFrame = new LightBrightnessReqInnerFrame(80);
+ A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(80);
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame);
- WrapResponseCommonFrame<LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC("32313243305008ff1a06ffff", a5Frame, LightBrightnessRespInnerFrame.class);
+ WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC("32313243305008ff1a06ffff", a5Frame, A5LightBrightnessRespInnerFrame.class);
// LightControlResponseInnerFrame lightControlResponseInnerFrame = new LightControlResponseInnerFrame();
// LightControlResponseInnerFrame innerFrame = lightControlResponseInnerFrame.transformFrame(commonFrame.getPayload());
System.out.println(frame.toString());
@@ -50,20 +54,95 @@
}
@Test
- void registerWithReturn() {
- String de = "baseDevice".toLowerCase();
- QueryDeviceDetailResponse.Data data = MainBoardInvokeSyncService.getInstance().queryDeviceDetail("baseDevice", null);
- System.out.println(data.toString());
+ void register() {
+ String baseMac = "baseDevice";
+ String MAINBOARD_PDK = "a1JsfPG4iKW";
+ A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac, a1Frame);
+ if(commonFrame == null){
+ 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);
+ MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
+ QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
+ if(deviceDetail == null){
+ throw new BusinessException("娉ㄥ唽澶辫触");
+ }
+
+ log.info(deviceDetail.toString());
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MAINBOARD_PDK))
+ .orderType(A1OrderEnum.REQUEST_SET_PRODUCT_KEY.getCode()).build(),
+ A1TernaryCodeRespInnerFrame.class);
+ A1TernaryCodeRespInnerFrame responseInnerFrame = productKeyResp.getResponseInnerFrame();
+ if(!MAINBOARD_PDK.equals(responseInnerFrame.getTernaryCode())){
+ throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
+ }
+
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
+ .orderType(A1OrderEnum.REQUEST_SET_DEVICE_NAME.getCode()).build(),
+ A1TernaryCodeRespInnerFrame.class);
+ A1TernaryCodeRespInnerFrame deviceNameFrame = responseCommonFrame.getResponseInnerFrame();
+ if(!uniqueMac.equals(deviceNameFrame.getTernaryCode())){
+ throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
+ }
+
+ WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
+ .orderType(A1OrderEnum.REQUEST_SET_DEVICE_SECRET.getCode()).build(),
+ A1TernaryCodeRespInnerFrame.class);
+ A1TernaryCodeRespInnerFrame deviceSecretFrame = wrapResponseCommonFrame.getResponseInnerFrame();
+ if (!deviceDetail.getDeviceSecret().equals(deviceSecretFrame.getTernaryCode())) {
+ throw new BusinessException("璁惧瀵嗛挜澶辫触");
+ }
+
+ CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC(baseMac,
+ FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
+ .orderType(A2OrderEnum.REQUEST_MAIN_BOARD_RESET.getCode()).build());
+ if (rebootFrame.getPayload().equals("00")) {
+ System.out.println("閲嶅惎鎴愬姛");
+ }
}
@Test
void LightHeartbeat() {
IRequestFrame build = FrameBuilder.builderA5()
.orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
- .innerFrame(new LightHeartbeatReqInnerFrame())
+ .innerFrame(new A5LightHeartbeatReqInnerFrame())
.build();
- WrapResponseCommonFrame<LightHeartbeatRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff1a06ffff", build, LightHeartbeatRespInnerFrame.class);
+ WrapResponseCommonFrame<A5LightHeartbeatRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC("32313243305008ff1a06ffff", build, A5LightHeartbeatRespInnerFrame.class);
System.out.println("responseCommonFrame.toString()");
System.out.println(responseCommonFrame.toString());
}
+
+ @Test
+ void LightReset() {
+ String deviceName = "32313243305007ff3055ffff01";
+ IRequestFrame build = FrameBuilder.builderA5()
+ .orderType(A5OrderEnum.REQUEST_LIGHT_DATA.getCode())
+ .innerFrame(new A5LightResetReqInnerFrame())
+ .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 (rebootFrame.getPayload().equals("00")) {
+ System.out.println("閲嶅惎鎴愬姛");
+ }
+
+ }
}
--
Gitblit v1.9.3