From ca75cf818e434f77ca71d78ac2c883ca41b18713 Mon Sep 17 00:00:00 2001
From: bsw215583320 <baoshiwei121@163.com>
Date: 星期五, 22 十一月 2024 11:12:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/herb' into herb

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mqtt/MqttSampleCallback.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 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 1efee35..1143056 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
@@ -216,11 +216,11 @@
       case MqttConstant.TENANT_UP_PREFIX_FAULT_DATA:
         ThreadUtil.execute(() -> {
           try {
-
-            JSONObject jsonObject = JSON.parseObject(message);
-            List<DryFaultRecord> faultRecords = JSON.parseArray(jsonObject.get("data").toString(), DryFaultRecord.class);
-            System.err.println(faultRecords.toString());
-            faultRecordService.saveBatch(faultRecords);
+            MqMessage<List<DryFaultRecord>> listMqMessage = JSON.parseObject(message, new TypeReference<MqMessage<List<DryFaultRecord>>>() {
+            });
+         //   List<DryFaultRecord> faultRecords = JSON.parseArray(jsonObject.get("data").toString(), DryFaultRecord.class);
+            System.err.println(listMqMessage.toString());
+            faultRecordService.saveBatch(listMqMessage.getData());
 
           } catch (Exception e) {
             e.printStackTrace();

--
Gitblit v1.9.3