From 3fb93c6ca8bd5487ac900c3434824f421e024986 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Wed, 25 Aug 2021 11:57:55 +0800
Subject: [PATCH] screen-common 修复日志工具类BUG
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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 26598b6..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
@@ -11,6 +11,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
@@ -34,30 +35,33 @@
private DeviceService deviceService;
@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.dataToTimeStampTime(new Date(new Long((String) data.remove("DataTime"))), DateUtils.yyyy_MM_dd_HH_EN);
- Integer version = (Integer) data.remove("ver");
- Map<String, Object> result = new HashMap<>(data);
+
+ Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+
+ Map<String, Object> result = new HashMap<>();
result.put("mac", mac);
result.put("time", time);
result.put("version", version);
result.put("timeUnits", Constants.UN_ADJUST);
result.put("value", JSONObject.toJSONString(data));
- //���������������������������
- historyHourlyMapper.insertHistoryHourlyUnAdjust(result);
+ //������������������insert
+ historyHourlyMapper.insertHistoryHourly(result);
//������������
dataAdjust = deviceService.adjustDeviceData(dataAdjust);
- dataAdjust.remove("mac");
- dataAdjust.remove("DataTime");
- dataAdjust.remove("ver");
+
HistoryHourly historyHourly = new HistoryHourly();
historyHourly.setMac(mac);
historyHourly.setTime(time);
historyHourly.setVersion(version);
historyHourly.setValue(JSONObject.toJSONString(dataAdjust));
+
+ //������������������insert
historyHourlyMapper.insert(historyHourly);
}
}
--
Gitblit v1.8.0