From 765460125202c993f737dee3a05d54c66ade2499 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 04 Aug 2021 15:46:23 +0800
Subject: [PATCH] 监测因子趋势图数据格式调整
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 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 f21db4c..8265b20 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
@@ -39,28 +39,26 @@
public void insertHistoryHourly(Map<String, Object> data) {
Map<String, Object> dataAdjust = new HashMap<>(data);
String mac = data.remove("mac").toString();
- Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+ Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
Integer version = (Integer) data.remove("ver");
- Map<String, Object> result = new HashMap<>(data);
+ 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));
- historyHourlyMapper.insert(historyHourly);
+ result.put("timeUnits", Constants.TRANSITION);
+ result.put("value", JSONObject.toJSONString(dataAdjust));
+ //������������������������insert
+ historyHourlyMapper.insertHistoryHourly(result);
}
}
--
Gitblit v1.8.0