From 8e41bd549e3bf0dab2f713ad1c967c4e673c0e5a Mon Sep 17 00:00:00 2001
From: chen_xi <276999030@qq.com>
Date: Thu, 17 Nov 2022 09:27:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 1 +
1 files changed, 1 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 9aff155..f2b0a38 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
@@ -172,6 +172,7 @@
});
dataMap.put("value", JSONObject.toJSONString(jsonMap));
//������redis
+ jsonMap.put("dataTime", DateUtils.dateToDateString(start));
redisTemplate.opsForHash().put(RedisConstants.DATA_FIVE_MINUTES, key, jsonMap);
insertData.add(dataMap);
});
--
Gitblit v1.8.0