From 2f55cebbad3dea187a5f91d16ec80a9677dab699 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 13 十一月 2024 11:16:53 +0800
Subject: [PATCH] 1
---
src/main/java/com/yssh/config/ScheduleConfig.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/yssh/config/ScheduleConfig.java b/src/main/java/com/yssh/config/ScheduleConfig.java
index 31fd4fc..3d0f8cc 100644
--- a/src/main/java/com/yssh/config/ScheduleConfig.java
+++ b/src/main/java/com/yssh/config/ScheduleConfig.java
@@ -58,22 +58,32 @@
@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());
String filePath = csvFilePathConfig.getFilePath() + File.separator + time + ".csv";
@@ -102,6 +112,7 @@
}
}
logger.info("***************** CSV鍏ュ簱鎵ц瀹屾垚 *****************" + "\n");
+ flag = false;
}
public Calendar getCalendar(int start) {
@@ -138,12 +149,12 @@
//String md5 = FileUtils.getFileMd5(filePath);
//if (null != md5 && md5List.contains(md5)) {
- // continue; // csv宸插叆搴�
+ // continue;
//}
int count = vocValsService.countByTime(time);
if (count > 0) {
- //vocValsService.deleteByTime(time); // 鍒犻櫎宸插叆搴�
+ //vocValsService.deleteByTime(time);
continue;
}
@@ -175,12 +186,12 @@
logger.info(file.getAbsolutePath() + " is not exist 锛�");
return;
}
- //鍒涘缓琛�
+
String newTableName = TableStrategy.getTableStrategy(time);
suYuanService.createNewTable(newTableName);
dictRecordService.insertDictRecord(new DictRecord(1L, newTableName, Long.parseLong(time), ""));
EasyCsv.read(filePath, SuYuan.class, new CsvParser(suYuanService, time)).doRead();
- //璁＄畻棰勮/鎶ヨ,骞朵笖杩涜鍏ュ簱鎿嶄綔
+
try {
Thread.sleep(60 * 1000);
} catch (InterruptedException e) {
@@ -190,9 +201,6 @@
warningAnalyseService.warningOperationStorage(date);
}
- /**
- * 鍒涘缓鏃ユ姤锛氭瘡鏃�0鏃�1鍒�
- */
@Scheduled(cron = "0 1 0 * * ?")
public void createDayReport() {
Calendar calendar = getCalendar(1);
@@ -207,9 +215,6 @@
}
}
- /**
- * 鍒涘缓鍛ㄦ姤锛氭瘡鍛ㄤ竴0鏃�5鍒�
- */
@Scheduled(cron = "0 5 0 ? * MON")
public void createWeekReport() {
Calendar calendar = getCalendar(7 * 24);
@@ -224,9 +229,6 @@
}
}
- /**
- * 鍒涘缓鏈堟姤锛氭瘡鏈�1鏃�0鏃�9鍒�
- */
@Scheduled(cron = "0 9 0 1 * ?")
public void createMonthReport() {
Calendar calendar = Calendar.getInstance();
@@ -243,7 +245,7 @@
}
}
- @Scheduled(cron = "${email.times}")
+ //@Scheduled(cron = "${email.times}")
public void autoCalcData() {
if (enableEmail) {
//System.out.println("${email.times}");
--
Gitblit v1.9.3