From 513f1f3c738b2d5e087d841ffe162e63ae778a70 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 10 十二月 2024 09:40:53 +0800
Subject: [PATCH] change WorkloadTask logic
---
pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java
index e39742c..9bcb72f 100644
--- a/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java
+++ b/pms-parent/pms-web-other/src/main/java/com/dy/pmsOther/task/WorkloadTask.java
@@ -27,27 +27,22 @@
//today 0鐐�5鍒� 缁熻before today
log.info("鍚姩缁熻浜哄憳宸ヤ綔閲忎换鍔�");
OthStatisticWorkloadMapper workloadMapper = SpringContextUtil.getBean(OthStatisticWorkloadMapper.class);
- //鎵惧埌鏈�澶т竴鏉℃棩鏈熻褰�
- Date maxDate = workloadMapper.selectMaxDate();
- //寰�鍚庡惊鐜ぉ鏁版眹鎬� //寰幆缁熻
- LocalDate maxLocalDate = null;
- if (maxDate == null) {
- maxLocalDate = LocalDate.now().minusDays(2);
- } else {
- maxLocalDate = maxDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
- }
-
+ //搴旇缁熻鐨勬棩鏈�
+ DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
+ LocalDate maxLocalDate = LocalDate.parse(workloadMapper.selectMaxDate(), formatter);
LocalDate today = LocalDate.now();
- LocalDate statisticDate = maxLocalDate.plusDays(1);
long daysBetween = ChronoUnit.DAYS.between(maxLocalDate, today);
if (daysBetween > 30) {
daysBetween = 30;
- statisticDate = today.minusDays(daysBetween);
+ maxLocalDate = today.minusDays(daysBetween);
}
+
+ LocalDate statisticDate = maxLocalDate;
for (int i = 1; i <= daysBetween; i++) {
Date startDt = Date.from(LocalDateTime.of(statisticDate, LocalTime.of(0, 0, 0)).atZone(ZoneId.systemDefault()).toInstant());
Date endDt = Date.from(LocalDateTime.of(statisticDate, LocalTime.of(23, 59, 59)).atZone(ZoneId.systemDefault()).toInstant());
workloadMapper.insertBatch(startDt, endDt);
+ log.info("startDt: {} , endDt: {} ", startDt, endDt);
statisticDate = maxLocalDate.plusDays(i);
}
log.info("缁熻浜哄憳宸ヤ綔閲忎换鍔＄粨鏉�");
--
Gitblit v1.8.0