From 100690a225167806a08f64eafff3326564a7154a Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 17:06:22 +0800
Subject: [PATCH] fix:补偿提交
---
screen-manage/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 fb293a2..8643c9a 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;
@@ -49,8 +50,14 @@
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);
- Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
+// Date time = DateUtils.getDate((String) data.remove("DataTime"), DateUtils.yyyyMMddHHmmss_EN);
String yearAndMonth = DateUtils.dateToDateString(DateUtils.addHours(time, -1), DateUtils.yyyyMM_EN);
result.put("mac", mac);
@@ -62,7 +69,7 @@
historyHourlyMapper.insertHistoryHourly(result);
//������������
- dataAdjust = deviceService.adjustDeviceData(dataAdjust);
+ dataAdjust = deviceService.adjustDeviceData(dataAdjust,"2");
//������������������insert
result.put("timeUnits", yearAndMonth);
--
Gitblit v1.8.0