From 7983ce4db5c7bfcda3f5b28efe79ef82b83c53fa Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 24 八月 2022 15:35:33 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java | 89 +++++++++++++++++++++++++++++++++++---------
1 files changed, 70 insertions(+), 19 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..72c8918 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,13 +13,19 @@
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 lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
import java.util.List;
+import java.util.Map;
/**
* @author chenjiantian
* @date 2021/12/2 18:21
*/
+@Slf4j
public abstract class BaseInvokeSyncService implements IInvoke, IBaseTopic, ICustomizeTopic {
/**
@@ -30,7 +36,36 @@
* @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) {
+ return null;
+ }
+ 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");
+ return FrameUtils.transformMessageToFrame(result);
+ }
/**
* 鍩虹閫氫俊鍚屾璋冪敤
@@ -118,7 +153,7 @@
return null;
}
- /**
+ /**
* 璋冪敤鑷畾涔塼opic
* https://help.aliyun.com/document_detail/69584.htm?spm=a2c4g.11186623.0.0.25b33982bSQSom#reference-snk-mrz-wdb
*
@@ -137,24 +172,40 @@
request.setIdentifier("rrpc");
request.setArgs(JSON.toJSONString(param));
+
// 鑾峰緱鏈嶅姟璋冪敤鍝嶅簲
- InvokeThingServiceResponse response = null;
- try {
- response = getClient().getAcsResponse(request);
- } catch (ClientException e) {
- e.printStackTrace();
+ return getAcsResponse(request, 1);
+ }
+
+ /**
+ * 鑾峰緱鏈嶅姟璋冪敤鍝嶅簲
+ *
+ * @param request
+ * @return
+ */
+ private InvokeThingServiceResponse.Data getAcsResponse(InvokeThingServiceRequest request, int time) {
+ if (time <= 3) {
+ InvokeThingServiceResponse response = null;
+ try {
+ response = getClient().getAcsResponse(request);
+ if (response == null) {
+ log.error("璋冪敤rrpc澶辫触锛屽搷搴斾负绌猴紒");
+ Thread.sleep(100);
+ return getAcsResponse(request, time + 1);
+ }
+ if (!response.getSuccess()) {
+ log.error("璋冪敤rrpc澶辫触锛�" + response.getErrorMessage());
+ Thread.sleep(100);
+ return getAcsResponse(request, time + 1);
+ } else {
+ // 鏈嶅姟璋冪敤鎴愬姛锛屼粎浠ｈ〃鍙戦�佹湇鍔℃寚浠ょ殑鎴愬姛锛屼笉浠ｈ〃鎵ц鏈嶅姟鏈韩鏄惁鎴愬姛
+ return response.getData();
+ }
+ } catch (Exception e) {
+ throw new BusinessException("閿欒淇℃伅锛�" + e.getMessage());
+ }
+ } else {
+ throw new BusinessException("纭欢璇锋眰澶辫触锛岃妫�鏌ョ‖浠惰澶囷紒");
}
- if (response == null) {
- throw new BusinessException("璋冪敤rrpc澶辫触");
- }
- if (!response.getSuccess()) {
- throw new BusinessException("璋冪敤rrpc澶辫触锛�" + response.getErrorMessage());
- }
- // 鏈嶅姟璋冪敤鎴愬姛锛屼粎浠ｈ〃鍙戦�佹湇鍔℃寚浠ょ殑鎴愬姛锛屼笉浠ｈ〃鎵ц鏈嶅姟鏈韩鏄惁鎴愬姛
- if (response.getSuccess()) {
- // 浠呭悓姝ユ湇鍔℃湁result
- return response.getData();
- }
- return null;
}
}
--
Gitblit v1.9.3