From ac625fa6aee52f467243c78764625cf053dcfe81 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 11:44:20 +0800
Subject: [PATCH] screen-manage 重构组织模块日志插入代码
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 6 ++----
1 files changed, 2 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 34659ae..e555273 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
@@ -37,11 +37,12 @@
@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();
Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
- Integer version = (Integer) data.remove("ver");
+
Map<String, Object> result = new HashMap<>();
result.put("mac", mac);
result.put("time", time);
@@ -53,9 +54,6 @@
//������������
dataAdjust = deviceService.adjustDeviceData(dataAdjust);
- dataAdjust.remove("mac");
- dataAdjust.remove("DataTime");
- dataAdjust.remove("ver");
HistoryHourly historyHourly = new HistoryHourly();
historyHourly.setMac(mac);
--
Gitblit v1.8.0