From 8185e5cdc2bbdf7fb4ca46a10864106893a01ed3 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 20 十一月 2024 15:30:12 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/config/ScheduleConfig.java | 2
src/main/java/com/yssh/service/EmailService.java | 3 +
src/main/java/com/yssh/utils/WebUtils.java | 4 +
src/main/java/com/yssh/controller/WarningAnalyseController.java | 11 +++--
src/main/java/com/yssh/service/CountService.java | 3 +
src/main/java/com/yssh/config/InitConfig.java | 35 +++++++++++++++++
src/main/java/com/yssh/service/SuYuanService.java | 11 +++--
src/main/java/com/yssh/utils/DateUtils.java | 12 ++----
src/main/resources/application-test.yml | 8 ++--
src/main/java/com/yssh/service/WarningAnalyseService.java | 7 ++-
src/main/resources/application-file.yml | 1
src/main/java/com/yssh/controller/WeatherController.java | 3 +
12 files changed, 70 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/yssh/config/InitConfig.java b/src/main/java/com/yssh/config/InitConfig.java
index 3d279f5..9d51e50 100644
--- a/src/main/java/com/yssh/config/InitConfig.java
+++ b/src/main/java/com/yssh/config/InitConfig.java
@@ -3,8 +3,10 @@
import com.yssh.service.WarningAnalyseService;
import com.yssh.service.XlsReportService;
import com.yssh.utils.CacheUtils;
+import com.yssh.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
@@ -13,6 +15,9 @@
import com.yssh.service.DictRecordService;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
@Component
public class InitConfig implements ApplicationRunner {
@@ -34,6 +39,36 @@
@Resource
XlsReportService xlsReportService;
+ static String date;
+
+ // YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss"
+ static SimpleDateFormat YYYY_MM_DD_HH_MM_SS = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+ @Value("${dat.date}")
+ public void setDate(String date) {
+ InitConfig.date = date;
+ }
+
+ public static Date getDate() {
+ if (StringUtils.isEmpty(date)) {
+ return new Date();
+ }
+
+ try {
+ return YYYY_MM_DD_HH_MM_SS.parse(date);
+
+ //Calendar calendar = Calendar.getInstance();
+ //calendar.setTime(d);
+ //calendar.set(Calendar.YEAR, d.getYear());
+ //calendar.set(Calendar.MONTH, d.getMonth());
+ //calendar.set(Calendar.DAY_OF_MONTH, d.getDay());
+
+ //return calendar.getTime();
+ } catch (Exception ex) {
+ return new Date();
+ }
+ }
+
@Override
public void run(ApplicationArguments args) throws Exception {
CacheUtils.init();
diff --git a/src/main/java/com/yssh/config/ScheduleConfig.java b/src/main/java/com/yssh/config/ScheduleConfig.java
index 3d0f8cc..2c9212a 100644
--- a/src/main/java/com/yssh/config/ScheduleConfig.java
+++ b/src/main/java/com/yssh/config/ScheduleConfig.java
@@ -178,7 +178,7 @@
}
private void loadCsv_old() {
- Date date = DateUtils.getNowDate();
+ Date date = InitConfig.getDate();
String time = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, date);
String filePath = csvFilePathConfig.getFilePath() + "\\\\" + time + ".csv";
File file = new File(filePath);
diff --git a/src/main/java/com/yssh/controller/WarningAnalyseController.java b/src/main/java/com/yssh/controller/WarningAnalyseController.java
index cd189ee..7032820 100644
--- a/src/main/java/com/yssh/controller/WarningAnalyseController.java
+++ b/src/main/java/com/yssh/controller/WarningAnalyseController.java
@@ -1,5 +1,6 @@
package com.yssh.controller;
+import com.yssh.config.InitConfig;
import com.yssh.entity.Report;
import com.yssh.utils.CacheUtils;
import com.yssh.utils.DateUtils;
@@ -54,7 +55,7 @@
private Integer getStartTime(Date start, Date end) {
do {
if (null == start && null == end) {
- start = DateUtils.getAPeriodOfTime(new Date(), -5, Calendar.HOUR_OF_DAY);
+ start = DateUtils.getAPeriodOfTime(InitConfig.getDate(), -5, Calendar.HOUR_OF_DAY);
break;
}
if (null != start && null == end) {
@@ -74,7 +75,7 @@
private Integer getEndTime(Date start, Date end) {
do {
if (null == start && null == end) {
- end = new Date();
+ end = InitConfig.getDate();
break;
}
if (null != start && null == end) {
@@ -95,21 +96,21 @@
@ApiOperation(value = "鏈湀棰勮鎶ヨ缁熻", notes = "鏈湀棰勮鎶ヨ缁熻锛岃繑鍥炲弬鏁癮larmNumber瀵瑰簲鍊间负鏈湀鎶ヨ鏁版嵁閲忥紝鍙傛暟warningNumber瀵瑰簲鍊间负鏈湀棰勮鏁版嵁閲�")
@GetMapping("/monthCount")
public Result thisMonthCount(@RequestParam(value = "date", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
- return Result.OK(warningService.monthCount(null == date ? new Date() : date));
+ return Result.OK(warningService.monthCount(null == date ? InitConfig.getDate() : date));
}
@ApiOperationSupport(order = 4)
@ApiOperation(value = "涓�鍛ㄩ璀︽姤璀︽暟閲忓彉鍖栬秼鍔�", notes = "涓�鍛ㄩ璀︽姤璀︽暟閲忓彉鍖栬秼鍔匡紝杩斿洖鍙傛暟alarmDayCount涓轰竴鍛ㄦ瘡鏃ユ姤璀︾粺璁℃暟閲忓垪琛紝鍙傛暟warningDayCount涓轰竴鍛ㄦ瘡鏃ラ璀︾粺璁℃暟閲忓垪琛�")
@GetMapping("/everydayCount")
public Result everydayCount(@RequestParam(value = "date", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
- return Result.OK(warningService.everydayCount(null == date ? new Date() : date));
+ return Result.OK(warningService.everydayCount(null == date ? InitConfig.getDate() : date));
}
@ApiOperationSupport(order = 5)
@ApiOperation(value = "涓夊皬鏃剁洃娴嬬珯鐐规暟鎹彉鍖栬秼鍔�", notes = "杩斿洖鍊间负涓夊皬鏃剁洃娴嬬珯鐐圭洃娴嬫暟鎹紝杩斿洖鍊间负map闆嗗悎锛屽叾涓璳ey涓虹珯鐐瑰悕绉帮紝value涓簂ist闆嗗悎锛屼繚瀛樻瘡澶╃洃娴嬫暟鍊兼暟鎹�")
@GetMapping("/locationDataChange")
public Result locationDataChange(@RequestParam(value = "end", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date date) {
- return Result.OK(warningService.select3Hours(null == date ? new Date() : date));
+ return Result.OK(warningService.select3Hours(null == date ? InitConfig.getDate() : date));
}
@ApiOperationSupport(order = 6)
diff --git a/src/main/java/com/yssh/controller/WeatherController.java b/src/main/java/com/yssh/controller/WeatherController.java
index a6527e6..a70d9b9 100644
--- a/src/main/java/com/yssh/controller/WeatherController.java
+++ b/src/main/java/com/yssh/controller/WeatherController.java
@@ -1,5 +1,6 @@
package com.yssh.controller;
+import com.yssh.config.InitConfig;
import com.yssh.entity.Weather;
import com.yssh.service.WeatherService;
import com.yssh.utils.CacheUtils;
@@ -48,7 +49,7 @@
begin = dateFormat.format(calendar.getTime());
}
if (null == end) {
- end = dateFormat.format(new Date());
+ end = dateFormat.format(InitConfig.getDate());
}
//List<Weather> list = weatherService.query(begin, end);
diff --git a/src/main/java/com/yssh/service/CountService.java b/src/main/java/com/yssh/service/CountService.java
index af131f8..397be32 100644
--- a/src/main/java/com/yssh/service/CountService.java
+++ b/src/main/java/com/yssh/service/CountService.java
@@ -7,6 +7,7 @@
import java.util.HashMap;
import java.util.Map;
+import com.yssh.config.InitConfig;
import com.yssh.utils.DateUtils;
import org.springframework.stereotype.Service;
@@ -25,7 +26,7 @@
public Map<String, Double> selectAccuracyAvg() {
Map<String, Double> result = new HashMap<String, Double>();
- Date nowDate = DateUtils.getNowDate();
+ Date nowDate = InitConfig.getDate();
Long beginTime = Long.parseLong(DateUtils.parseDateToStr(DateUtils.YYYYMMDDHH, DateUtils.getAPeriodOfTime(nowDate, -7, Calendar.DATE)));
Double thuAccuracy = thuAccuracyMapper.selectSevenDayAccuracyAvg(beginTime);
Double tempForecast = thuAccuracy == null ? 0.0 : thuAccuracy;
diff --git a/src/main/java/com/yssh/service/EmailService.java b/src/main/java/com/yssh/service/EmailService.java
index 2729437..192131d 100644
--- a/src/main/java/com/yssh/service/EmailService.java
+++ b/src/main/java/com/yssh/service/EmailService.java
@@ -1,5 +1,6 @@
package com.yssh.service;
+import com.yssh.config.InitConfig;
import com.yssh.mapper.QxshMapper;
import com.yssh.utils.StringUtils;
import org.slf4j.Logger;
@@ -226,7 +227,7 @@
public Calendar getCalendar(int start) {
Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
+ calendar.setTime(InitConfig.getDate());
calendar.add(Calendar.HOUR, start);
calendar.set(Calendar.MINUTE, 0);
calendar.set(Calendar.SECOND, 0);
diff --git a/src/main/java/com/yssh/service/SuYuanService.java b/src/main/java/com/yssh/service/SuYuanService.java
index e3bcddf..7d05b5f 100644
--- a/src/main/java/com/yssh/service/SuYuanService.java
+++ b/src/main/java/com/yssh/service/SuYuanService.java
@@ -4,6 +4,7 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
+import com.yssh.config.InitConfig;
import com.yssh.entity.*;
import com.yssh.mapper.*;
import com.yssh.utils.CalculateUtils;
@@ -137,7 +138,7 @@
Collections.sort(list);
DistanceSuYuan max = list.get(0);
FeedbackDetail feedbackDetail = new FeedbackDetail(null, dictRecord.getTableName(),
- max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, DateUtils.getNowDate());
+ max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, InitConfig.getDate());
feedbackMapper.insert(feedbackDetail);
result.put("feedbackId", feedbackDetail.getId());
}
@@ -186,7 +187,7 @@
Collections.sort(list);
DistanceSuYuan max = list.get(0);
FeedbackDetail feedbackDetail = new FeedbackDetail(null, dictRecord.getTableName(),
- max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, DateUtils.getNowDate());
+ max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, InitConfig.getDate());
feedbackMapper.insert(feedbackDetail);
result.put("feedbackId", feedbackDetail.getId());
}
@@ -221,7 +222,7 @@
Collections.sort(list);
DistanceSuYuan max = list.get(0);
FeedbackDetail feedbackDetail = new FeedbackDetail(null, dictRecord.getTableName(),
- max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, DateUtils.getNowDate());
+ max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, InitConfig.getDate());
feedbackMapper.insert(feedbackDetail);
result.put("feedbackId", feedbackDetail.getId());
}
@@ -256,7 +257,7 @@
Collections.sort(list);
DistanceSuYuan max = list.get(0);
FeedbackDetail feedbackDetail = new FeedbackDetail(null, dictRecord.getTableName(),
- max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, DateUtils.getNowDate());
+ max.getName(), max.getId(), max.getVocsName(), max.getVocsValue(), null, null, null, InitConfig.getDate());
feedbackMapper.insert(feedbackDetail);
result.put("feedbackId", feedbackDetail.getId());
}
@@ -293,7 +294,7 @@
}
public int updateVocsName(Date date, String id, String vocsName) {
- String table = "su_yuan_" + DateUtils.getYyyyMmDdHh(date); // new Date()
+ String table = "su_yuan_" + DateUtils.getYyyyMmDdHh(date);
if (isTableExists(table) == 0) {
return 0;
}
diff --git a/src/main/java/com/yssh/service/WarningAnalyseService.java b/src/main/java/com/yssh/service/WarningAnalyseService.java
index 0a0aece..ddc29a7 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,7 +204,7 @@
* 鑾峰彇鏈懆鐩戞祴绔欑偣鏈�澶у�糡OP10
*/
public List<Qxsh> selectWeekTop10() {
- Date now = new 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);
@@ -227,7 +228,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;
diff --git a/src/main/java/com/yssh/utils/DateUtils.java b/src/main/java/com/yssh/utils/DateUtils.java
index 838ce2b..5d9786c 100644
--- a/src/main/java/com/yssh/utils/DateUtils.java
+++ b/src/main/java/com/yssh/utils/DateUtils.java
@@ -5,6 +5,7 @@
import java.text.SimpleDateFormat;
import java.util.*;
+import com.yssh.config.InitConfig;
import org.apache.commons.lang3.time.DateFormatUtils;
public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
@@ -32,9 +33,6 @@
"yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss",
"yyyy.MM.dd HH:mm", "yyyy.MM"};
- public static Date getNowDate() {
- return new Date();
- }
public static String getDate() {
return dateTimeNow(YYYY_MM_DD);
@@ -49,7 +47,7 @@
}
public static final String dateTimeNow(final String format) {
- return parseDateToStr(format, new Date());
+ return parseDateToStr(format, InitConfig.getDate());
}
public static final String dateTime(final Date date) {
@@ -88,16 +86,14 @@
* 鏃ユ湡璺緞 鍗冲勾/鏈�/鏃� 濡�2018/08/08
*/
public static final String datePath() {
- Date now = new Date();
- return DateFormatUtils.format(now, "yyyy/MM/dd");
+ return DateFormatUtils.format(InitConfig.getDate(), "yyyy/MM/dd");
}
/**
* 鏃ユ湡璺緞 鍗冲勾/鏈�/鏃� 濡�20180808
*/
public static final String dateTime() {
- Date now = new Date();
- return DateFormatUtils.format(now, "yyyyMMdd");
+ return DateFormatUtils.format(InitConfig.getDate(), "yyyyMMdd");
}
/**
diff --git a/src/main/java/com/yssh/utils/WebUtils.java b/src/main/java/com/yssh/utils/WebUtils.java
index 1f74189..8b9f175 100644
--- a/src/main/java/com/yssh/utils/WebUtils.java
+++ b/src/main/java/com/yssh/utils/WebUtils.java
@@ -1,5 +1,7 @@
package com.yssh.utils;
+import com.yssh.config.InitConfig;
+
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.FileInputStream;
@@ -11,7 +13,7 @@
public static void download(String file, String fileName, boolean inline, HttpServletResponse res) throws Exception {
if (StringUtils.isEmpty(fileName)) {
- fileName = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, new Date());
+ fileName = DateUtils.parseDateToStr(DateUtils.YYYYMMDDHHMMSS, InitConfig.getDate());
}
fileName = URLEncoder.encode(fileName, "UTF-8").replace("+", "%20");
String dispose = inline ? "inline" : "attachment";
diff --git a/src/main/resources/application-file.yml b/src/main/resources/application-file.yml
index dec74df..0bce3cd 100644
--- a/src/main/resources/application-file.yml
+++ b/src/main/resources/application-file.yml
@@ -1,5 +1,6 @@
#dat閰嶇疆璺緞
dat:
+ date: 2023-08-08 09:00:00
filePath2d: E:\yssh_data\dat\extract_mesh.dat
filePath3d: E:\yssh_data\dat\correct_jk_47.dat
#csv閰嶇疆璺緞
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 436714f..58a3255 100644
--- a/src/main/resources/application-test.yml
+++ b/src/main/resources/application-test.yml
@@ -21,11 +21,11 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/yssh?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
- #url: jdbc:mysql://192.168.11.206:3306/yssh?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ #url: jdbc:mysql://127.0.0.1:3306/yssh?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.11.206:3306/yssh?useUnicode=true&rewriteBatchedStatements=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8
username: root
- password: mysql
- #password: 123456
+ #password: mysql
+ password: 123456
# 鍒濆杩炴帴鏁�
initialSize: 10
# 鏈�灏忚繛鎺ユ睜鏁伴噺
--
Gitblit v1.9.3