From 17e18047a47f43187f590a045b1aebe130459292 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 26 九月 2022 18:12:21 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/mainboard/MainBoardInvokeSyncService.java | 82 ++++++++++++++++------------------------
1 files changed, 33 insertions(+), 49 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/mainboard/MainBoardInvokeSyncService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/mainboard/MainBoardInvokeSyncService.java
index 617cfb2..2fb53cf 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/mainboard/MainBoardInvokeSyncService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/mainboard/MainBoardInvokeSyncService.java
@@ -1,22 +1,10 @@
package com.sandu.ximon.admin.manager.iot.rrpc.mainboard;
-import com.alibaba.fastjson.JSON;
import com.aliyuncs.DefaultAcsClient;
-import com.aliyuncs.iot.model.v20180120.InvokeThingServiceResponse;
import com.aliyuncs.profile.DefaultProfile;
import com.aliyuncs.profile.IClientProfile;
-import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.manager.iot.amqp.MqttMainBoardConfig;
-import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
-import com.sandu.ximon.admin.manager.iot.frame.inner.BaseResponseInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.BaseInvokeSyncService;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.InvokeParam;
-import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
-import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
-import org.springframework.beans.BeanUtils;
-
-import java.util.Map;
/**
* @author chenjiantian
@@ -33,49 +21,45 @@
return PRODUCT_KEY;
}
- @Override
- public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame) {
- InvokeParam param = new InvokeParam();
- param.setOperate("1001");
- param.setFrame(iRequestFrame.getEncodeFrame());
- InvokeThingServiceResponse.Data data = invokeThing(deviceName, param);
- if (data == null) {
- return null;
- }
- String result = data.getResult();
- result = result.replace("\\", "");
- Map map = JSON.parseObject(result, Map.class);
- result = (String) map.get("msg");
- CommonFrame connectFrame = FrameUtils.transformMessageToFrame(result);
- return connectFrame;
- }
+// @Override
+// public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame) {
+// InvokeParam param = new InvokeParam();
+// param.setOperate("1001");
+// param.setFrame(iRequestFrame.getEncodeFrame());
+// InvokeThingServiceResponse.Data data = invokeThing(deviceName, param);
+// if (data == null) {
+// return null;
+// }
+// String result = data.getResult();
+// result = result.replace("\\", "");
+// Map map = JSON.parseObject(result, Map.class);
+// result = (String) map.get("msg");
+// CommonFrame connectFrame = FrameUtils.transformMessageToFrame(result);
+// return connectFrame;
+// }
+//
+// @Override
+// public <T extends BaseResponseInnerFrame<T>> WrapResponseCommonFrame<T> sendRRPC(String deviceName, IRequestFrame iRequestFrame, Class<T> clz) {
+// CommonFrame commonFrame = sendRRPC(deviceName, iRequestFrame);
+// if (commonFrame == null) {
+// throw new BusinessException("rrpc璇锋眰澶辫触");
+// }
+// WrapResponseCommonFrame<T> responseCommonFrame = new WrapResponseCommonFrame<>();
+// BeanUtils.copyProperties(commonFrame, responseCommonFrame);
+// try {
+// responseCommonFrame.setResponseInnerFrame(clz.newInstance().transformFrame(responseCommonFrame.getPayload()));
+// } catch (InstantiationException | IllegalAccessException e) {
+// throw new BusinessException(String.format("鎵句笉鍒�%s鐨勬瀯閫犲嚱鏁�", clz.getName()));
+// }
+// return responseCommonFrame;
+// }
- @Override
- public <T extends BaseResponseInnerFrame<T>> WrapResponseCommonFrame<T> sendRRPC(String deviceName, IRequestFrame iRequestFrame, Class<T> clz) {
- CommonFrame commonFrame = sendRRPC(deviceName, iRequestFrame);
- if (commonFrame == null) {
- throw new BusinessException("rrpc璇锋眰澶辫触");
- }
- WrapResponseCommonFrame<T> responseCommonFrame = new WrapResponseCommonFrame<>();
- BeanUtils.copyProperties(commonFrame, responseCommonFrame);
- try {
- responseCommonFrame.setResponseInnerFrame(clz.newInstance().transformFrame(responseCommonFrame.getPayload()));
- } catch (InstantiationException | IllegalAccessException e) {
- throw new BusinessException(String.format("鎵句笉鍒�%s鐨勬瀯閫犲嚱鏁�", clz.getName()));
- }
- return responseCommonFrame;
- }
-
- public static void main(String[] args) {
- String s = "FEA581000BFE010003FFFF004597147735AB2D28";
- System.out.println(FrameUtils.decodeReportMessage(s));
- }
private static class SingletonClassInstance {
private static final MainBoardInvokeSyncService INSTANCE = new MainBoardInvokeSyncService();
}
- private MainBoardInvokeSyncService() {
+ protected MainBoardInvokeSyncService() {
}
public static MainBoardInvokeSyncService getInstance() {
--
Gitblit v1.9.3