From f8c2609bca86f6e4a2acd2e92a7eae29b86c2070 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 14 Jul 2021 14:05:42 +0800
Subject: [PATCH] screen-api 添加从kafka取出时间戳
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index 1b3c45d..4fc7ac3 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -2,6 +2,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -42,6 +43,7 @@
}
@Override
+ @Transactional
public void insertHistoryFiveMinutely() {
//������������������yyyy-MM-dd HH:mm
String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
@@ -64,6 +66,10 @@
//���������������������5������������
List<Map<String, Object>> fiveMinutelyData = historyMinutelyService.getHistoryFiveMinutelyData(params);
+ if (fiveMinutelyData.size() == 0) {
+ return;
+ }
+
//���mac������
Map<String, List<Map<String, Object>>> data = fiveMinutelyData.parallelStream()
.collect(Collectors.groupingBy(o -> (String) o.get("mac")));
--
Gitblit v1.8.0