From 72046386cf8a85ad7dae79d82485fa60c2c421e6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 05 七月 2022 18:25:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/test/java/com/sandu/ximon/admin/BaseTopicTests.java | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 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 4bdfa41..bfdbae4 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,8 +1,10 @@
package com.sandu.ximon.admin;
+import cn.hutool.core.collection.CollectionUtil;
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.dto.DeviceStatus;
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;
@@ -18,31 +20,49 @@
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 com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.admin.service.RoleMenuRelationService;
+import com.sandu.ximon.dao.domain.RoleMenuRelation;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+
+import java.util.List;
@SpringBootTest
@Slf4j
class BaseTopicTests {
+@Autowired
+ PoleService poleService;
+@Autowired
+ RoleMenuRelationService roleMenuRelationService;
// 鏌ヨ璁惧璇︽儏
@Test
void queryDeviceDetail() {
- QueryDeviceDetailResponse.Data data = MainBoardInvokeSyncService.getInstance().queryDeviceDetail("baseDevice", null);
+ QueryDeviceDetailResponse.Data data = MainBoardInvokeSyncService.getInstance().queryDeviceDetail("32313243305007ff8d60ffff", null);
System.out.println(data.toString());
+
+ List<DeviceStatus> statusList = poleService.listStatusByDeviceCode(CollectionUtil.toList("32313243305008ff0805ffff","32313243305007ff8d60ffff"));
+ System.out.println(statusList);
}
// 鎺у埗鐏殑浜害绾у埆 0-100
@Test
void rrpcLightControl() {
- A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(80);
+ // 32313243305008ff1a06ffff
+ A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(80, "FFFF");
A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame);
- WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
- .sendRRPC("32313243305008ff1a06ffff", a5Frame, A5LightBrightnessRespInnerFrame.class);
- System.out.println(frame.toString());
+ try {
+ WrapResponseCommonFrame<A5LightBrightnessRespInnerFrame> frame = MainBoardInvokeSyncService.getInstance()
+ .sendRRPC("32313243305005ff2930ffff", a5Frame, A5LightBrightnessRespInnerFrame.class);
+ System.out.println(frame.toString());
+ }catch (BusinessException e){
+ e.printStackTrace();
+ }
}
@@ -58,7 +78,7 @@
// 璁惧娉ㄥ唽
@Test
void register() {
- // 1
+ // 1鑾峰彇鏂扮殑Mac
String baseMac = "baseDevice";
A1Frame a1Frame = new A1Frame(A1OrderEnum.REQUEST_READ_DEVICE_UNIQUE_MAC.getCode(), new EmptyRequestInnerFrame());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance()
@@ -72,17 +92,17 @@
uniqueMac = uniqueMac.toLowerCase();
log.info("鍞竴鐮亄}",uniqueMac);
- // 2
+ // 2 浠庨樋閲屾敞鍐�
MainBoardInvokeSyncService.getInstance().registerDevice(uniqueMac);
- // 3
+ // 3 鑾峰彇璁惧璇︽儏
QueryDeviceDetailResponse.Data deviceDetail = MainBoardInvokeSyncService.getInstance().queryDeviceDetail(uniqueMac, null);
if(deviceDetail == null){
throw new BusinessException("娉ㄥ唽澶辫触");
}
log.info(deviceDetail.toString());
- // 4
+ // 4 閰嶇疆Mac鈶�
WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> productKeyResp = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(MainBoardInvokeSyncService.getInstance().getProductKey()))
@@ -93,7 +113,7 @@
throw new BusinessException("璁惧閰嶇疆ProductKey澶辫触");
}
- // 5
+ // 5 閰嶇疆Mac鈶�
WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> responseCommonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(uniqueMac))
@@ -104,7 +124,7 @@
throw new BusinessException("璁惧閰嶇疆鍚嶅け璐�");
}
- // 6
+ // 6 閰嶇疆Mac鈶�
WrapResponseCommonFrame<A1TernaryCodeRespInnerFrame> wrapResponseCommonFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA1().innerFrame(new A1TernaryCodeReqInnerFrame(deviceDetail.getDeviceSecret()))
@@ -115,7 +135,7 @@
throw new BusinessException("璁惧瀵嗛挜澶辫触");
}
- // 7
+ // 7 閲嶅惎璁惧 骞朵娇鐢ㄦ柊鐨凪ac
CommonFrame rebootFrame = MainBoardInvokeSyncService.getInstance()
.sendRRPC(baseMac,
FrameBuilder.builderA2().innerFrame(new EmptyRequestInnerFrame())
--
Gitblit v1.9.3