From b38019aae593a66c16f7e75d6e37d14eb8d2c42e Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 22 七月 2025 08:55:15 +0800
Subject: [PATCH] 修改接收实时数据接口-故障处理
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.java
index f669d79..a490a0a 100755
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttConfig.java
@@ -15,6 +15,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
import org.springframework.data.redis.core.RedisTemplate;
import java.util.*;
@@ -101,8 +102,8 @@
mqttClient.subscribe(MqttConstant.MOBILE_UP);
System.err.println("admin璁㈤槄" + MqttConstant.MOBILE_UP);
// 璁㈤槄绉熸埛瀹炴椂鏁版嵁
- mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA);
- System.out.println("admin璁㈤槄" + MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA);
+ mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA_EQP);
+ System.out.println("admin璁㈤槄" + MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA_EQP);
// 璁㈤槄绉熸埛鎶ヨ鏁版嵁
mqttClient.subscribe(MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA);
System.out.println("admin璁㈤槄" + MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA);
@@ -178,15 +179,17 @@
for (int i = 0; i < data.size(); i++) {
JSONObject obj = data.getJSONObject(i);
JSONObject item = new JSONObject();
+ //clientid
+ String clientid = obj.getString("clientid");
+ item.put("clientid", clientid);
+ //TODO 鏍￠獙绉熸埛id鏄惁瀛樺湪
+ if(!clientid.matches("^[^-]+-[^-]+-[^-]+$")) continue;
//username
item.put("username", obj.get("username"));
//杩炴帴鏃堕棿
String st = obj.getString("connected_at");
String upTime = DateUtils.zone2Str(st);
item.put("connectedAt", upTime);
- //clientid
- String clientid = obj.getString("clientid");
- item.put("clientid", clientid);
//鏄惁杩炴帴
Boolean connected = obj.getBoolean("connected");
item.put("connected", connected);
@@ -195,7 +198,7 @@
String[] info = clientid.split("-");
item.put("type", info[0]);
item.put("tenantId", info[1]);
- //item.put("code", info[2]);
+ item.put("code", info[2]);
if (connected) {
redisUtil.hset(String.format(MqttConstant.MQTT_ONLINE_CLIENT,item.get("tenantId").toString()) , clientid, item);
--
Gitblit v1.9.3