Commit 6d13e8c045581d87ed49a336145298b696dc1477

Authored by 杨鸣坤
1 parent 645df865

fix: 修正定时任务cron表达式与全量同步起始日期

修正devUtil和oee的cron表达式,使其与注释中的凌晨2:30和2:35保持一致;同时修复全量同步起始日期硬编码为"2026-05-01"的问题,改为使用计算得到的年初日期。
@@ -240,7 +240,7 @@ public class DevicePullService { @@ -240,7 +240,7 @@ public class DevicePullService {
240 cal.set(cal.get(Calendar.YEAR), Calendar.JANUARY, 1); 240 cal.set(cal.get(Calendar.YEAR), Calendar.JANUARY, 1);
241 String startDate = sdf.format(cal.getTime()); 241 String startDate = sdf.format(cal.getTime());
242 log.info("【全量同步】设备利用率, corpCode:{}, 日期范围: {} ~ {}", corpCode, startDate, endDate); 242 log.info("【全量同步】设备利用率, corpCode:{}, 日期范围: {} ~ {}", corpCode, startDate, endDate);
243 - doSyncDevUtil(corpCode, "2026-05-01", endDate); 243 + doSyncDevUtil(corpCode, startDate, endDate);
244 } 244 }
245 245
246 @Scheduled(cron = "${scheduler.devUtil.cron:0 30 2 * * ?}") 246 @Scheduled(cron = "${scheduler.devUtil.cron:0 30 2 * * ?}")
@@ -377,7 +377,7 @@ public class DevicePullService { @@ -377,7 +377,7 @@ public class DevicePullService {
377 cal.set(cal.get(Calendar.YEAR), Calendar.JANUARY, 1); 377 cal.set(cal.get(Calendar.YEAR), Calendar.JANUARY, 1);
378 String startDate = sdf.format(cal.getTime()); 378 String startDate = sdf.format(cal.getTime());
379 log.info("【全量同步】OEE时序数据, corpCode:{}, 日期范围: {} ~ {}", corpCode, startDate, endDate); 379 log.info("【全量同步】OEE时序数据, corpCode:{}, 日期范围: {} ~ {}", corpCode, startDate, endDate);
380 - doSyncOee(corpCode, "2026-05-01", endDate); 380 + doSyncOee(corpCode, startDate, endDate);
381 } 381 }
382 382
383 @Scheduled(cron = "${scheduler.oee.cron:0 35 2 * * ?}") 383 @Scheduled(cron = "${scheduler.oee.cron:0 35 2 * * ?}")
@@ -39,9 +39,9 @@ scheduler: @@ -39,9 +39,9 @@ scheduler:
39 pull: "0 0/5 * * * ?" 39 pull: "0 0/5 * * * ?"
40 push: "0 0/10 * * * ?" 40 push: "0 0/10 * * * ?"
41 devUtil: 41 devUtil:
42 - cron: "0 30 9 * * ?" # 每日凌晨 2:30 增量同步昨天数据 42 + cron: "0 30 2 * * ?" # 每日凌晨 2:30 增量同步昨天数据
43 oee: 43 oee:
44 - cron: "0 30 9 * * ?" # 每日凌晨 2:35 增量同步昨天OEE数据 44 + cron: "0 35 2 * * ?" # 每日凌晨 2:35 增量同步昨天OEE数据
45 energy: 45 energy:
46 cron: "0 0/5 * * * ?" # 每5分钟同步一次能耗数据 46 cron: "0 0/5 * * * ?" # 每5分钟同步一次能耗数据
47 energyHistory: 47 energyHistory: