From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 01 四月 2025 16:03:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/scheduler/SystemScheduler.java | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/scheduler/SystemScheduler.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/scheduler/SystemScheduler.java index 2921a7d..4c16f23 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/scheduler/SystemScheduler.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/scheduler/SystemScheduler.java @@ -1,15 +1,16 @@ package com.ruoyi.system.scheduler; -import com.ruoyi.system.service.staff.SysWxCpService; -import lombok.extern.slf4j.Slf4j; +import com.ruoyi.system.service.staff.SysStaffService; +import com.ruoyi.system.service.sys.ISysDeptService; +import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @Component -@Slf4j +@Log4j2 public class SystemScheduler { @@ -17,19 +18,30 @@ private SchedulerUtils schedulerUtils; @Autowired - private SysWxCpService sysWxCpService; + private SysStaffService sysStaffService; - + @Autowired + private ISysDeptService sysDeptService; /** - * 定时同步企业微信部门 + * 每天凌晨2点定时同步企业微信部门 */ @Scheduled(cron="0 0 2 * * ?") private void timingCheckMemberCoupon(){ if(schedulerUtils.getSchedulerRun()) { log.info("定时同步企业微信部门任务开始执行"); - sysWxCpService.syncDepartment(); + sysDeptService.syncDepartment(); } } + /** + * 每天8点35分发送员工通知今日跟进任务 + */ + @Scheduled(cron="0 35 8 * * ?") + private void timingSendTaskMessage(){ + if(schedulerUtils.getSchedulerRun()) { + log.info("定时发送通知任务任务开始执行"); + sysStaffService.sendTaskMessage(); + } + } } -- Gitblit v1.7.1