From c3afba5959d8c94b6af76e6d578b1c6a1bf79b84 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 03 Sep 2021 09:39:34 +0800
Subject: [PATCH] screen-manage 修复报警更新代码BUG
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 6 ++++--
1 files changed, 4 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 00c3443..35be6ae 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,17 +40,19 @@
@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);
- Map<String, Object> result = new HashMap<>();
result.put("mac", mac);
result.put("time", time);
result.put("version", version);
--
Gitblit v1.8.0