配置文件控制定时器运行

d3b83848 · 陶湘宇 · 4b121214 · d3b83848 · d3b83848 · d3b83848
Commit d3b83848 authored Sep 02, 2023 by 陶湘宇
12 changed files
--- a/src/main/java/cn/timer/api/Application.java
+++ b/src/main/java/cn/timer/api/Application.java
@@ -21,7 +21,7 @@ import cn.hutool.core.net.NetUtil;
 @MapperScan({"cn.timer.api.dao"}) // 扫描的mapper
 @ComponentScan(basePackages = {"cn.timer.api"})
 @SpringBootApplication
-@EnableScheduling
+//@EnableScheduling
 @EnableTransactionManagement
 public class Application {

--- a/src/main/java/cn/timer/api/config/schedule/SchedulerCondition.java
+++ b/src/main/java/cn/timer/api/config/schedule/SchedulerCondition.java
+package cn.timer.api.config.schedule;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+public class SchedulerCondition implements Condition {
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        System.out.println("是否启动定时器"+context.getEnvironment().getProperty("enable.scheduling"));
+        return Boolean.valueOf(context.getEnvironment().getProperty("enable.scheduling"));
+    }
+}
\ No newline at end of file
--- a/src/main/java/cn/timer/api/controller/htzz/atttimer/NewsTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/htzz/atttimer/NewsTaskTiming.java
@@ -5,7 +5,10 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import cn.timer.api.config.schedule.SchedulerCondition;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -21,15 +24,18 @@ import cn.timer.api.controller.kqgl.ClockInTool;
 * 消息定时器
 *
 */
+@Slf4j
 @Configuration // 1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling // 2.开启定时任务
+//@EnableScheduling // 2.开启定时任务
 public class NewsTaskTiming {
 	@Autowired
 	private AlicloudSMS sms;
+	@Conditional(SchedulerCondition.class) //定时器开关
 	@Scheduled(cron = "0 0 8 * * ?")//早上八点
 	public void MessageAlert() throws ParseException {
+		log.info("消息定时器启动");
 		//当前时间
 		String nowdate = new SimpleDateFormat("yyyy-MM-dd").format(new Date()).toString();//

--- a/src/main/java/cn/timer/api/controller/insure/task/InsureTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/insure/task/InsureTaskTiming.java
@@ -6,6 +6,7 @@ import cn.timer.api.bean.insure.InsurePolicy;
 import cn.timer.api.bean.insure.InsureUser;
 import cn.timer.api.bean.yggl.YgglMainEmp;
 import cn.timer.api.config.exception.CustomException;
+import cn.timer.api.config.schedule.SchedulerCondition;
 import cn.timer.api.dao.insure.InsurePolicyMapper;
 import cn.timer.api.dao.insure.InsureUserMapper;
 import cn.timer.api.dao.yggl.YgglMainEmpMapper;
@@ -13,6 +14,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -29,7 +31,7 @@ import java.util.stream.Collectors;
 * @Date 2022/5/5 11:20
 */
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
+//@EnableScheduling   // 2.开启定时任务
 @Slf4j
 public class InsureTaskTiming {
    @Autowired
@@ -37,11 +39,12 @@ public class InsureTaskTiming {
    @Autowired
    private YgglMainEmpMapper ygglMainEmpMapper;
+    @Conditional(SchedulerCondition.class) //定时器开关
    @Scheduled(cron = "0/1 0 0 * * ?")//每月第一天
    @Transactional(rollbackFor = Exception.class)
    public void updateInsureStatusTask(){
        try {
+            log.info("保单定时器");
            Date now = DateUtil.date();
            /*获取正常的保单*/
            List<InsurePolicy> insurePolicyList = InsurePolicy.builder().build().selectList(new QueryWrapper<InsurePolicy>().lambda().eq(InsurePolicy::getStatus, "1").lt(InsurePolicy::getPolicyDateEnd, now));

--- a/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/ClockInController.java
@@ -96,7 +96,18 @@ public class ClockInController {
 	@Autowired
 	private KqglAssoRelationSummaryMapper kqglassorelationsummarymapper;
+	//考勤组绑定的打卡方式
+	@Autowired
+	private AttGroupBinPunchModeMapper attgroupbinpunchmodemapper;
+	//考勤机
+	@Autowired
+	private AttendanceMachineMapper attendancemachinemapper;
+	//考勤地址
+	@Autowired
+	private PunchCardAddressMapper punchcardaddressmapper;
+	//考勤WIFI
+	@Autowired
+	private PunchCardWiFiMapper punchcardwifimapper;
 	SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
 	SimpleDateFormat sdf2 = new SimpleDateFormat("EEE");
 	SimpleDateFormat df1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@@ -2881,18 +2892,7 @@ public class ClockInController {
 	 //***************************************************&**&******&***&****&***&**************************************************//
 	 //**************************************************&&&&&&*****&&&******&&&****************************************************//
 	 //*************************************************&******&****&********&******************************************************//
-	//考勤组绑定的打卡方式
-	@Autowired
-	private AttGroupBinPunchModeMapper attgroupbinpunchmodemapper;
-	//考勤机
-	@Autowired
-	private AttendanceMachineMapper attendancemachinemapper;
-	//考勤地址
-	@Autowired
-	private PunchCardAddressMapper punchcardaddressmapper;
-	//考勤WIFI
-	@Autowired
-	private PunchCardWiFiMapper punchcardwifimapper;
 	/**
 	 * 	获取考勤打卡数据------APP打卡
 	 * @throws ParseException 
@@ -2900,8 +2900,8 @@ public class ClockInController {
 	 @PostMapping(value = "/ClockData")
 	 @ApiOperation(value = "获取考勤打卡数据------APP打卡", httpMethod = "POST", notes = "接口发布说明")
 	 @ApiOperationSupport(order = 3)
-	 public Result<Object> getAttClockData(@CurrentUser UserBean userBean,@RequestBody AttConditions attconditions) throws ParseException {
+	 public Result<Object> getAttClockData(@CurrentUser UserBean userBean,@RequestBody AttConditions attconditions) {
+		 try{
 		 long nowdate = new Date().getTime();
 		 String str = null;
@@ -3944,6 +3944,10 @@ public class ClockInController {
 			 return ResultUtil.data(attdate_,"未加入考勤组");
 		 }
+		 }catch (Exception e){
+			 log.error("getAttClockData-erro:"+e.getStackTrace());
+			 return ResultUtil.error("获取考勤组异常");
+		 }
 	 }

--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/AttendanceTaskTiming.java
@@ -10,8 +10,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import cn.timer.api.config.schedule.SchedulerCondition;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -61,7 +63,7 @@ import cn.timer.api.utils.DateUtil;
 *	考勤报表汇总数据
 */
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
+//@EnableScheduling   // 2.开启定时任务
 @Slf4j
 public class AttendanceTaskTiming{
@@ -93,13 +95,14 @@ public class AttendanceTaskTiming{
 //	@Scheduled(cron = "0 */2 * * * ?")
 //	@Scheduled(cron = "0 25 11 * * ?")
+	@Conditional(SchedulerCondition.class) //定时器开关
 	@Scheduled(cron = "0 0 8,12,16,20 * * ?")//每天上午8、12点，下午16点，20点 执行
 	public void AttendanceTask() throws ParseException {
 		boolean implement = true;
 		//逻辑
 		if(implement) {
+			log.info("AttendanceTask考勤数据统计开始");
 			Calendar c = Calendar.getInstance();    
 			c.add(Calendar.MONTH, 0);
 			c.set(Calendar.DAY_OF_MONTH,1);//设置为1号,当前日期既为本月第一天 

--- a/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
+++ b/src/main/java/cn/timer/api/controller/kqgl/atttimer/LastMonthtimingExport.java
@@ -10,7 +10,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
+import cn.timer.api.config.schedule.SchedulerCondition;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -59,8 +62,9 @@ import cn.timer.api.utils.DateUtil;
 /**
 * @author Yl123 上月数据
 */
+@Slf4j
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
+//@Conditional(SchedulerCondition.class) //定时器开关
 public class LastMonthtimingExport {
 	@Autowired
 	private KqglMainKqzMapper kqglmainkqzmapper;
@@ -91,10 +95,11 @@ public class LastMonthtimingExport {
 	SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+	@Conditional(SchedulerCondition.class) //定时器开关
 //	@Scheduled(cron = "0 55 11 * * ?")
 	@Scheduled(cron = "0 0 4,20 * * ?")//每天上午4点，下午20点 执行
 	public void LastMonthtimingAttendanceTask() throws ParseException {
+		log.info("=======================================上月数据定时任务开始=======================================");
 		 //获取前月的最后一天
 		 Calendar cale = Calendar.getInstance(); 
 		 cale.set(Calendar.DAY_OF_MONTH,0);//设置为1号,当前日期既为本月第一天 

--- a/src/main/java/cn/timer/api/controller/xcgl/atttimer/SalaryTaskTiming.java
+++ b/src/main/java/cn/timer/api/controller/xcgl/atttimer/SalaryTaskTiming.java
@@ -13,9 +13,12 @@ import java.util.Locale;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.timer.api.bean.xcgl.XcglAssoXzdadx;
 import cn.timer.api.bean.xcgl.XcglAssoXzdaz;
+import cn.timer.api.config.schedule.SchedulerCondition;
 import cn.timer.api.dao.xcgl.XcglAssoXzdadxMapper;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -65,16 +68,18 @@ import javax.annotation.Resource;
 */
 //@Component
 //@Lazy
+@Slf4j
 @Configuration      //1.主要用于标记配置类，兼备Component的效果。
-@EnableScheduling   // 2.开启定时任务
+//@EnableScheduling   // 2.开启定时任务
 public class SalaryTaskTiming{
 	// 薪酬管理-定薪
 	@Resource
 	private XcglAssoXzdadxMapper xcglassoxzdadxmapper;
-	 //3.添加定时任务 每天凌晨1点执行一次
+	@Conditional(SchedulerCondition.class) //定时器开关
-	@Scheduled(cron = "0 0 1 * * ?")
+	@Scheduled(cron = "0 0 1 * * ?") //3.添加定时任务 每天凌晨1点执行一次
 	public void AttendanceTask() throws ParseException {
+		log.info("调薪记录生效定时任务");
 		// 使用状态(0：使用中；1：历史, 2: 未生效)
 		// 当前日期
 		String curDate = DateUtil.getStringFormat(new Date().getTime());

--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -101,7 +101,7 @@ spring:
     protocol: smtp
     host: smtp.163.com
     username: youlingrc123@163.com
-     password: RIMBNJJQNKYNVUWL
+     password: youlingrc189
     default-encoding: utf-8
     properties:
        mail:
@@ -164,8 +164,8 @@ pagehelper:
 #showSql
 logging:
  level:
-    root: ERROR
+    root: INFO
-    cn.timer.api.dao: error
+    cn.timer.api.dao: info
  pattern:
    console: '--%p--%m%n'

--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
 spring:
  profiles:
-     active: dev
+    active: pro
    #active: '@environment@'
+enable:
+  scheduling: false
--- a/src/main/resources/config/cron.setting
+++ b/src/main/resources/config/cron.setting
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -69,7 +69,7 @@
 			<!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志 -->
 			<!--<totalSizeCap>1GB</totalSizeCap> -->
 			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <maxFileSize>100MB</maxFileSize>
+                <maxFileSize>1024MB</maxFileSize>
            </timeBasedFileNamingAndTriggeringPolicy>
 		</rollingPolicy>
 		<!--日志输出编码格式化 -->