From 9a239ae58c613cf2dbd659a8338fc1fe03445c49 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 16 六月 2023 17:10:37 +0800
Subject: [PATCH] 1
---
src/main/resources/application-scheduled.yml | 10 +++++-----
src/main/java/com/yssh/scheduled/ReadCsvTask.java | 10 +++++-----
src/main/java/com/yssh/utils/ServletInitializer.java | 5 ++++-
3 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yssh/scheduled/ReadCsvTask.java b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
index 4c984bb..4f340f5 100644
--- a/src/main/java/com/yssh/scheduled/ReadCsvTask.java
+++ b/src/main/java/com/yssh/scheduled/ReadCsvTask.java
@@ -45,11 +45,11 @@
@Resource
private IWarningAnalyseService warningAnalyseService;
- @Value("${csv.cron_max}")
- private int cronMax = 48;
-
@Value("${csv.voc_max}")
private int vocMax = 120;
+
+ @Value("${csv.cron_max}")
+ private int cronMax = 72;
private final static List<String> md5List = new ArrayList<>();
@@ -64,7 +64,7 @@
private void loadVocSync() {
vocValsService.deleteLastYear();
Calendar calendar = getCalendar(96);
- for (int i = 0; i < cronMax; i++) {
+ for (int i = 0; i < vocMax; i++) {
calendar.add(Calendar.HOUR, -1);
String time = format.format(calendar.getTime());
String filePath = csvFilePathConfig.getVocPath() + File.separator + time + ".csv";
@@ -108,7 +108,7 @@
@Scheduled(cron = "${csv.cron}")
private void loadCsvSync() {
Calendar calendar = getCalendar(1);
- for (int i = 0; i < vocMax; i++) {
+ for (int i = 0; i < cronMax; i++) {
calendar.add(Calendar.HOUR, -1);
String time = format.format(calendar.getTime());
String filePath = csvFilePathConfig.getFilePath() + File.separator + time + ".csv";
diff --git a/src/main/java/com/yssh/utils/ServletInitializer.java b/src/main/java/com/yssh/utils/ServletInitializer.java
index a163508..7bd4441 100644
--- a/src/main/java/com/yssh/utils/ServletInitializer.java
+++ b/src/main/java/com/yssh/utils/ServletInitializer.java
@@ -1,8 +1,9 @@
package com.yssh.utils;
-import com.yssh.Application;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+
+import com.yssh.Application;
/**
* @author wMeng
@@ -16,6 +17,8 @@
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
+ // 浠ｇ爜璁剧疆鏃ュ織
+ //System.setProperty("logging.config", "classpath:logback.xml");
return application.sources(Application.class);
}
diff --git a/src/main/resources/application-scheduled.yml b/src/main/resources/application-scheduled.yml
index 6952ca7..fda42a2 100644
--- a/src/main/resources/application-scheduled.yml
+++ b/src/main/resources/application-scheduled.yml
@@ -1,5 +1,5 @@
-csv:
- cron: '0 33 * * * ? '
- voc: '0 31 * * * ? '
- cron_max: 120
- voc_max: 384
+csv:
+ voc: '0 41 * * * ? '
+ cron: '0 1 * * * ? '
+ voc_max: 120
+ cron_max: 72
--
Gitblit v1.9.3