From 2b75d84cabc3416d903f425239c713b65a98503f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 01 十一月 2024 13:17:38 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/config/ScheduleConfig.java | 16 ++++++++++++++--
src/main/resources/application-scheduled.yml | 6 +++---
src/main/java/com/yssh/config/InitConfig.java | 5 ++---
src/main/resources/application-test.yml | 8 ++++----
src/main/java/com/yssh/utils/CsvParser.java | 7 ++++++-
5 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/yssh/config/InitConfig.java b/src/main/java/com/yssh/config/InitConfig.java
index 2494370..3d279f5 100644
--- a/src/main/java/com/yssh/config/InitConfig.java
+++ b/src/main/java/com/yssh/config/InitConfig.java
@@ -28,8 +28,8 @@
@Resource
WarningAnalyseService warningAnalyseService;
- //@Resource
- //ScheduleConfig task;
+ @Resource
+ ScheduleConfig task;
@Resource
XlsReportService xlsReportService;
@@ -52,7 +52,6 @@
//task.createMonthReport();
//task.corpReserveDataSync();
- //task.corpReserveDataSync();
//warningAnalyseService.warningOperationStorage(cal.getTime());
/*Calendar cal1 = Calendar.getInstance();
diff --git a/src/main/java/com/yssh/config/ScheduleConfig.java b/src/main/java/com/yssh/config/ScheduleConfig.java
index 31fd4fc..db07149 100644
--- a/src/main/java/com/yssh/config/ScheduleConfig.java
+++ b/src/main/java/com/yssh/config/ScheduleConfig.java
@@ -58,23 +58,34 @@
@Value("${email.enable}")
private Boolean enableEmail;
+ private static boolean flag = false;
+
+ private static final Object OBJ = new Object();
+
private final static List<String> md5List = new ArrayList<>();
private final static SimpleDateFormat format = new SimpleDateFormat("yyyyMMddHH");
public void corpReserveDataSync() {
- loadVocSync();
+ //loadVocSync();
loadCsvSync();
}
@Scheduled(cron = "${csv.cron}")
private void loadCsvSync() {
+ synchronized (OBJ) {
+ if (flag) return;
+ flag = true;
+ }
+
logger.info("***************** 寮�濮嬫墽琛孋SV鍏ュ簱 *****************" + "\n");
Calendar calendar = getCalendar(1);
+ calendar.add(Calendar.HOUR, -cronMax);
for (int i = 0; i < cronMax; i++) {
try {
- calendar.add(Calendar.HOUR, -1);
+ calendar.add(Calendar.HOUR, 1);
String time = format.format(calendar.getTime());
+ System.out.println(time);
String filePath = csvFilePathConfig.getFilePath() + File.separator + time + ".csv";
File file = new File(filePath);
@@ -102,6 +113,7 @@
}
}
logger.info("***************** CSV鍏ュ簱鎵ц瀹屾垚 *****************" + "\n");
+ flag = false;
}
public Calendar getCalendar(int start) {
diff --git a/src/main/java/com/yssh/utils/CsvParser.java b/src/main/java/com/yssh/utils/CsvParser.java
index a5ec335..0fc343d 100644
--- a/src/main/java/com/yssh/utils/CsvParser.java
+++ b/src/main/java/com/yssh/utils/CsvParser.java
@@ -56,8 +56,13 @@
/*if ("0_0_0".equals(t.getId())) {
return; // 瑙ｅ喅涓婚敭閲嶅
}*/
- if (t.getZ() > 0 && t.getC() < jcyj) {
+ /*if (t.getZ() > 0 && t.getC() < jcyj) {
return; // 鍙叆绗�0灞傛暟鎹�+Voc鍊煎ぇ浜�1
+ }*/
+
+ // 鍙叆鍊� > =0.05
+ if (t.getC() < 0.1) {
+ return;
}
cachedData.add(t);
diff --git a/src/main/resources/application-scheduled.yml b/src/main/resources/application-scheduled.yml
index ca205c3..88204dc 100644
--- a/src/main/resources/application-scheduled.yml
+++ b/src/main/resources/application-scheduled.yml
@@ -1,7 +1,7 @@
csv:
- # 221Mb CSV鍏ュ簱鏃堕棿
- cron: '0 35 * * * ?'
- cron_max: 720
+ # 221Mb CSV鍏ュ簱鏃堕棿锛�35,720
+ cron: '0/5 * * * * ?'
+ cron_max: 5200
# 112Kb CSV鍏ュ簱鏃堕棿
voc: '0 40 * * * ?'
diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml
index 58a3255..436714f 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