From 453e3471e94b91169beec1e258a06a132d927011 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 02 十二月 2024 15:01:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/service/WarningAnalyseService.java | 29 +++++++++++++++++++++--------
1 files changed, 21 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 0a0aece..06cb8f6 100644
--- a/src/main/java/com/yssh/service/WarningAnalyseService.java
+++ b/src/main/java/com/yssh/service/WarningAnalyseService.java
@@ -3,6 +3,7 @@
import java.util.*;
import java.util.concurrent.CountDownLatch;
+import com.yssh.config.InitConfig;
import com.yssh.entity.*;
import com.yssh.mapper.DictRecordMapper;
import com.yssh.mapper.QxshMapper;
@@ -186,7 +187,7 @@
* 鑾峰彇鏈湀鐩戞祴绔欑偣鏈�澶у�糡OP10
*/
public List<Qxsh> selectMonthTop10() {
- String time = DateUtils.getYyyyMm(new Date());
+ String time = DateUtils.getYyyyMm(InitConfig.getDate());
//List<Qxsh> list = qxshMapper.selectMonthTop10(time + "%");
String key = "qxshMapper.selectMonthTop10." + time;
@@ -203,12 +204,24 @@
* 鑾峰彇鏈懆鐩戞祴绔欑偣鏈�澶у�糡OP10
*/
public List<Qxsh> selectWeekTop10() {
- Date now = new Date();
- int weekOfYear = DateUtils.getWeekOfYear(now);
- int year = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYY, now));
- Date lastSun = DateUtils.getWeekOfYearForSun(year, weekOfYear);
- Date mon = DateUtils.getAPeriodOfTime(lastSun, 1, Calendar.DATE);
- Date sun = DateUtils.getAPeriodOfTime(lastSun, 7, Calendar.DATE);
+ Date now = InitConfig.getDate();
+ //int weekOfYear = DateUtils.getWeekOfYear(now);
+ //int year = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYY, now));
+ //Date lastSun = DateUtils.getWeekOfYearForSun(year, weekOfYear);
+ //Date mon = DateUtils.getAPeriodOfTime(lastSun, 1, Calendar.DATE);
+ //Date sun = DateUtils.getAPeriodOfTime(lastSun, 7, Calendar.DATE);
+
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(now);
+ int dayOfWeek = cal.get(Calendar.DAY_OF_WEEK);
+ int diff = Calendar.MONDAY - dayOfWeek;
+ if (diff > 0) diff -= 7;
+
+ cal.add(Calendar.DAY_OF_MONTH, diff);
+ Date mon = cal.getTime();
+ cal.add(Calendar.DAY_OF_MONTH, 6);
+ Date sun = cal.getTime();
+
Integer intMon = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYYMMDD, mon) + "00"); // 2023080700
Integer intSun = Integer.parseInt(DateUtils.parseDateToStr(DateUtils.YYYYMMDD, sun) + "23"); // 2023081323
@@ -227,7 +240,7 @@
* 鑾峰彇鏈棩鐩戞祴绔欑偣鏈�澶у�糡OP10
*/
public List<Qxsh> selectDayTop10() {
- String time = DateUtils.getYyyyMmDd(new Date());
+ String time = DateUtils.getYyyyMmDd(InitConfig.getDate());
//List<Qxsh> list = qxshMapper.selectDayTop10(time + "%");
String key = "qxshMapper.selectDayTop10." + time;
--
Gitblit v1.9.3