From 8502fb2a1648d1453f96b4288d68c16dfcf5bae5 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期一, 12 五月 2025 16:19:49 +0800
Subject: [PATCH] feat(data): 新增mqtt电表数据解析和写入,新增opcua电表和温湿度计数据解析和写入

---
 src/main/java/com/zhitan/handler/MqttMessageHandler.java |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhitan/handler/MqttMessageHandler.java b/src/main/java/com/zhitan/handler/MqttMessageHandler.java
index d1f8b83..7913d74 100644
--- a/src/main/java/com/zhitan/handler/MqttMessageHandler.java
+++ b/src/main/java/com/zhitan/handler/MqttMessageHandler.java
@@ -1,13 +1,19 @@
 package com.zhitan.handler;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zhitan.model.entity.DeviceData;
 import com.zhitan.model.entity.ElectricPower;
+import com.zhitan.model.entity.PowerEntity;
 import com.zhitan.service.IDataService;
+import com.zhitan.util.PowerDataMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.integration.mqtt.support.MqttHeaders;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHandler;
 import org.springframework.messaging.MessagingException;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * mqtt 娑堟伅澶勭悊绫�
@@ -31,8 +37,13 @@
         ObjectMapper objectMapper = new ObjectMapper();
         try {
             // 灏� JSON 瀛楃涓茶浆鎹负 SensorData 瀵硅薄
-            ElectricPower electricPower = objectMapper.readValue(payload, ElectricPower.class);
-            dataService.writeTimeSeriesData(electricPower);
+            //ElectricPower electricPower = objectMapper.readValue(payload, ElectricPower.class);
+            DeviceData data = objectMapper.readValue(payload, DeviceData.class);
+            List<PowerEntity> powerMeters = PowerDataMapper.mapToEntities(data);
+            for (PowerEntity powerMeter : powerMeters) {
+                dataService.writeTimeSeriesData(powerMeter);
+            }
+            // dataService.writeTimeSeriesData(electricPower)
         } catch (Exception e) {
             log.error(e.getMessage());
         }

--
Gitblit v1.9.3