From 443c9a4b1c79b066dbf7276c076f25491bbfb213 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 16 Nov 2020 11:04:51 +0800
Subject: [PATCH] 修改小时数据时间记录，从录入开始时间更改为录入结束时间。
---
src/main/java/com/moral/util/DateUtil.java | 18 ++++++++-
src/main/java/com/moral/task/HistoryTableInsertTask.java | 45 +++++++++++-----------
2 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/moral/task/HistoryTableInsertTask.java b/src/main/java/com/moral/task/HistoryTableInsertTask.java
index 3b4d770..b28fb66 100644
--- a/src/main/java/com/moral/task/HistoryTableInsertTask.java
+++ b/src/main/java/com/moral/task/HistoryTableInsertTask.java
@@ -19,6 +19,7 @@
import com.moral.service.HistoryService;
import com.moral.service.OrganizationService;
import com.moral.service.SensorService;
+import com.moral.util.DateUtil;
import com.moral.util.WeatherUtil;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.handler.annotation.XxlJob;
@@ -129,33 +130,33 @@
@XxlJob("historyHourly")
public ReturnT insertHistoryHourlyTable(String params) {
- LocalDateTime time = LocalDateTime.now();
- int year = time.getYear();
- int month = time.getMonthValue();
- int day = time.getDayOfMonth();
- int hour = time.getHour();
- if (day == 1) {
- if (hour == 0) {
- if (month == 1) {
- month = 12;
- year = year - 1;
- } else {
- month = month - 1;
- }
- }
- }
- String monthStr = month < 10 ? ("0" + month) : month + "";
- String yearAndMonth = year + monthStr;
- LocalDateTime endTime = time.truncatedTo(ChronoUnit.HOURS);
- LocalDateTime startTime = endTime.minusHours(1);
+ //������������������
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
+ Date endTimeDate = new Date();
+ Date startTimeDate = DateUtil.rollHour(endTimeDate, -1);
+ StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate));
+ StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate));
+ String yearAndMonth = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate);
+
+ //������������������������������������������������
+ /* SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date endTimeDate = sdf.parse("2020-11-01 00:00:22");
+ Date startTimeDate = DateUtil.rollHour(endTimeDate, -1);
+ StringBuilder endTime = new StringBuilder(sdf.format(endTimeDate));
+ StringBuilder startTime = new StringBuilder(sdf.format(startTimeDate));
+ endTime.replace(14, 19, "00:00");
+ startTime.replace(14, 19, "00:00");
+ String yearAndMonth = DateUtil.getYear(startTimeDate) + DateUtil.getMonth(startTimeDate);*/
+
List<String> sensorKeys = sensorService.getSensorKeys();
List<String> macs = deviceService.getMacs();
Map<String, Object> devices = new HashMap<>();
devices.put("sensorKeys", sensorKeys);
- devices.put("start", startTime);
- devices.put("end", endTime);
+ devices.put("start", startTime.toString());
+ devices.put("end", endTime.toString());
devices.put("macs", macs);
devices.put("yearAndMonth", yearAndMonth);
+
try {
List<Map<String, Object>> hourlyData = historyMinutelyService.getMinutelySensorData(devices);
XxlJobLogger.log("historyHourlyData:" + hourlyData.size());
@@ -165,7 +166,7 @@
Map<String, Object> hourlyDataMap = new LinkedHashMap<>();
JSONObject jo = new JSONObject(true);
hourlyDataMap.put("mac", deviceData.get("mac"));
- hourlyDataMap.put("time", startTime);
+ hourlyDataMap.put("time", endTime.toString());
JSONArray jsonArray = new JSONArray();
for (String key : deviceData.keySet()) {
if (!key.equals("mac") && !key.startsWith("M")) {
diff --git a/src/main/java/com/moral/util/DateUtil.java b/src/main/java/com/moral/util/DateUtil.java
index 4ed0b22..6510b8d 100644
--- a/src/main/java/com/moral/util/DateUtil.java
+++ b/src/main/java/com/moral/util/DateUtil.java
@@ -1,5 +1,6 @@
package com.moral.util;
+import javax.management.StringValueExp;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -81,10 +82,12 @@
* Date ������
* @return ������������
*/
- public static int getDay(Date date) {
+ public static String getDay(Date date) {
Calendar calendar = Calendar.getInstance();
calendar.setTime(date);
- return calendar.get(Calendar.DAY_OF_MONTH);
+ int day = calendar.get(Calendar.DAY_OF_MONTH);
+ String str = String.valueOf(day);
+ return str = str.length()==1?"0".concat(str):str;
}
/**
@@ -152,6 +155,17 @@
return new Date(d.getTime() + minute * 60 * 1000);
}
+ /**
+ * ���������������������������������������������
+ *
+ * @param
+ *
+ * @return ������������������
+ */
+ public static Date rollHour(Date d, int hour) {
+ return new Date(d.getTime() + hour * 60 * 60 * 1000);
+ }
+
/**
* ���/���?���
--
Gitblit v1.8.0