杜洪波
2025-06-18 466d488372f884883fa02cc3ca9877b073fe39c9
系统备份优化(附件增量备份,备份日志)
已重命名1个文件
已添加1个文件
已修改2个文件
648 ■■■■ 文件已修改
src/main/java/com/product/system/backup/entity/BackupLogger.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/system/backup/service/SystemBackupService.java 329 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/system/backup/service/SystemBackupServiceV1.java 244 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/system/backup/util/SystemBackupUtil.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/product/system/backup/entity/BackupLogger.java
@@ -42,6 +42,12 @@
    }
    /**
     *     å†™å…¥æ—¥å¿—
     * @param message    æ—¥å¿—信息
     * @param type        æ—¥å¿—类型
     * @return
     */
    public boolean writeInfo(String message, int type) {
        if (logWriter != null) {
            try {
@@ -64,6 +70,9 @@
        return false;
    }
    /**
     *     å…³é—­æ—¥å¿—
     */
    public void closeLogger() {
        if (logWriter != null) {
            try {
src/main/java/com/product/system/backup/service/SystemBackupService.java
@@ -2,7 +2,6 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
@@ -10,11 +9,16 @@
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.druid.util.StringUtils;
@@ -26,16 +30,18 @@
import com.jcraft.jsch.SftpException;
import com.jcraft.jsch.SftpProgressMonitor;
import com.product.core.config.Global;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.system.backup.entity.BackupLogger;
import com.product.system.backup.util.SystemBackupUtil;
/**
 *     ç³»ç»Ÿå¤‡ä»½
 *    æ•°æ®åº“备份:每天执行代码备份
 *    é™„件备份:每天执行代码备份当天附件
 *    é—留问题:附件被修改,不能锁定非当天被修改的附件
 */
@Service("systemBackService1")
public class SystemBackupService {
@Service("systemBackService")
public class SystemBackupService extends AbstractBaseService{
    @Autowired
    BaseDao baseDao;
    
    // å¤‡ä»½é…ç½®
    Properties config;
@@ -46,68 +52,128 @@
    // æ•°å­—时间和数字日期(用做文件夹或者文件名)
    String NUMBER_TIME;    //例如(20250428091001)
    String NUMBER_DATE; //例如(20240428)
    String STANDARD_START_TIME;    // ä¾‹å¦‚(2024-04-28 09:10:00)
    String STANDARD_FINAL_TIME;    // ä¾‹å¦‚(2024-04-28 09:10:00)
    
    // æ•°å­—日期格式
    SimpleDateFormat numberTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
    SimpleDateFormat numberTimeFormat = new SimpleDateFormat("yyyyMMddHHmm00");
    SimpleDateFormat numberDateFormat = new SimpleDateFormat("yyyyMMdd");
    SimpleDateFormat standardTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
    // å¤‡ä»½é…ç½®æ–‡ä»¶
    private static final String CONFIG_FILE_PATH = "systemBackup.properties";
    
    /**
     *     ç³»ç»Ÿå¤‡ä»½å…¥å£
     *     ç³»ç»Ÿå¤‡ä»½åˆ¤å®š
     *     è°ƒç”¨åœ°ç‚¹ï¼šå®šæ—¶ä»»åŠ¡é…ç½®åŠŸèƒ½(bean)
     */
    public void systemBackupInit(){
        // åˆå§‹æ—¥å¿—文件
        log = new BackupLogger();
        // åœ¨æ—¥å¿—中记录操作系统信息,便于调试
        log.writeInfo("【系统备份入口】操作系统: " + System.getProperty("os.name"), BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】文件分隔符: " + File.separator, BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】系统备份开始..................", BackupLogger.INFO_TYPE);
        NUMBER_TIME = numberTimeFormat.format(new Date());
        NUMBER_DATE = numberDateFormat.format(new Date());
        log.writeInfo("【系统备份入口】系统日期:" + NUMBER_DATE, BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】系统时间:" + NUMBER_TIME, BackupLogger.INFO_TYPE);
        // è¿›å…¥å¤‡ä»½è¿›ç¨‹
        backupProcess();
        log.closeLogger();
    public void systemBackupInit() {
        // èŽ·å–ç³»ç»Ÿæ—¶é—´
        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("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 ;
            }
            startTime = fseMaxLogTime.getDate("end_time");
        }
        // åˆå§‹å¤‡ä»½æ—¥å¿—数据
        FieldSetEntity fseBackLog = new FieldSetEntity("product_sys_backup_log");
        fseBackLog.setValue("start_time", startTime);
        fseBackLog.setValue("end_time", finalTime);
        // æ‰§è¡Œå¤‡ä»½
        boolean flag = backupProcess(startTime, finalTime);
        if (flag) {
            fseBackLog.setValue("backup_status", 1);
        } else {
            fseBackLog.setValue("backup_status", 0);
        }
        // ä¿å­˜æ—¥å¿—
        baseDao.saveFieldSetEntity(fseBackLog);
    }
    /**
     * æ•°æ®å¤‡ä»½è¿›ç¨‹
     *     æ•°æ®å¤‡ä»½è¿›ç¨‹
     * @param startTime    å¤‡ä»½å¼€å§‹æ—¶é—´
     * @param finalTime    å¤‡ä»½æˆªæ­¢æ—¶é—´
     * @return
     */
    public void backupProcess() {
    public boolean backupProcess(Date startTime, Date finalTime) {
        // åˆå§‹æ—¥å¿—文件
        log = new BackupLogger();
        log.writeInfo("【系统备份进程】系统备份进程开始..................", BackupLogger.INFO_TYPE);
        long start = System.currentTimeMillis();
        boolean status= true;
        // ç¬¬ä¸€æ­¥ï¼šåˆå§‹é…æ–‡ä»¶å‚æ•°,当前目生成时间戳的文件夹
        status = initSystemConfig();
        // ç¬¬ä¸€æ­¥ï¼šåˆå§‹å¤‡ä»½å‚æ•°
        initBackupParam(startTime, finalTime);
        // ç¬¬äºŒæ­¥ï¼šåˆå§‹é…æ–‡ä»¶å‚æ•°,当前目生成时间戳的文件夹
        boolean status = initSystemConfig();
        if (!status)
            return;
        // ç¬¬äºŒæ­¥ï¼šæ‰§è¡Œæ•°æ®åº“备份
            return false;
        // ç¬¬ä¸‰æ­¥ï¼šæ‰§è¡Œæ•°æ®åº“备份
        status = runExpDataBase();
        if (!status)
            return;
        // ç¬¬ä¸‰æ­¥ï¼šæ‰§è¡Œå¯¹æ•°æ®åº“文件、工程代码、上传文件做压缩备份
            return false;
        // ç¬¬å››æ­¥ï¼šæ‰§è¡Œå¯¹æ•°æ®åº“文件、工程代码、上传文件做压缩备份
        status = zipDataBackup();
        if (!status)
            return;
        // ç¬¬å››æ­¥ï¼šä¸Šä¼ åŽ‹ç¼©å¤‡ä»½æ–‡ä»¶åˆ°FTP
        status = sftpTransferService(true);
//        uploadBackupMachine2();
            return false;
        // ç¬¬äº”步:上传压缩备份文件到FTP
        status = sftpTransferService();
        if (!status)
            return;
        // ç¬¬äº”步:清除数据
            return false;
        // ç¬¬å…­æ­¥ï¼šæ¸…除数据
//        clearKeepData();
        long end = System.currentTimeMillis();
        log.writeInfo("【系统备份进程】系统备份进程结束,耗时.................." + ((end - start) / 1000) + "秒", BackupLogger.INFO_TYPE);
        System.out.println("系统备份耗时.................." + ((end - start) / 1000) + "秒");
        // å…³é—­æ—¥å¿—
        log.closeLogger();
        return status;
    }
    /**
     * ç¬¬ä¸€æ­¥ï¼šåˆå§‹å¤‡ä»½å‚æ•°
     * @param startTime    å¤‡ä»½å¼€å§‹æ—¶é—´
     * @param finalTime    å¤‡ä»½æˆªæ­¢æ—¶é—´
     * @return
     */
    public boolean initBackupParam(Date startTime, Date finalTime){
        // åœ¨æ—¥å¿—中记录操作系统信息,便于调试
        log.writeInfo("【初始备份参数】操作系统: " + System.getProperty("os.name"), BackupLogger.INFO_TYPE);
        log.writeInfo("【初始备份参数】文件分隔符: " + File.separator, BackupLogger.INFO_TYPE);
        log.writeInfo("【初始备份参数】系统备份开始..................", BackupLogger.INFO_TYPE);
        NUMBER_TIME = numberTimeFormat.format(finalTime);
        NUMBER_DATE = numberDateFormat.format(finalTime);
        if(startTime == null) {
            STANDARD_START_TIME = "2000-01-01 00:00:00";
        } else {
            STANDARD_START_TIME = standardTimeFormat.format(startTime);
        }
        STANDARD_FINAL_TIME = standardTimeFormat.format(finalTime);
        log.writeInfo("【初始备份参数】系统日期:" + NUMBER_DATE, BackupLogger.INFO_TYPE);
        log.writeInfo("【初始备份参数】系统时间:" + NUMBER_TIME, BackupLogger.INFO_TYPE);
        log.writeInfo("【初始备份参数】系统备份开始时间:" + STANDARD_START_TIME, BackupLogger.INFO_TYPE);
        log.writeInfo("【初始备份参数】系统备份截止时间:" + STANDARD_FINAL_TIME, BackupLogger.INFO_TYPE);
        return true;
    }
    
    /**
     * ç¬¬ä¸€æ­¥ï¼šåˆå§‹é…ç½®æ–‡ä»¶å‚æ•°,当前目录生成时间戳的文件夹
     * ç¬¬äºŒæ­¥ï¼šåˆå§‹é…ç½®æ–‡ä»¶å‚æ•°,当前目录生成时间戳的文件夹
     */
    public boolean initSystemConfig() {
        log.writeInfo("【初始配置文件】开始初始系统配置文件..................", BackupLogger.INFO_TYPE);
@@ -121,11 +187,11 @@
            // èŽ·å–ç³»ç»Ÿæ–‡ä»¶è·¯å¾„
            String systemFileFolder = Global.getSystemConfig("local.dir", "");
            File newFile= new File(systemFileFolder);
            // ç³»ç»Ÿé™„件存放目录(当天附件)
            config.setProperty("DOCUMENT_ROOT", newFile.getAbsolutePath() + File.separator + "00000000-0000-0000-0000-000000000000" + File.separator + NUMBER_DATE);
            // æ•°æ®åº“备份目录(数据库备份根目录+时间文件名+.sql)
            // ç³»ç»Ÿé™„件存放目录(../product-server-web/attachment/upload/)
            config.setProperty("DOCUMENT_ROOT", newFile.getAbsolutePath());
            // æ•°æ®åº“备份目录(数据库备份根目录+时间文件名+.sql,例如:E://backup/database/20250101090000.sql)
            config.setProperty("DATABASE_BACKUP", config.getProperty("DATABASE_ROOT") + File.separator + NUMBER_TIME + ".sql");
            // å¤‡ä»½ç›®æ ‡æ–‡ä»¶ï¼ˆZIP备份根目录+时间文件名+.zip)
            // å¤‡ä»½ZIP文件(ZIP备份根目录+时间文件名+.zip,例如:E://backup/20250101090000.zip)
            config.setProperty("ZIPFILE_BACKUP", config.getProperty("ZIPFILE_ROOT") + File.separator + NUMBER_TIME + ".zip");
            // åˆ›å»ºZIP文件根目录
            File zipFileRoot = new File(config.getProperty("ZIPFILE_ROOT"));
@@ -135,10 +201,9 @@
                    return false;
                }
            }
            log.writeInfo("【初始配置文件】DOCUMENT_ROOT=" + config.getProperty("DOCUMENT_ROOT"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】DATABASE_ROOT=" + config.getProperty("DATABASE_ROOT"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】DATABASE_BACKUP=" + config.getProperty("DATABASE_BACKUP"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】DOCUMENT_ROOT=" + config.getProperty("DOCUMENT_ROOT"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】DOCUMENT_BACKUP=" + config.getProperty("DOCUMENT_BACKUP"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】ZIPFILE_ROOT=" + config.getProperty("ZIPFILE_ROOT"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】ZIPFILE_BACKUP=" + config.getProperty("ZIPFILE_BACKUP"), BackupLogger.INFO_TYPE);
            log.writeInfo("【初始配置文件】初始系统配置文件结束.................", BackupLogger.INFO_TYPE);
@@ -152,7 +217,7 @@
    }
    
    /**
     *     ç¬¬äºŒæ­¥ï¼šå¤‡ä»½æ•°æ®åº“文件
     *     ç¬¬ä¸‰æ­¥ï¼šå¤‡ä»½æ•°æ®åº“文件
     */
    public boolean runExpDataBase() {
        log.writeInfo("【备份数据库】开始备份数据库..................", BackupLogger.INFO_TYPE);
@@ -206,10 +271,6 @@
            int exitCode = process.waitFor();
            if (exitCode == 0) {
                log.writeInfo("【备份数据库】数据库备份成功:" + backupFile.getAbsolutePath(), BackupLogger.INFO_TYPE);
//              if (!"127.0.0.1".equals(databaseHost)) {
                    // èŽ·å–æ•°æ®åº“å¤‡ä»½æ–‡ä»¶
//                    return sftpTransferService(false);
//                }
            } else {
                log.writeInfo("【备份数据库】数据库备份失败,退出码: " + exitCode, BackupLogger.ERROR_TYPE);
            }
@@ -221,94 +282,77 @@
        return true;
    }
    private static void addFolderToZip(File folder, String parentPath, ZipOutputStream zos) throws IOException {
        File[] files = folder.listFiles();
        if (files != null) {
            for (File file : files) {
                if (file.isDirectory()) {
                    // é€’归处理子目录,保持路径结构
                    addFolderToZip(file, parentPath + file.getName() + "/", zos);
                } else {
                    // æ·»åŠ æ–‡ä»¶åˆ°ZIP,保持路径结构
                    addFileToZip(file, parentPath + file.getName(), zos);
                }
            }
        }
    }
    private static void addFileToZip(File file, String entryName, ZipOutputStream zos) throws IOException {
        try (FileInputStream fis = new FileInputStream(file)) {
            zos.putNextEntry(new ZipEntry(entryName));
            byte[] buffer = new byte[1024];
            int length;
            while ((length = fis.read(buffer)) >= 0) {
                zos.write(buffer, 0, length);
            }
            zos.closeEntry();
        }
    }
    /**
     *     ç¬¬ä¸‰æ­¥ï¼šåŽ‹ç¼©å¤‡ä»½æ–‡ä»¶
     */
    public boolean zipDataBackup() {
        log.writeInfo("【压缩备份文件】开始压缩备份文件..................", BackupLogger.INFO_TYPE);
    /**
     *     ç¬¬å››æ­¥ï¼šæ‰§è¡Œå¯¹æ•°æ®åº“文件、工程代码、上传文件做压缩备份
     * @return
     */
    public boolean zipDataBackup() {
        log.writeInfo("【压缩备份文件】开始压缩备份文件..................", BackupLogger.INFO_TYPE);
        String documentPath = config.getProperty("DOCUMENT_ROOT");
        String databasePath = config.getProperty("DATABASE_BACKUP");
        String zipFilePath = config.getProperty("ZIPFILE_BACKUP");
        log.writeInfo("【压缩备份文件】附件存储目录路径:" + documentPath, BackupLogger.INFO_TYPE);
        log.writeInfo("【压缩备份文件】数据库备份完整路径:" + databasePath, BackupLogger.INFO_TYPE);
        log.writeInfo("【压缩备份文件】备份压缩文件完整路径:" + zipFilePath, BackupLogger.INFO_TYPE);
        try (FileOutputStream fos = new FileOutputStream(zipFilePath);
               ZipOutputStream zos = new ZipOutputStream(fos)) {
            log.writeInfo("【压缩备份文件】压缩系统附件", BackupLogger.INFO_TYPE);
            // åŽ‹ç¼©æ–‡ä»¶å¤¹ï¼ˆä¿ç•™å®Œæ•´è·¯å¾„ç»“æž„ï¼‰
            // æ³¨æ„ï¼šè¿™é‡Œæˆ‘们传递了根目录名称作为初始parentPath
            addFolderToZip(new File(documentPath), NUMBER_DATE + "/", zos);
            log.writeInfo("【压缩备份文件】压缩数据库备份文件", BackupLogger.INFO_TYPE);
            // åŽ‹ç¼©SQL文件(放在指定路径下)
            addFileToZip(new File(databasePath), "database/" + NUMBER_TIME + ".sql", zos);
        try (FileOutputStream fos = new FileOutputStream(zipFilePath);
                ZipOutputStream zos = new ZipOutputStream(fos)){
            StringBuilder sbSql = new StringBuilder();
            sbSql.append("SELECT SUBSTRING_INDEX(attachment_url, '/', -1) folder_name,attachment_title AS file_name,attachment_url AS folder_path \n");
            sbSql.append("FROM product_sys_attachments \n");
            sbSql.append("WHERE (created_utc_datetime > ? AND created_utc_datetime <= ?) \n");
            sbSql.append("OR (updated_utc_datetime > ? AND updated_utc_datetime <= ?) \n");
            DataTableEntity dtTable = baseDao.listTable(sbSql.toString(), new Object[] {STANDARD_START_TIME, STANDARD_FINAL_TIME, STANDARD_START_TIME, STANDARD_FINAL_TIME});
            if(dtTable != null && dtTable.getRows() > 0) {
                Map<String, List<String>> groupFolderFile = new HashMap<>();
                for(int i = 0; i < dtTable.getRows(); i++) {
                    String folderName = dtTable.getFieldSetEntity(i).getString("folder_path");
                    String fileName = dtTable.getFieldSetEntity(i).getString("file_name");
                    if (groupFolderFile.containsKey(folderName)) {
                        groupFolderFile.get(folderName).add(fileName);
                    } else {
                        groupFolderFile.put(folderName, new ArrayList<String>(Arrays.asList(fileName)));
                    }
                }
                log.writeInfo("【压缩备份文件】压缩系统增量附件", BackupLogger.INFO_TYPE);
                SystemBackupUtil.compressExistingFiles(groupFolderFile, documentPath, zos);
            }
            log.writeInfo("【压缩备份文件】压缩数据库备份文件", BackupLogger.INFO_TYPE);
            SystemBackupUtil.addFileToZip(new File(databasePath), "database/" + NUMBER_TIME + ".sql", zos);
            log.writeInfo("【压缩备份文件】压缩完成", BackupLogger.INFO_TYPE);
        } catch (IOException e) {
            e.printStackTrace();
            return true;
        } catch (IOException e) {
            e.printStackTrace();
            log.writeInfo("【压缩备份文件】压缩失败:" + e.getMessage(), BackupLogger.ERROR_TYPE);
            return false;
        }
        return true;
    }
        } finally {
            File file = new File(databasePath);
            file.delete();
            log.writeInfo("【压缩备份文件】清理数据库备份文件完成", BackupLogger.INFO_TYPE);
        }
    }
    /**
     * SFTP连接:通过SFTP将备份文件上传备用机  æˆ–  ä»Žmysql服务器上获取备份文件
     * ç¬¬äº”步:SFTP连接:通过SFTP将备份文件上传备用机  æˆ–  ä»Žmysql服务器上获取备份文件
     * @param isUpload     æ˜¯å¦ä¸Šä¼ 
     * @return
     */
    public boolean sftpTransferService(boolean isUpload) {
        String sftpTitle = null;
        String localFilePath = null;
        String sftpFilePath = null;
        if(isUpload) {
            sftpTitle = "上传系统备份文件";
            localFilePath = config.getProperty("ZIPFILE_BACKUP"); // æœ¬åœ°æ–‡ä»¶è·¯å¾„
            sftpFilePath = config.getProperty("UPLOAD_BACKUP_DIR") + NUMBER_TIME + ".zip"; // SFTP服务文件路径
        } else {
//            sftpTitle = "获取数据库备份文件";
//            localFilePath = config.getProperty("DATABASE_BACKUP"); // æœ¬åœ°æ–‡ä»¶è·¯å¾„
//            sftpFilePath = config.getProperty("DATABASE_BACKUP"); // SFTP服务文件路径
        }
    public boolean sftpTransferService() {
        String localFilePath =  config.getProperty("ZIPFILE_BACKUP");    // æœ¬åœ°æ–‡ä»¶è·¯å¾„
        String sftpFilePath = config.getProperty("UPLOAD_BACKUP_DIR") + NUMBER_TIME + ".zip"; // SFTP服务文件路径;
        String host = config.getProperty("UPLOAD_SFTP_HOST"); // SFTP服务IP地址
        String port = config.getProperty("UPLOAD_SFTP_PORT"); // SSH端口
        String user = config.getProperty("UPLOAD_SFTP_USER"); // SFTP服务的用户名
        String password = config.getProperty("UPLOAD_SFTP_PWD"); // SFTP服务的密码
        log.writeInfo(String.format("【%s】开始%s..................", sftpTitle, sftpTitle), BackupLogger.INFO_TYPE);
        log.writeInfo(String.format("【%s】SFTP服务地址:", sftpTitle) + host, BackupLogger.INFO_TYPE);
        log.writeInfo(String.format("【%s】SFTP服务端口:", sftpTitle) + port, BackupLogger.INFO_TYPE);
        log.writeInfo(String.format("【%s】SFTP服务存储目录:", sftpTitle) + sftpFilePath, BackupLogger.INFO_TYPE);
        log.writeInfo(String.format("【%s】当前服务存储目录:", sftpTitle) + localFilePath, BackupLogger.INFO_TYPE);
        log.writeInfo("【上传系统备份文件】开始上传系统备份文件..................", BackupLogger.INFO_TYPE);
        log.writeInfo("【上传系统备份文件】SFTP服务地址:" + host, BackupLogger.INFO_TYPE);
        log.writeInfo("【上传系统备份文件】SFTP服务端口:" + port, BackupLogger.INFO_TYPE);
        log.writeInfo("【上传系统备份文件】SFTP服务存储目录:" + sftpFilePath, BackupLogger.INFO_TYPE);
        log.writeInfo("【上传系统备份文件】当前服务存储目录:" + localFilePath, BackupLogger.INFO_TYPE);
        if (StringUtils.isEmpty(host) || StringUtils.isEmpty(port) || StringUtils.isEmpty(user) || StringUtils.isEmpty(password)) {
            log.writeInfo(String.format("【%s】SFTP信息未配置完整,不予连接传输文件", sftpTitle), BackupLogger.INFO_TYPE);
            log.writeInfo("【上传系统备份文件】SFTP信息未配置完整,不予连接传输文件", BackupLogger.INFO_TYPE);
            return true;
        }
        try {
@@ -327,43 +371,28 @@
            if (!remoteDir.startsWith("/")) {
                remoteDir = "/" + remoteDir;
            }
            if(isUpload) {
                // åˆ›å»ºå¯¹åº”目录文件夹
                createRemoteDirectory(sftpChannel, remoteDir);
                sftpChannel.put(localFilePath, sftpFilePath, new SftpProgressMonitor() {
                    public void init(int op, String src, String dest, long max) {
                        log.writeInfo("【上传系统备份文件】开始传输: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
                    }
                    public boolean count(long count) { return true; }
                    public void end() { log.writeInfo("【上传系统备份文件】传输完成", BackupLogger.INFO_TYPE); }
                });
            } else {
                // åˆ›å»ºå¯¹åº”目录文件夹
                File fileDirectory = new File(remoteDir);
                if (!fileDirectory.exists()) {
                    fileDirectory.mkdirs();
            // åˆ›å»ºå¯¹åº”目录文件夹
            createRemoteDirectory(sftpChannel, remoteDir);
            sftpChannel.put(localFilePath, sftpFilePath, new SftpProgressMonitor() {
                public void init(int op, String src, String dest, long max) {
                    log.writeInfo("【上传系统备份文件】开始传输: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
                }
                sftpChannel.get(localFilePath, sftpFilePath, new SftpProgressMonitor() {
                    public void init(int op, String src, String dest, long max) {
                        log.writeInfo("【获取数据库备份文件】开始传输: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
                    }
                    public boolean count(long count) { return true; }
                    public void end() { log.writeInfo("【获取数据库备份文件】传输完成", BackupLogger.INFO_TYPE); }
                });
            }
                public boolean count(long count) { return true; }
                public void end() { log.writeInfo("【上传系统备份文件】传输完成", BackupLogger.INFO_TYPE); }
            });
            sftpChannel.exit();
            session.disconnect();
            log.writeInfo(String.format("【%s】%s成功", sftpTitle, sftpTitle), BackupLogger.INFO_TYPE);
            log.writeInfo("【上传系统备份文件】上传系统备份文件成功", BackupLogger.INFO_TYPE);
        } catch (JSchException | SftpException e) {
            e.printStackTrace();
            log.writeInfo(String.format("【%s】%s失败:", sftpTitle, sftpTitle) + e.getMessage(), BackupLogger.ERROR_TYPE);
            log.writeInfo("【上传系统备份文件】上传系统备份文件失败:" + e.getMessage(), BackupLogger.ERROR_TYPE);
            return false;
        }
        return true;
    }
    
    /**
     *  é€’归创建远程目录
     *  SFTP递归创建远程目录
     * @param sftpChannel
     * @param remoteDir
     * @throws SftpException
src/main/java/com/product/system/backup/service/SystemBackupServiceV1.java
ÎļþÃû´Ó src/main/java/com/product/system/backup/service/SystemBackupService2.java ÐÞ¸Ä
@@ -9,19 +9,12 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.druid.util.StringUtils;
@@ -33,17 +26,16 @@
import com.jcraft.jsch.SftpException;
import com.jcraft.jsch.SftpProgressMonitor;
import com.product.core.config.Global;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.service.support.AbstractBaseService;
import com.product.system.backup.entity.BackupLogger;
@Service("systemBackService")
public class SystemBackupService2 extends AbstractBaseService{
    @Autowired
    BaseDao baseDao;
/**
 *     ç³»ç»Ÿå¤‡ä»½
 *    æ•°æ®åº“备份:每天执行代码备份
 *    é™„件备份:每天执行代码备份当天附件
 *    é—留问题:附件被修改,不能锁定非当天被修改的附件
 */
@Service("systemBackService1")
public class SystemBackupServiceV1 {
    
    // å¤‡ä»½é…ç½®
    Properties config;
@@ -54,80 +46,29 @@
    // æ•°å­—时间和数字日期(用做文件夹或者文件名)
    String NUMBER_TIME;    //例如(20250428091001)
    String NUMBER_DATE; //例如(20240428)
    String STANDARD_START_TIME;    // ä¾‹å¦‚(2024-04-28 09:10:00)
    String STANDARD_FINAL_TIME;    // ä¾‹å¦‚(2024-04-28 09:10:00)
    
    // æ•°å­—日期格式
    SimpleDateFormat numberTimeFormat = new SimpleDateFormat("yyyyMMddHHmm00");
    SimpleDateFormat numberTimeFormat = new SimpleDateFormat("yyyyMMddHHmmss");
    SimpleDateFormat numberDateFormat = new SimpleDateFormat("yyyyMMdd");
    SimpleDateFormat standardTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:00");
    // å¤‡ä»½é…ç½®æ–‡ä»¶
    private static final String CONFIG_FILE_PATH = "systemBackup.properties";
    
    /**
     *     ç³»ç»Ÿå¤‡ä»½åˆ¤å®š
     *     ç³»ç»Ÿå¤‡ä»½å…¥å£
     *     è°ƒç”¨åœ°ç‚¹ï¼šå®šæ—¶ä»»åŠ¡é…ç½®åŠŸèƒ½(bean)
     */
    public void systemBackupInit() {
        // èŽ·å–ç³»ç»Ÿæ—¶é—´
        Date finalTime = new Date();
        Date startTime = null;
        // èŽ·å–ç³»ç»Ÿå¤‡ä»½å‘¨æœŸ(分钟)
        int backupCycle = Integer.valueOf(Global.getSystemConfig("SYSTEM_BACK_CYCLE", "20"));
        // èŽ·å–ç³»ç»Ÿæœ€å¤§å¤‡ä»½æ—¶é—´
        StringBuilder sbSql = new StringBuilder();
        sbSql.append("SELECT TIMESTAMPDIFF(MINUTE, end_time, ?) AS diff_minutes,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 ;
            }
            startTime = fseMaxLogTime.getDate("end_time");
        }
        try {
            // æ‰§è¡Œå¤‡ä»½
            systemBackup(startTime, finalTime);
        } catch (Exception e) {
            e.printStackTrace();
        }
        FieldSetEntity fseBackLog = new FieldSetEntity("product_sys_backup_log");
        fseBackLog.setValue("start_time", startTime);
        fseBackLog.setValue("end_time", finalTime);
        fseBackLog.setValue("backup_status", 1);
        baseDao.saveFieldSetEntity(fseBackLog);
    }
    /**
     *     ç³»ç»Ÿå¤‡ä»½å…¥å£
     *
     */
    public void systemBackup(Date startTime, Date finalTime){
    public void systemBackupInit(){
        // åˆå§‹æ—¥å¿—文件
        log = new BackupLogger();
        // åœ¨æ—¥å¿—中记录操作系统信息,便于调试
        log.writeInfo("【系统备份入口】操作系统: " + System.getProperty("os.name"), BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】文件分隔符: " + File.separator, BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】系统备份开始..................", BackupLogger.INFO_TYPE);
        NUMBER_TIME = numberTimeFormat.format(finalTime);
        NUMBER_DATE = numberDateFormat.format(finalTime);
        if(startTime == null) {
            STANDARD_START_TIME = "2000-01-01 00:00:00";
        } else {
            STANDARD_START_TIME = standardTimeFormat.format(startTime);
        }
        STANDARD_FINAL_TIME = standardTimeFormat.format(finalTime);
        NUMBER_TIME = numberTimeFormat.format(new Date());
        NUMBER_DATE = numberDateFormat.format(new Date());
        log.writeInfo("【系统备份入口】系统日期:" + NUMBER_DATE, BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】系统时间:" + NUMBER_TIME, BackupLogger.INFO_TYPE);
        log.writeInfo("【系统本分入口】系统备份开始时间:" + STANDARD_START_TIME, BackupLogger.INFO_TYPE);
        log.writeInfo("【系统备份入口】系统备份截止时间:" + STANDARD_FINAL_TIME, BackupLogger.INFO_TYPE);
        // è¿›å…¥å¤‡ä»½è¿›ç¨‹
        backupProcess();
        log.closeLogger();
@@ -153,7 +94,8 @@
        if (!status)
            return;
        // ç¬¬å››æ­¥ï¼šä¸Šä¼ åŽ‹ç¼©å¤‡ä»½æ–‡ä»¶åˆ°FTP
        status = sftpTransferService();
        status = sftpTransferService(true);
//        uploadBackupMachine2();
        if (!status)
            return;
        // ç¬¬äº”步:清除数据
@@ -179,8 +121,8 @@
            // èŽ·å–ç³»ç»Ÿæ–‡ä»¶è·¯å¾„
            String systemFileFolder = Global.getSystemConfig("local.dir", "");
            File newFile= new File(systemFileFolder);
            // ç³»ç»Ÿé™„件存放目录
            config.setProperty("DOCUMENT_ROOT", newFile.getAbsolutePath() + File.separator + "00000000-0000-0000-0000-000000000000");
            // ç³»ç»Ÿé™„件存放目录(当天附件)
            config.setProperty("DOCUMENT_ROOT", newFile.getAbsolutePath() + File.separator + "00000000-0000-0000-0000-000000000000" + File.separator + NUMBER_DATE);
            // æ•°æ®åº“备份目录(数据库备份根目录+时间文件名+.sql)
            config.setProperty("DATABASE_BACKUP", config.getProperty("DATABASE_ROOT") + File.separator + NUMBER_TIME + ".sql");
            // å¤‡ä»½ç›®æ ‡æ–‡ä»¶ï¼ˆZIP备份根目录+时间文件名+.zip)
@@ -279,6 +221,21 @@
        return true;
    }
    private static void addFolderToZip(File folder, String parentPath, ZipOutputStream zos) throws IOException {
        File[] files = folder.listFiles();
        if (files != null) {
            for (File file : files) {
                if (file.isDirectory()) {
                    // é€’归处理子目录,保持路径结构
                    addFolderToZip(file, parentPath + file.getName() + "/", zos);
                } else {
                    // æ·»åŠ æ–‡ä»¶åˆ°ZIP,保持路径结构
                    addFileToZip(file, parentPath + file.getName(), zos);
                }
            }
        }
    }
    private static void addFileToZip(File file, String entryName, ZipOutputStream zos) throws IOException {
        try (FileInputStream fis = new FileInputStream(file)) {
            zos.putNextEntry(new ZipEntry(entryName));
@@ -292,91 +249,55 @@
    }
    
    /**
     *     åŽ‹ç¼©å¢žé‡é™„ä»¶
     * @param groupFolderFile    å¢žé‡æ–‡ä»¶å¤¹ï¼Œæ–‡ä»¶å
     * @param baseDir            é™„件根目录
     * @param outputZipPath        åŽ‹ç¼©æ–‡ä»¶
     * @throws IOException
     *     ç¬¬ä¸‰æ­¥ï¼šåŽ‹ç¼©å¤‡ä»½æ–‡ä»¶
     */
    public static void compressExistingFiles(Map<Integer, List<String>> groupFolderFile, String baseDir, ZipOutputStream zos) throws IOException {
        for (Map.Entry<Integer, List<String>> entry : groupFolderFile.entrySet()) {
            int folderName = entry.getKey(); // æ–‡ä»¶å¤¹åï¼ˆå¦‚ 20250611)
            List<String> files = entry.getValue(); // è¯¥æ–‡ä»¶å¤¹ä¸‹çš„æ–‡ä»¶ååˆ—表
            Path folderPath = Paths.get(baseDir).resolve(String.valueOf(folderName));
            for (String fileName : files) {
                Path filePath = folderPath.resolve(fileName);
                // æ£€æŸ¥æ–‡ä»¶æ˜¯å¦å­˜åœ¨
                if (Files.exists(filePath) && !Files.isDirectory(filePath)) {
                    // è®¡ç®— ZIP å†…的相对路径(如 "20250611/file1.txt")
                    ZipEntry zipEntry = new ZipEntry(
                        String.valueOf(folderName) + "/" + fileName
                    );
                    zos.putNextEntry(zipEntry);
                    // å†™å…¥æ–‡ä»¶å†…容到 ZIP
                    Files.copy(filePath, zos);
                    zos.closeEntry();
                } else {
                    System.err.println("文件不存在或不是文件: " + filePath);
                }
            }
        }
    }
    public boolean zipDataBackup() {
        log.writeInfo("【压缩备份文件】开始压缩备份文件..................", BackupLogger.INFO_TYPE);
    public boolean zipDataBackup() {
        log.writeInfo("【压缩备份文件】开始压缩备份文件..................", BackupLogger.INFO_TYPE);
        String documentPath = config.getProperty("DOCUMENT_ROOT");
        String databasePath = config.getProperty("DATABASE_BACKUP");
        String zipFilePath = config.getProperty("ZIPFILE_BACKUP");
        log.writeInfo("【压缩备份文件】附件存储目录路径:" + documentPath, BackupLogger.INFO_TYPE);
        log.writeInfo("【压缩备份文件】数据库备份完整路径:" + databasePath, BackupLogger.INFO_TYPE);
        log.writeInfo("【压缩备份文件】备份压缩文件完整路径:" + zipFilePath, BackupLogger.INFO_TYPE);
        try (FileOutputStream fos = new FileOutputStream(zipFilePath);
                ZipOutputStream zos = new ZipOutputStream(fos)){
            StringBuilder sbSql = new StringBuilder();
            sbSql.append("SELECT SUBSTRING_INDEX(attachment_url, '/', -1) id,attachment_title AS uuid,attachment_url \n");
            sbSql.append("FROM product_sys_attachments \n");
            sbSql.append("WHERE (created_utc_datetime > ? AND created_utc_datetime <= ?) \n");
            sbSql.append("AND (updated_utc_datetime > ? AND updated_utc_datetime <= ?) \n");
            DataTableEntity dtTable = baseDao.listTable(sbSql.toString(), new Object[] {STANDARD_START_TIME, STANDARD_FINAL_TIME, STANDARD_START_TIME, STANDARD_FINAL_TIME});
            if(dtTable != null && dtTable.getRows() > 0) {
                Map<Integer, List<String>> groupFolderFile = dtTable.getData().stream()
                        .collect(Collectors.groupingBy(
                            FieldSetEntity::getId,
                            Collectors.mapping(
                                FieldSetEntity::getUUID,
                                Collectors.toList()
                            )
                        ));
                log.writeInfo("【压缩备份文件】压缩系统增量附件", BackupLogger.INFO_TYPE);
                compressExistingFiles(groupFolderFile, documentPath, zos);
            }
            log.writeInfo("【压缩备份文件】压缩数据库备份文件", BackupLogger.INFO_TYPE);
        try (FileOutputStream fos = new FileOutputStream(zipFilePath);
               ZipOutputStream zos = new ZipOutputStream(fos)) {
            log.writeInfo("【压缩备份文件】压缩系统附件", BackupLogger.INFO_TYPE);
            // åŽ‹ç¼©æ–‡ä»¶å¤¹ï¼ˆä¿ç•™å®Œæ•´è·¯å¾„ç»“æž„ï¼‰
            // æ³¨æ„ï¼šè¿™é‡Œæˆ‘们传递了根目录名称作为初始parentPath
            addFolderToZip(new File(documentPath), NUMBER_DATE + "/", zos);
            log.writeInfo("【压缩备份文件】压缩数据库备份文件", BackupLogger.INFO_TYPE);
            // åŽ‹ç¼©SQL文件(放在指定路径下)
            addFileToZip(new File(databasePath), "database/" + NUMBER_TIME + ".sql", zos);
            log.writeInfo("【压缩备份文件】压缩完成", BackupLogger.INFO_TYPE);
        } catch (IOException e) {
            e.printStackTrace();
        } finally {
            File file = new File(databasePath);
            file.delete();
            log.writeInfo("【压缩备份文件】清理数据库备份文件完成", BackupLogger.INFO_TYPE);
        }
        return false;
    }
    
            log.writeInfo("【压缩备份文件】压缩完成", BackupLogger.INFO_TYPE);
        } catch (IOException e) {
            e.printStackTrace();
            log.writeInfo("【压缩备份文件】压缩失败:" + e.getMessage(), BackupLogger.ERROR_TYPE);
            return false;
        }
        return true;
    }
    /**
     * SFTP连接:通过SFTP将备份文件上传备用机  æˆ–  ä»Žmysql服务器上获取备份文件
     * @param isUpload     æ˜¯å¦ä¸Šä¼ 
     * @return
     */
    public boolean sftpTransferService() {
        String sftpTitle = "上传系统备份文件";;
        String localFilePath =  config.getProperty("ZIPFILE_BACKUP");    // æœ¬åœ°æ–‡ä»¶è·¯å¾„
        String sftpFilePath = config.getProperty("UPLOAD_BACKUP_DIR") + NUMBER_TIME + ".zip"; // SFTP服务文件路径;
    public boolean sftpTransferService(boolean isUpload) {
        String sftpTitle = null;
        String localFilePath = null;
        String sftpFilePath = null;
        if(isUpload) {
            sftpTitle = "上传系统备份文件";
            localFilePath = config.getProperty("ZIPFILE_BACKUP"); // æœ¬åœ°æ–‡ä»¶è·¯å¾„
            sftpFilePath = config.getProperty("UPLOAD_BACKUP_DIR") + NUMBER_TIME + ".zip"; // SFTP服务文件路径
        } else {
//            sftpTitle = "获取数据库备份文件";
//            localFilePath = config.getProperty("DATABASE_BACKUP"); // æœ¬åœ°æ–‡ä»¶è·¯å¾„
//            sftpFilePath = config.getProperty("DATABASE_BACKUP"); // SFTP服务文件路径
        }
        String host = config.getProperty("UPLOAD_SFTP_HOST"); // SFTP服务IP地址
        String port = config.getProperty("UPLOAD_SFTP_PORT"); // SSH端口
        String user = config.getProperty("UPLOAD_SFTP_USER"); // SFTP服务的用户名
@@ -406,15 +327,30 @@
            if (!remoteDir.startsWith("/")) {
                remoteDir = "/" + remoteDir;
            }
            // åˆ›å»ºå¯¹åº”目录文件夹
            createRemoteDirectory(sftpChannel, remoteDir);
            sftpChannel.put(localFilePath, sftpFilePath, new SftpProgressMonitor() {
                public void init(int op, String src, String dest, long max) {
                    log.writeInfo("【上传系统备份文件】开始传输: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
            if(isUpload) {
                // åˆ›å»ºå¯¹åº”目录文件夹
                createRemoteDirectory(sftpChannel, remoteDir);
                sftpChannel.put(localFilePath, sftpFilePath, new SftpProgressMonitor() {
                    public void init(int op, String src, String dest, long max) {
                        log.writeInfo("【上传系统备份文件】开始传输: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
                    }
                    public boolean count(long count) { return true; }
                    public void end() { log.writeInfo("【上传系统备份文件】传输完成", BackupLogger.INFO_TYPE); }
                });
            } else {
                // åˆ›å»ºå¯¹åº”目录文件夹
                File fileDirectory = new File(remoteDir);
                if (!fileDirectory.exists()) {
                    fileDirectory.mkdirs();
                }
                public boolean count(long count) { return true; }
                public void end() { log.writeInfo("【上传系统备份文件】传输完成", BackupLogger.INFO_TYPE); }
            });
                sftpChannel.get(localFilePath, sftpFilePath, new SftpProgressMonitor() {
                    public void init(int op, String src, String dest, long max) {
                        log.writeInfo("【获取数据库备份文件】开始传输: " + src + " -> " + dest, BackupLogger.INFO_TYPE);
                    }
                    public boolean count(long count) { return true; }
                    public void end() { log.writeInfo("【获取数据库备份文件】传输完成", BackupLogger.INFO_TYPE); }
                });
            }
            sftpChannel.exit();
            session.disconnect();
            log.writeInfo(String.format("【%s】%s成功", sftpTitle, sftpTitle), BackupLogger.INFO_TYPE);
@@ -427,7 +363,7 @@
    }
    
    /**
     *  SFTP递归创建远程目录
     *  é€’归创建远程目录
     * @param sftpChannel
     * @param remoteDir
     * @throws SftpException
src/main/java/com/product/system/backup/util/SystemBackupUtil.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.product.system.backup.util;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.List;
import java.util.Map;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
public class SystemBackupUtil {
    /**
     *     åŽ‹ç¼©æ–‡ä»¶åˆ°æŒ‡å®šZIP文件
     * @param file        è¢«åŽ‹ç¼©æ–‡ä»¶
     * @param entryName    ZIP文件目录节点
     * @param zos        ç›®æ ‡ZIP文件
     * @throws IOException
     */
    public static void addFileToZip(File file, String entryName, ZipOutputStream zos) throws IOException {
        try (FileInputStream fis = new FileInputStream(file)) {
            zos.putNextEntry(new ZipEntry(entryName));
            byte[] buffer = new byte[1024];
            int length;
            while ((length = fis.read(buffer)) >= 0) {
                zos.write(buffer, 0, length);
            }
            zos.closeEntry();
        }
    }
    /**
     *     åŽ‹ç¼©å¢žé‡é™„ä»¶
     * @param groupFolderFile    å¢žé‡æ–‡ä»¶å¤¹ï¼Œæ–‡ä»¶å
     * @param baseDir            è¢«åŽ‹ç¼©æ–‡ä»¶æ€»ç›®å½•
     * @param outputZipPath        ç›®æ ‡åŽ‹ç¼©æ–‡ä»¶
     * @throws IOException
     */
    public static void compressExistingFiles(Map<String, List<String>> groupFolderFile, String baseDir, ZipOutputStream zos) throws IOException {
        for (Map.Entry<String, List<String>> entry : groupFolderFile.entrySet()) {
            String folderName = entry.getKey(); // æ–‡ä»¶å¤¹åï¼ˆå¦‚ 20250611)
            List<String> files = entry.getValue(); // è¯¥æ–‡ä»¶å¤¹ä¸‹çš„æ–‡ä»¶ååˆ—表
            Path folderPath = Paths.get(baseDir).resolve(folderName);
            for (String fileName : files) {
                Path filePath = folderPath.resolve(fileName);
                // æ£€æŸ¥æ–‡ä»¶æ˜¯å¦å­˜åœ¨
                if (Files.exists(filePath) && !Files.isDirectory(filePath)) {
                    // è®¡ç®— ZIP å†…的相对路径(如 "20250611/file1.txt")
                    ZipEntry zipEntry = new ZipEntry(
                        String.valueOf(folderName) + "/" + fileName
                    );
                    zos.putNextEntry(zipEntry);
                    // å†™å…¥æ–‡ä»¶å†…容到 ZIP
                    Files.copy(filePath, zos);
                    zos.closeEntry();
                } else {
                    System.err.println("文件不存在或不是文件: " + filePath);
                }
            }
        }
    }
}