From 21debf9e346f544e38e5e237fcd40a130fb3f260 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Wed, 25 Aug 2021 08:51:04 +0800
Subject: [PATCH] 删除冗余代码

---
 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