From abd914abdee5831b04b6d76d04bd1a50534fa68c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 06 五月 2025 16:51:18 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile into dev
---
/dev/null | 29 -----------------------------
ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java | 17 +++++++----------
2 files changed, 7 insertions(+), 39 deletions(-)
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/SiteController.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/SiteController.java
deleted file mode 100644
index e935e01..0000000
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/governmentCloud/SiteController.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.ruoyi.jianguan.governmentCloud;
-
-import com.ruoyi.chargingPile.api.model.TChargingPile;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.jianguan.mqtt.util.MqttPushUtil;
-import com.ruoyi.jianguan.service.TChargingPileService;
-import org.springframework.web.bind.annotation.*;
-
-import javax.annotation.Resource;
-import java.util.List;
-
-/**
- * @author zhibing.pu
- * @Date 2024/8/7 19:56
- */
-@RestController
-@RequestMapping("")
-public class SiteController {
-
- @Resource
- private MqttPushUtil mqttPushUtil;
-
- @GetMapping("/jianguantest")
- public R<String> jianguantest(){
- mqttPushUtil.pushChargePileData("/cmt/IoT/pub/8/6700/status/silent","message消息123456");
- return R.ok();
- }
-
-}
diff --git a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
index 2e95672..aabab4c 100644
--- a/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
+++ b/ruoyi-service/ruoyi-jianguan/src/main/java/com/ruoyi/jianguan/mqtt/util/MqttPushUtil.java
@@ -30,8 +30,6 @@
*/
public R<String> pushChargePileData(String topic, String message){
try {
-// MqttPushUtil mqttConnect = new MqttPushUtil();
-// mqttConnect.start();
//发布消息
this.publish(topic,message);
return R.ok("["+topic+"]-推送成功;内容为:["+message+"]");
@@ -43,18 +41,17 @@
/**
* 测试订阅消息
*/
- public static void main(String[] args) throws Exception {
- MqttPushUtil mqttConnect = new MqttPushUtil();
- mqttConnect.start();
- //订阅消息
- mqttConnect.publish("/cmt/IoT/pub/8/6700/status/silent","message11消息");
- }
+// public static void main(String[] args) throws Exception {
+// MqttPushUtil mqttConnect = new MqttPushUtil();
+// mqttConnect.start();
+// //订阅消息
+// mqttConnect.publish("/cmt/IoT/pub/8/6700/status/silent","message11消息");
+// }
@Bean
public MqttPushUtil getMqttPushClient() {
//连接至mqtt服务器，获取mqtt连接
- MqttPushUtil mqttConnect = new MqttPushUtil();
- mqttConnect.start();
+ this.start();
return this;
}
/**
--
Gitblit v1.7.1