From 2871d648f1b89453e88eb9180f45fde124ff0391 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期四, 17 七月 2025 16:37:40 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/herb
---
jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
index e835376..b381df7 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java
@@ -24,6 +24,7 @@
import org.jeecg.modules.dry.service.*;
import org.jeecg.modules.dry.vo.DryEquipmentVo;
import org.jeecg.modules.dry.vo.DryFaultRecordVo;
+import org.jeecg.modules.dry.vo.RealTimeDataParentVo;
import org.jeecg.modules.dry.vo.RealTimeDataVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -215,6 +216,17 @@
});
break;
+ // 鎺ユ敹璁惧瀹炴椂鏁版嵁-鏈哄彴
+ case MqttConstant.TENANT_UP_PREFIX_REALTIME_DATA_EQP:
+ ThreadUtil.execute(() -> {
+ try {
+ RealTimeDataParentVo vo = JSON.parseObject(message, RealTimeDataParentVo.class);
+ realTimeDataService.realTimeDataHandle(vo);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ });
+ break;
//鍚勭鎴蜂笂浼犵殑瀹炴椂鎶ヨ鏁版嵁
case MqttConstant.TENANT_UP_PREFIX_REAL_FAULT_DATA: {
@@ -243,8 +255,6 @@
//鍙戦�佸箍鎾�
System.err.println("骞挎挱缁欙細" + recTopic);
sendMqttMessage(MqttConstant.SERVICE_BROADCAST_TENANT_REAL_FAULT, mqMessage, 1);
-
-
}
break;
//绉诲姩绔富鍔ㄨ姹傝澶囧疄鏃舵晠闅滄暟鎹紙鐢ㄤ簬椤甸潰鍒氭墦寮�鏃舵媺鍙栦竴娆℃暟鎹級
@@ -260,8 +270,6 @@
entry -> entry.getKey().toString(),
entry -> (DryFaultRecordVo) entry.getValue()
));
-
-
if (dryFaultMap.isEmpty()) {
return;
}
--
Gitblit v1.9.3