From 1f250ebddca2e954887186614c403ae6701c63de Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 07 Jul 2023 15:22:20 +0800
Subject: [PATCH] feat: 任务按照天补偿数据
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 2dc5a04..bc817e4 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -17,7 +17,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import javax.xml.crypto.Data;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -49,9 +51,14 @@
@Override
@Transactional
- public void insertHistoryDaily() {
+ public void insertHistoryDaily(String time) {
String format = DateUtils.yyyy_MM_dd_EN;
- Date now = new Date();
+ Date now;
+ if(StringUtils.isEmpty(time)){
+ now = new Date();
+ } else {
+ now = DateUtils.getDate(time,"yyyy-MM-dd");
+ }
//���������������������
Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
//���������������������
@@ -60,7 +67,6 @@
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
sensorQueryWrapper.select("code", "lower", "upper").eq("is_delete", Constants.NOT_DELETE);
List<Sensor> sensors = sensorService.list(sensorQueryWrapper);
-
//������������������������������
Map<String, Object> prop = new HashMap<>();
String timeUnits = DateUtils.dateToDateString(start, DateUtils.yyyyMM_EN);
@@ -70,6 +76,7 @@
List<Map<String, Object>> dailyData = historyHourlyService.selectDailyData(prop);
if (dailyData.size() == 0) {
+ System.out.println("������������������"+DateUtils.dateToDateString(start));
return;
}
@@ -179,8 +186,8 @@
dataMap.put("value", JSONObject.toJSONString(jsonMap));
insertData.add(dataMap);
});
-
//���������������
historyDailyMapper.insertHistoryDaily(insertData);
+ System.out.println("������������");
}
}
--
Gitblit v1.8.0