From 3b676f0cf83872a79bf627a9024e37b3d1820e3d Mon Sep 17 00:00:00 2001
From: chenjiantian <214228265@qq.com>
Date: 星期一, 13 十二月 2021 11:08:18 +0800
Subject: [PATCH] 基础通信

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/mainboard/MainBoardInvokeSyncService.java |   70 ++++++++++++++++------------------
 1 files changed, 33 insertions(+), 37 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..8f6de85 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
@@ -33,49 +33,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