From 194cc68a496ab3ab92741467c0ce665c97a5625f Mon Sep 17 00:00:00 2001 From: swordmeng Date: Mon, 20 Jan 2025 17:30:06 +0800 Subject: [PATCH] 3 --- data-framework/pom.xml | 5 +++++ data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java | 2 +- .../data/storage/service/impl/DeviceDataStoredServiceImpl.java | 3 --- data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java | 5 ++++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/data-framework/pom.xml b/data-framework/pom.xml index 0321883..c0a6489 100644 --- a/data-framework/pom.xml +++ b/data-framework/pom.xml @@ -22,6 +22,11 @@ swagger-annotations 2.2.19 + + org.springframework + spring-context + 6.2.1 + \ No newline at end of file diff --git a/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java b/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java index ebebd9e..ef82823 100644 --- a/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java +++ b/data-storage/src/main/java/com/huaxing/IotDataBridgeApplication.java @@ -10,7 +10,7 @@ public class IotDataBridgeApplication { SpringApplication.run(IotDataBridgeApplication.class, args); String banner = "===========================================\n" + - " 中联创信低碳科技有限公司 \n" + + " 中联创信(山东)低碳科技有限公司 \n" + " http://localhost:8088 \n" + " iot-data-bridge started! \n" + "===========================================\n"; diff --git a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java b/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java index c78aaf8..0a68e5c 100644 --- a/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java +++ b/data-storage/src/main/java/com/huaxing/data/storage/service/impl/DeviceDataStoredServiceImpl.java @@ -35,9 +35,6 @@ public class DeviceDataStoredServiceImpl extends CommonService implements IDevic public void insert(DataAnalysisDTO dataAnalysis) { String tableName = dataAnalysis.getTableName(); dataAnalysis.getDataList().forEach(map -> { -// CompletableFuture.runAsync(() -> { -// -// }); log.info("入库数据:{}", JacksonUtil.objectStr(map)); executeOnce(generateInsertStreamStatement(tableName, map)); }); diff --git a/data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java b/data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java index 297d4b1..63d07a3 100644 --- a/data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java +++ b/data-storage/src/main/java/com/huaxing/mqtt/MqttMessageConsumer.java @@ -50,7 +50,10 @@ public class MqttMessageConsumer extends MqttMessageReceiver { CompletableFuture.runAsync(() -> { analysisService.parseStoreData(payload); }); - } else if (topic.contains("table-update/")){} // TODO 表更新topic + } else if (topic.contains("table-update/")){ + + } + // TODO 表更新topic } catch (Exception e) { log.error(e.toString()); }