From 2f3b185bf448a18d61a0dfae4e97b22c3f4cdef7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 31 Aug 2021 13:06:54 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into dev
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 e555273..9d18e07 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
@@ -7,9 +7,11 @@
import com.moral.api.service.HistoryHourlyService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
+import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
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;
@@ -34,13 +36,19 @@
@Autowired
private DeviceService deviceService;
+ @Autowired
+ private RedisTemplate redisTemplate;
+
@Override
@Transactional
public void insertHistoryHourly(Map<String, Object> data) {
- Integer version = (Integer) data.remove("ver");
- Map<String, Object> dataAdjust = new HashMap<>(data);
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);
Map<String, Object> result = new HashMap<>();
--
Gitblit v1.8.0