From 7f132dd94c6ae3e5801d0885d905bcc9e1ed5ebf Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期三, 02 七月 2025 09:44:27 +0800
Subject: [PATCH] 代码提交
---
src/main/java/com/product/system/backup/service/SystemBackupService.java | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/product/system/backup/service/SystemBackupService.java b/src/main/java/com/product/system/backup/service/SystemBackupService.java
index c307f31..ad27dbd 100644
--- a/src/main/java/com/product/system/backup/service/SystemBackupService.java
+++ b/src/main/java/com/product/system/backup/service/SystemBackupService.java
@@ -71,22 +71,15 @@
// 鑾峰彇绯荤粺鏃堕棿
Date finalTime = new Date();
Date startTime = null;
- // 鑾峰彇绯荤粺澶囦唤鍛ㄦ湡(鍒嗛挓)
- int backupCycle = Integer.valueOf(Global.getSystemConfig("SYSTEM_BACK_CYCLE", "1440"));
// 鑾峰彇绯荤粺鏈�澶у浠芥椂闂�
StringBuilder sbSql = new StringBuilder();
- sbSql.append("SELECT TIMESTAMPDIFF(MINUTE, end_time, ?) AS diff_minutes,end_time \n");
+ sbSql.append("SELECT end_time \n");
sbSql.append("FROM product_sys_backup_log \n");
sbSql.append("WHERE backup_status = 1 \n");
sbSql.append("ORDER BY end_time DESC \n");
sbSql.append("LIMIT 1 \n");
- FieldSetEntity fseMaxLogTime = baseDao.getFieldSetEntityBySQL(sbSql.toString(), new Object[] {standardTimeFormat.format(finalTime)}, false);
- if(fseMaxLogTime != null && !StringUtils.isEmpty(fseMaxLogTime.getString("diff_minutes"))) {
- Integer diffMinutes = fseMaxLogTime.getInteger("diff_minutes");
- if (diffMinutes < backupCycle) {
- // 灏忎簬澶囦唤鍛ㄦ湡锛屼笉澶囦唤
- return ;
- }
+ FieldSetEntity fseMaxLogTime = baseDao.getFieldSetEntityBySQL(sbSql.toString(), new Object[] {}, false);
+ if(fseMaxLogTime != null && !StringUtils.isEmpty(fseMaxLogTime.getString("end_time"))) {
startTime = fseMaxLogTime.getDate("end_time");
}
// 鍒濆澶囦唤鏃ュ織鏁版嵁
@@ -104,7 +97,6 @@
// 淇濆瓨鏃ュ織
baseDao.saveFieldSetEntity(fseBackLog);
}
-
/**
* 鏁版嵁澶囦唤杩涚▼
@@ -180,6 +172,7 @@
try (InputStream reader = getClass().getClassLoader().getResourceAsStream(CONFIG_FILE_PATH)) {
if (reader == null) {
log.writeInfo("銆愬垵濮嬮厤缃枃浠躲�戝垵濮嬬郴缁熼厤缃枃浠跺け璐ワ細" + CONFIG_FILE_PATH + "閰嶇疆鏂囦欢涓嶅瓨鍦�", BackupLogger.ERROR_TYPE);
+ return false;
}
// 璇诲彇澶囦唤閰嶇疆鏂囦欢
config = new Properties();
@@ -274,12 +267,13 @@
} else {
log.writeInfo("銆愬浠芥暟鎹簱銆戞暟鎹簱澶囦唤澶辫触锛岄��鍑虹爜: " + exitCode, BackupLogger.ERROR_TYPE);
}
+ return true;
} catch (Exception e) {
e.printStackTrace();
log.writeInfo("銆愬浠芥暟鎹簱銆戞暟鎹簱澶囦唤澶辫触锛�" + e.getMessage(), BackupLogger.ERROR_TYPE);
+ backupFile.delete();
return false;
- }
- return true;
+ }
}
/**
--
Gitblit v1.9.2