From 612404528a4759a1064f458610832ce056e3b21a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 19 十月 2022 18:50:54 +0800
Subject: [PATCH] MQTT
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MQTTTestController.java | 33 ++++++++++++++++-----------------
1 files changed, 16 insertions(+), 17 deletions(-)
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
index cf19ad6..3003ac6 100644
--- 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
@@ -1,24 +1,25 @@
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.security.annotation.AnonymousAccess;
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.CommonRequest;
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.param.MQTTTestPrarm;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
/**
* MQTT娴嬭瘯
@@ -37,22 +38,20 @@
*
* @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("璇锋眰甯ф暟鎹笉鑳戒负绌猴紒");
- }
+ @AnonymousAccess
+ @PostMapping("/sendRRPC")
+ public ResponseVO<Object> sendRRPC(@RequestBody @Validated MQTTTestPrarm mqttTestPrarm) {
+ /**
+ * 娴嬭瘯鏁版嵁
+ * poleMac:32313243305005ff3867ffff
+ * frameStr:/qUBAAv+AQAD//8ARZcUd7bYwso=
+ */
if (!permissionConfig.check(MenuEnum.MQTT_TEST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- Pole pole = SpringContextHolder.getBean(PoleService.class).getById(poleId);
+ Pole pole = SpringContextHolder.getBean(PoleService.class).getById(mqttTestPrarm.getPoleId());
if (pole == null) {
throw new BusinessException("鐏潌涓嶅瓨鍦紒");
}
@@ -63,7 +62,7 @@
InvokeParam param = new InvokeParam();
param.setOperate("1001");
- param.setFrame(frameStr);
+ param.setFrame(mqttTestPrarm.getFrameStr());
CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(pole.getDeviceCode(), param);
if (commonFrame == null) {
throw new BusinessException("璇锋眰澶辫触锛岃閲嶆柊璇锋眰");
--
Gitblit v1.9.3