From 2b9c6e86f1fb2abd7ad7f1a8d74d3fcd515da858 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 19 十月 2022 16:28:39 +0800
Subject: [PATCH] MQTT
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MQTTTestController.java | 73 ++++++++++++++++++++++++++++++++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java | 13 ++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/topic/ICustomizeTopic.java | 9 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java | 2 -
dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java | 1
5 files changed, 96 insertions(+), 2 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
index e34ef2c..1df944d 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/enums/MenuEnum.java
@@ -64,6 +64,7 @@
BANNER("寰俊logo"),
POLE_LIST("鐏潌鍒楄〃"),
LIGHT_POLE_HEELING_LIST("鐏潌鍊炬枩"),
+ MQTT_TEST("MQTT娴嬭瘯"),
//鎸夐挳鏉冮檺
ADMIN_ADD("鏂板绠＄悊鍛�"),
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MQTTTestController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MQTTTestController.java
new file mode 100644
index 0000000..cf19ad6
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MQTTTestController.java
@@ -0,0 +1,73 @@
+package com.sandu.ximon.admin.controller;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.util.StringUtil;
+import com.sandu.common.domain.CommonPage;
+import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.util.ResponseUtil;
+import com.sandu.common.util.SpringContextHolder;
+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.mainboard.MainBoardInvokeSyncService;
+import com.sandu.ximon.admin.param.MonitorParam;
+import com.sandu.ximon.admin.security.PermissionConfig;
+import com.sandu.ximon.admin.service.PoleService;
+import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.enums.MenuEnum;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * MQTT娴嬭瘯
+ *
+ * @author ZZQ
+ * @date 2022/10/19 15:49
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/v1/admin/mqtt")
+public class MQTTTestController {
+ private PermissionConfig permissionConfig;
+
+ /**
+ * 妯＄硦鏌ヨ
+ *
+ * @return
+ */
+ @GetMapping("/sendRRPC")
+ public ResponseVO<Object> listMonitorByKeyword(@RequestParam(value = "poleId", required = false) Long poleId,
+ @RequestParam(value = "frameStr", required = false) String frameStr) {
+ if (poleId == null) {
+ throw new BusinessException("鐏潌ID涓嶈兘涓虹┖锛�");
+ }
+
+ if (StringUtil.isEmpty(frameStr)) {
+ throw new BusinessException("璇锋眰甯ф暟鎹笉鑳戒负绌猴紒");
+ }
+ if (!permissionConfig.check(MenuEnum.MQTT_TEST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+
+ Pole pole = SpringContextHolder.getBean(PoleService.class).getById(poleId);
+ if (pole == null) {
+ throw new BusinessException("鐏潌涓嶅瓨鍦紒");
+ }
+
+ if (StringUtil.isEmpty(pole.getDeviceCode())) {
+ throw new BusinessException("鐏潌MAC涓嶈兘涓虹┖锛�");
+ }
+
+ InvokeParam param = new InvokeParam();
+ param.setOperate("1001");
+ param.setFrame(frameStr);
+ CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(pole.getDeviceCode(), param);
+ if (commonFrame == null) {
+ throw new BusinessException("璇锋眰澶辫触锛岃閲嶆柊璇锋眰");
+ }
+ return ResponseUtil.success(commonFrame);
+ }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
index 5c4aa9a..29bdb90 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/report/A5AtmosphereHeartbeatReportInnerFrame.java
@@ -22,8 +22,6 @@
// 蹇冭烦鍖呮暟鎹� 58
private HeartBeatDataPackage heartBeatDataPackage;
- private String originFrame;
-
@Override
public A5AtmosphereHeartbeatReportInnerFrame transformFrame(String hex) {
// 闀垮害涓嶄竴鑷存椂锛岃繑鍥瀗ull
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 0e0cd94..227d63f 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
@@ -51,6 +51,19 @@
}
@Override
+ public CommonFrame sendRRPC(String deviceName, InvokeParam invokeParam) {
+ InvokeThingServiceResponse.Data data = invokeThing(deviceName, invokeParam, false);
+ 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);
+ }
+
+ @Override
public CommonFrame sendRRPC(String deviceName, IRequestFrame iRequestFrame) {
InvokeParam param = new InvokeParam();
param.setOperate("1001");
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/topic/ICustomizeTopic.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/topic/ICustomizeTopic.java
index 044a888..115e2d6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/topic/ICustomizeTopic.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/topic/ICustomizeTopic.java
@@ -24,6 +24,15 @@
/**
* 鍙戦�乺rpc 璇锋眰
*
+ * @param deviceName 璁惧鍚�
+ * @param invokeParam 甯у唴瀹�
+ * @return 杩斿洖鐨勮В鐮佸抚瀹炰綋绫�
+ */
+ CommonFrame sendRRPC(String deviceName, InvokeParam invokeParam);
+
+ /**
+ * 鍙戦�乺rpc 璇锋眰
+ *
* @param deviceName 璁惧鍚�
* @param iRequestFrame 缂栫爜甯�
* @return 杩斿洖鐨勮В鐮佸抚瀹炰綋绫�
--
Gitblit v1.9.3