From 371a381267699280f45748c13ed42faba66b6577 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 15 Jul 2021 17:34:32 +0800
Subject: [PATCH] update redis key

---
 screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java |   13 +++++++++++++
 1 files changed, 13 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..368cfb5 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
@@ -1,7 +1,9 @@
 package com.moral.api.service.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
@@ -21,6 +23,7 @@
 import com.moral.api.service.HistoryMinutelyService;
 import com.moral.api.service.SensorService;
 import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
 import com.moral.util.AmendUtils;
 import com.moral.util.DateUtils;
 
@@ -41,7 +44,11 @@
         historyFiveMinutelyMapper.createTable(timeUnits);
     }
 
+    @Autowired
+    private RedisTemplate redisTemplate;
+
     @Override
+    @Transactional
     public void insertHistoryFiveMinutely() {
         //������������������yyyy-MM-dd HH:mm
         String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
@@ -64,6 +71,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")));
@@ -105,6 +116,8 @@
                 }
             });
             dataMap.put("value", JSONObject.toJSONString(jsonMap));
+            //������redis
+            redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
             insertData.add(dataMap);
         });
 

--
Gitblit v1.8.0