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 | 53 +++++++++++++++++++++++++++++------------------------
1 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/yssh/config/ScheduleConfig.java b/src/main/java/com/yssh/config/ScheduleConfig.java
index 07cd7fe..2c9212a 100644
--- a/src/main/java/com/yssh/config/ScheduleConfig.java
+++ b/src/main/java/com/yssh/config/ScheduleConfig.java
@@ -15,15 +15,15 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
import com.github.biyanwen.EasyCsv;
import javax.annotation.Resource;
-@Component
+@Configuration
@EnableScheduling
public class ScheduleConfig {
protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -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) {
@@ -124,7 +135,7 @@
private void loadVocSync() {
logger.info("***************** 寮�濮嬪叏鍩烠SV鍏ュ簱 *****************" + "\n");
vocValsService.deleteLastYear();
- Calendar calendar = getCalendar(96);
+ Calendar calendar = getCalendar(vocMax);
for (int i = 0; i < vocMax; i++) {
calendar.add(Calendar.HOUR, -1);
String time = format.format(calendar.getTime());
@@ -136,18 +147,19 @@
continue;
}
- String md5 = FileUtils.getFileMd5(filePath);
- if (null != md5 && md5List.contains(md5)) {
- continue; // csv宸插叆搴�
- }
+ //String md5 = FileUtils.getFileMd5(filePath);
+ //if (null != md5 && md5List.contains(md5)) {
+ // continue;
+ //}
int count = vocValsService.countByTime(time);
if (count > 0) {
- vocValsService.deleteByTime(time); // 鍒犻櫎宸插叆搴�
+ //vocValsService.deleteByTime(time);
+ continue;
}
try {
- addFileMd5(md5);
+ //addFileMd5(md5);
logger.info("loadVocSync: " + filePath);
Date date = (Date) calendar.getTime().clone();
EasyCsv.read(filePath, VocVals.class, new VocParser(vocValsService, date)).doRead();
@@ -166,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);
@@ -174,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) {
@@ -189,9 +201,6 @@
warningAnalyseService.warningOperationStorage(date);
}
- /**
- * 鍒涘缓鏃ユ姤锛氭瘡鏃�0鏃�1鍒�
- */
@Scheduled(cron = "0 1 0 * * ?")
public void createDayReport() {
Calendar calendar = getCalendar(1);
@@ -206,9 +215,6 @@
}
}
- /**
- * 鍒涘缓鍛ㄦ姤锛氭瘡鍛ㄤ竴0鏃�5鍒�
- */
@Scheduled(cron = "0 5 0 ? * MON")
public void createWeekReport() {
Calendar calendar = getCalendar(7 * 24);
@@ -223,9 +229,6 @@
}
}
- /**
- * 鍒涘缓鏈堟姤锛氭瘡鏈�1鏃�0鏃�9鍒�
- */
@Scheduled(cron = "0 9 0 1 * ?")
public void createMonthReport() {
Calendar calendar = Calendar.getInstance();
@@ -242,11 +245,13 @@
}
}
- @Scheduled(cron = "${email.times}")
+ //@Scheduled(cron = "${email.times}")
public void autoCalcData() {
if (enableEmail) {
//System.out.println("${email.times}");
+ logger.info("***************** 寮�濮嬫暟鎹璀﹁绠� *****************" + "\n");
emailService.calcData();
+ logger.info("***************** 鏁版嵁棰勮璁＄畻瀹屾垚 *****************" + "\n");
}
}
}
--
Gitblit v1.9.3