From 5bc7795ca2e5c7046ae535458077ad0268bebc07 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 15 Aug 2022 09:45:05 +0800
Subject: [PATCH] 判断guid
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index 00c3443..fb293a2 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -40,19 +40,21 @@
@Override
@Transactional
public void insertHistoryHourly(Map<String, Object> data) {
+ //������������������
+ Map<String, Object> dataAdjust = new HashMap<>(data);
+ //���������������������
+ Map<String, Object> result = new HashMap<>();
String mac = data.remove("mac").toString();
//������mac������������
Map<String, Object> deviceInfo = (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac);
Map<String, Object> versionInfo = (Map<String, Object>) deviceInfo.get("version");
Integer version = (Integer) versionInfo.get("id");
- Map<String, Object> dataAdjust = new HashMap<>(data);
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
- String yearAndMonth = DateUtils.dateToDateString(time, DateUtils.yyyyMM_EN);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
- Map<String, Object> result = new HashMap<>();
result.put("mac", mac);
- result.put("time", time);
+ result.put("time", DateUtils.addHours(time, -1));
result.put("version", version);
result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST);
result.put("value", JSONObject.toJSONString(data));
--
Gitblit v1.8.0