Merge branch 'old'

src/main/java/com/cmeeting/controller/MeetingInfoController.java

@@ -360,15 +360,23 @@ public class MeetingInfoController {
      */
     @GetMapping("/emailStatisticsPushTest")
     public void emailStatisticsPush() {
+        log.info("推送统计邮件开始！");
         List<StatisticsEmailPush.Attachment> attachments = new ArrayList<>();
-        String subject = "Cmeeting会议助手-会议纪要推送记录分析-" + new SimpleDateFormat("yyyyMMdd").format(new Date());
+
+        Date date = new Date();
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR_OF_DAY, 1); // 增加 1 小时
+        Date newDate = calendar.getTime(); // 返回增加后的 Date 对象
+        String subject = "会议纪要推送记录-" + new SimpleDateFormat("yyyyMMdd HH").format(newDate) + ":00";
         String content;
         if (CollUtil.isEmpty(statisticsEmailPushProperties.getToEmails())) {
             log.error("收件人为空！");
             return;
         }
         File file = new File(savePath + subject + ".xlsx");
-        Date date = new Date();
+
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {

src/main/java/com/cmeeting/job/CmeetingJob.java

@@ -50,6 +50,7 @@ import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.Calendar;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
@@ -335,14 +336,21 @@ public class CmeetingJob {
         }
         log.info("推送统计邮件开始！");
         List<StatisticsEmailPush.Attachment> attachments = new ArrayList<>();
-        String subject = "Cmeeting会议助手-会议纪要推送记录分析-" + new SimpleDateFormat("yyyyMMdd").format(new Date());
+
+        Date date = new Date();
+
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(date);
+        calendar.add(Calendar.HOUR_OF_DAY, 1); // 增加 1 小时
+        Date newDate = calendar.getTime(); // 返回增加后的 Date 对象
+        String subject = "会议纪要推送记录-" + new SimpleDateFormat("yyyyMMdd HH").format(newDate) + ":00";
         String content;
         if (CollUtil.isEmpty(statisticsEmailPushProperties.getToEmails())) {
             log.error("收件人为空！");
             return;
         }
         File file = new File(savePath + subject + ".xlsx");
-        Date date = new Date();
+
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         try {