From 42f9c8cf31cc8a694c6478b12c832c1991bf35b7 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 21 Aug 2023 15:58:10 +0800
Subject: [PATCH] chore:测试提交
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 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..5bc892c 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
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -40,19 +41,27 @@
@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");
+ //���������������
+// String time1 = data.get("time").toString();
+// long l = Long.parseLong(time1);
+// SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
+// String format1 = dateFormat.format(l);
+// Date time = DateUtils.getDate(format1, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
- 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);
+ String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
- Map<String, Object> result = new HashMap<>();
result.put("mac", mac);
- result.put("time", time);
+ result.put("time", DateUtils.addHours(time, -1));
result.put("version", version);
result.put("timeUnits", yearAndMonth + "_" + Constants.UN_ADJUST);
result.put("value", JSONObject.toJSONString(data));
@@ -60,7 +69,7 @@
historyHourlyMapper.insertHistoryHourly(result);
//������������
- dataAdjust = deviceService.adjustDeviceData(dataAdjust);
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust,"2");
//������������������insert
result.put("timeUnits", yearAndMonth);
--
Gitblit v1.8.0