java/ruoyi-vue-pro
1
0
Fork 0
mirror of https://github.com/YunaiV/ruoyi-vue-pro.git synced 2025-10-31 10:37:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

【代码评审】IoT：MQTT 插件

Browse Source
This commit is contained in:
YunaiV
2025-03-04 20:13:19 +08:00
parent 3c9985978b
commit 71b45a29a3
3 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-common/src/main/java/cn/iocoder/yudao/module/iot/plugin/common/util/IotPluginCommonUtils.java
View File

@ -53,7 +53,7 @@ public class IotPluginCommonUtils {
* 将对象转换为 JSON 字符串后写入响应
*
* @param routingContext 路由上下文
* @param data 要转换为JSON的数据对象
* @param data 数据对象
*/
@SuppressWarnings("deprecation")
public static void writeJson(RoutingContext routingContext, Object data) {

13
yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/IotDeviceUpstreamServer.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.iot.plugin.emqx.upstream;
import cn.hutool.core.util.ArrayUtil;
import cn.iocoder.yudao.module.iot.api.device.IotDeviceUpstreamApi;
import cn.iocoder.yudao.module.iot.plugin.emqx.config.IotPluginEmqxProperties;
import cn.iocoder.yudao.module.iot.plugin.emqx.upstream.router.IotDeviceAuthVertxHandler;
@ -167,33 +168,28 @@ public class IotDeviceUpstreamServer {
*/
private Future<Void> subscribeToTopics() {
String[] topics = emqxProperties.getMqttTopics();
if (topics == null || topics.length == 0) {
if (ArrayUtil.isEmpty(topics)) {
log.warn("[subscribeToTopics] 未配置MQTT主题，跳过订阅");
return Future.succeededFuture();
}
log.info("[subscribeToTopics] 开始订阅设备上行消息主题");
Future<Void> compositeFuture = Future.succeededFuture();
for (String topic : topics) {
String trimmedTopic = topic.trim();
if (trimmedTopic.isEmpty()) {
continue;
}
compositeFuture = compositeFuture.compose(v -> client.subscribe(trimmedTopic, DEFAULT_QOS.value())
.<Void>map(ack -> {
log.info("[subscribeToTopics] 成功订阅主题: {}", trimmedTopic);
return null;
})
.recover(err -> {
log.error("[subscribeToTopics] 订阅主题失败: {}, 原因: {}",
trimmedTopic, err.getMessage());
log.error("[subscribeToTopics] 订阅主题失败: {}, 原因: {}", trimmedTopic, err.getMessage());
return Future.<Void>succeededFuture(); // 继续订阅其他主题
}));
}
return compositeFuture;
}
@ -205,7 +201,6 @@ public class IotDeviceUpstreamServer {
log.warn("[stop] 服务未运行，无需停止");
return;
}
log.info("[stop] 开始关闭服务");
isRunning = false;
@ -213,11 +208,9 @@ public class IotDeviceUpstreamServer {
CompletableFuture<Void> serverFuture = server != null
? server.close().toCompletionStage().toCompletableFuture()
: CompletableFuture.completedFuture(null);
CompletableFuture<Void> clientFuture = client != null
? client.disconnect().toCompletionStage().toCompletableFuture()
: CompletableFuture.completedFuture(null);
CompletableFuture<Void> vertxFuture = vertx != null
? vertx.close().toCompletionStage().toCompletableFuture()
: CompletableFuture.completedFuture(null);

8
yudao-module-iot/yudao-module-iot-plugins/yudao-module-iot-plugin-emqx/src/main/java/cn/iocoder/yudao/module/iot/plugin/emqx/upstream/router/IotDeviceAuthVertxHandler.java
View File

@ -14,8 +14,7 @@ import java.util.Collections;
/**
* IoT Emqx 连接认证的 Vert.x Handler
* <a href=
* "https://docs.emqx.com/zh/emqx/latest/access-control/authn/http.html">...</a>
* <a href="https://docs.emqx.com/zh/emqx/latest/access-control/authn/http.html">MQTT HTTP</a>
*
* @author haohao
*/
@ -31,12 +30,11 @@ public class IotDeviceAuthVertxHandler implements Handler<RoutingContext> {
@SuppressWarnings("unchecked")
public void handle(RoutingContext routingContext) {
try {
// 构建认证请求 DTO
JsonObject json = routingContext.body().asJsonObject();
String clientId = json.getString("clientid");
String username = json.getString("username");
String password = json.getString("password");
// 构建认证请求DTO
IotDeviceEmqxAuthReqDTO authReqDTO = new IotDeviceEmqxAuthReqDTO()
.setClientId(clientId)
.setUsername(username)
@ -49,10 +47,12 @@ public class IotDeviceAuthVertxHandler implements Handler<RoutingContext> {
return;
}
// 响应结果
IotPluginCommonUtils.writeJson(routingContext, Collections.singletonMap("result", "allow"));
} catch (Exception e) {
log.error("[handle][EMQX 认证异常]", e);
IotPluginCommonUtils.writeJson(routingContext, Collections.singletonMap("result", "deny"));
}
}
}