From 37041ac6ae6baa2996f447e495f6f5280113c4a2 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 二月 2022 15:30:37 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java | 130 ++++++++++++++++++++++---------------------
1 files changed, 66 insertions(+), 64 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java
index 2ad18a3..85e8505 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java
@@ -1,11 +1,12 @@
package com.sandu.ximon.admin.utils;
import com.sandu.ximon.admin.entity.AtmoHeartBeatDataPackage;
+import com.sandu.ximon.admin.entity.DataTransportMainFrame;
import com.sandu.ximon.admin.entity.DataTransportMainResponse;
+import com.sandu.ximon.admin.entity.DataTransportOrderType;
+import com.sandu.ximon.admin.manager.iot.frame.inner.AtmoCommonFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.AtmoFunctionCode;
import com.sandu.ximon.admin.manager.iot.frame.inner.response.AtmoQueryHeartBeatResponse;
-import com.sandu.ximon.admin.manager.iot.rrpc.util.SupplementUtils;
-import org.apache.logging.log4j.util.Base64Util;
import org.springframework.stereotype.Component;
@Component("AtmoAPIUtils")
@@ -13,6 +14,7 @@
/**
* 鏌ヨ澶ф皵鏁版嵁蹇冭烦鍖�
+ *
* @param mac
*/
public AtmoHeartBeatDataPackage queryHeartBeat(String mac) {
@@ -21,7 +23,7 @@
// 鍙戦�丷RPC
String result = rrpc(mac, frame);
- if(null != result) {
+ if (null != result) {
// 杩斿洖缁撴灉
result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
@@ -32,68 +34,68 @@
return null;
}
- /**
- * 鏌ヨ澶ф皵鏁版嵁蹇冭烦鍖呴棿闅旀椂闂�
- * @param mac
- */
- public Integer queryHeartBeatTime(String mac) {
- // 鐢熸垚鎺у埗甯�
- String frame = generateNoPayLoadFrame(AtmoFunctionCode.QueryHeartBeatTime, "FFFF");
- // 鍙戦�丷RPC
- String result = rrpc(mac, frame);
- if(null != result) {
- // 杩斿洖缁撴灉
- result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
- DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
- AtmoQueryHeartBeatTimeResponse response = new AtmoQueryHeartBeatTimeResponse().convertInstance(dataTransportMainResponse.getPayload());
- return response.getHeartBeatTimeInt();
- }
- return -1;
- }
+// /**
+// * 鏌ヨ澶ф皵鏁版嵁蹇冭烦鍖呴棿闅旀椂闂�
+// * @param mac
+// */
+// public Integer queryHeartBeatTime(String mac) {
+// // 鐢熸垚鎺у埗甯�
+// String frame = generateNoPayLoadFrame(AtmoFunctionCode.QueryHeartBeatTime, "FFFF");
+// // 鍙戦�丷RPC
+// String result = rrpc(mac, frame);
+// if(null != result) {
+// // 杩斿洖缁撴灉
+// result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
+// DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
+// AtmoQueryHeartBeatTimeResponse response = new AtmoQueryHeartBeatTimeResponse().convertInstance(dataTransportMainResponse.getPayload());
+// return response.getHeartBeatTimeInt();
+// }
+// return -1;
+// }
+//
+//
+// /**
+// * 杞噸鍚�
+// * @param mac
+// *
+// */
+// public String reboot(String mac) {
+// // 鐢熸垚鎺у埗甯�
+// String frame = generateNoPayLoadFrame(AtmoFunctionCode.Reboot, "FFFF");
+// // 鍙戦�丷RPC
+// String result = rrpc(mac, frame);
+// if(null != result) {
+// // 杩斿洖缁撴灉
+// result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
+// DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
+// AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
+// return response.getResponseStatus();
+// }
+// return CommonResponse.No_Response.getCode();
+// }
-
- /**
- * 杞噸鍚�
- * @param mac
- *
- */
- public String reboot(String mac) {
- // 鐢熸垚鎺у埗甯�
- String frame = generateNoPayLoadFrame(AtmoFunctionCode.Reboot, "FFFF");
- // 鍙戦�丷RPC
- String result = rrpc(mac, frame);
- if(null != result) {
- // 杩斿洖缁撴灉
- result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
- DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
- AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
- return response.getResponseStatus();
- }
- return CommonResponse.No_Response.getCode();
- }
-
- /**
- * 璁剧疆蹇冭烦鏃堕棿
- * @param mac
- * @param heartBeatTime s
- */
- public String settingHeartBeatTime(String mac, Integer heartBeatTime) {
- String payload = "FFFF" + SupplementUtils.suppleZero(HexStrConvertUtil.tenToHex(heartBeatTime),4);
- // 鐢熸垚鎺у埗甯�
- String frame = generateNoPayLoadFrame(AtmoFunctionCode.SettingHeartBeatTime, payload);
- // 鍙戦�丷RPC
- String result = rrpc(mac, frame);
- if(null != result) {
- // 杩斿洖缁撴灉
- result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
- DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
- AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
- return response.getResponseStatus();
- }
- return CommonResponse.No_Response.getCode();
- }
-
- private String generateNoPayLoadFrame(AtmoFunctionCode atmoFunctionCode, String payload){
+ // /**
+// * 璁剧疆蹇冭烦鏃堕棿
+// * @param mac
+// * @param heartBeatTime s
+// */
+// public String settingHeartBeatTime(String mac, Integer heartBeatTime) {
+// String payload = "FFFF" + SupplementUtils.suppleZero(HexStrConvertUtil.tenToHex(heartBeatTime),4);
+// // 鐢熸垚鎺у埗甯�
+// String frame = generateNoPayLoadFrame(AtmoFunctionCode.SettingHeartBeatTime, payload);
+// // 鍙戦�丷RPC
+// String result = rrpc(mac, frame);
+// if(null != result) {
+// // 杩斿洖缁撴灉
+// result = HexStrConvertUtil.bytesToHexString(Base64Util.decode(result));
+// DataTransportMainResponse dataTransportMainResponse = new DataTransportMainResponse().convertInstance(result.substring(2));
+// AtmoCommonResponse response = new AtmoCommonResponse().convertInstance(dataTransportMainResponse.getPayload());
+// return response.getResponseStatus();
+// }
+// return CommonResponse.No_Response.getCode();
+// }
+//
+ private String generateNoPayLoadFrame(AtmoFunctionCode atmoFunctionCode, String payload) {
String frame = DataTransportMainFrame.generateInstance(
DataTransportOrderType.AtmosphereData,
new AtmoCommonFrame(atmoFunctionCode, payload)
--
Gitblit v1.9.3