From fb7521b63ed150f6cddd86df95e7bf440ec6501f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 13 十二月 2021 11:49:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
index 6dc3ec0..dcdb366 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
@@ -13,8 +13,11 @@
import com.sandu.ximon.admin.manager.iot.rrpc.dto.WrapResponseCommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.topic.IBaseTopic;
import com.sandu.ximon.admin.manager.iot.rrpc.topic.ICustomizeTopic;
+import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
+import org.springframework.beans.BeanUtils;
import java.util.List;
+import java.util.Map;
/**
* @author chenjiantian
@@ -30,7 +33,37 @@
* @param clz 鍐呴儴甯у搷搴斿疄浣撶被 濡傛灉涓嶆兂鑷繁瑙ｆ瀽 鍙甫涓�
* @return 杩斿洖鐨勮В鐮佸抚瀹炰綋绫� 鍚屾椂鎶婂唴閮ㄥ抚瑙ｇ爜涔嬪悗涔熸惡甯︿笂
*/
- public abstract <T extends BaseResponseInnerFrame<T>> WrapResponseCommonFrame<T> sendRRPC(String deviceName, IRequestFrame iRequestFrame, Class<T> clz);
+ 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 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;
+ }
/**
* 鍩虹閫氫俊鍚屾璋冪敤
--
Gitblit v1.9.3