From cf17fb5138ba67f1ef859496a7080eaaea418237 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Sat, 20 Jan 2024 15:27:14 +0800
Subject: [PATCH] 定时器调整

---
 src/main/java/org/springblade/scheduled/ScheduledTasks.java |   65 +++++++++++++++-----------------
 1 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/src/main/java/org/springblade/scheduled/ScheduledTasks.java b/src/main/java/org/springblade/scheduled/ScheduledTasks.java
index 6eb4727..2e640a7 100644
--- a/src/main/java/org/springblade/scheduled/ScheduledTasks.java
+++ b/src/main/java/org/springblade/scheduled/ScheduledTasks.java
@@ -32,12 +32,11 @@
 	/**
 	 * 考核任务根据开始时间修改状态
 	 */
-	@Scheduled(fixedRate = 1000*60*10)
+	@Scheduled(fixedRate = 1000*60*5)
 	public void assessmentDoSomething() {
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("is_assessment_ok", -1);
-		queryWrapper.ge("start_time", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00")));
-		queryWrapper.le("start_time", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd 23:59:59")));
+		queryWrapper.le("start_time", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 		List<AssessmentTaskEntity> assessmentTaskEntityList = assessmentTaskService.list(queryWrapper);
 		if (assessmentTaskEntityList.size() > 0) {
 			List<AssessmentTaskEntity> editList = assessmentTaskEntityList.stream()
@@ -65,7 +64,7 @@
 	 * 第六个字段(星期):?(无指定)
 	 */
 //	@Scheduled(cron = "0 0 0 * * ?") // 每天的凌晨0点0分0秒执行任务
-	@Scheduled(fixedRate = 1000*60*10)
+	@Scheduled(fixedRate = 1000*60*5)
 	public void doSomething() {
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("is_assessment_ok", 0);
@@ -87,10 +86,34 @@
 	}
 
 	/**
+	 * 评优任务根据开始时间修改状态
+	 */
+	@Scheduled(fixedRate = 1000*60*5)
+	public void evaluateStartDoSomething() {
+		QueryWrapper queryWrapper = new QueryWrapper();
+		queryWrapper.eq("candidate_state", 0);
+		queryWrapper.le("candidate_cutoff_time_start", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+		List<EvaluateTaskEntity> entities = evaluateTaskService.list(queryWrapper);
+		if (entities.size() > 0) {
+			List<EvaluateTaskEntity> editList = entities.stream()
+				.map(ate -> {
+					ate.setCandidateState(1);  // 给每个对象的属性设置新值
+					return ate;  // 返回修改后的对象
+				})
+				.collect(Collectors.toList());  // 收集流中的对象到一个新的列表中
+
+			evaluateTaskService.updateBatchById(editList);
+
+			log.info("评优任务根据开始时间修改状态,修改数量为:" + entities.size());
+		} else
+			log.info("评优任务根据开始时间修改状态,修改数量为:0");
+	}
+
+	/**
 	 * 评优任务根据结束时间修改状态
 	 */
 //	@Scheduled(cron = "0 10 0 * * ?") // 每天的凌晨0点10分0秒执行任务
-	@Scheduled(fixedRate = 1000*60*10)
+	@Scheduled(fixedRate = 1000*60*5)
 	public void evaluateDoSomething() {
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("candidate_state", 1);
@@ -112,39 +135,13 @@
 	}
 
 	/**
-	 * 评优任务根据开始时间修改状态
-	 */
-	@Scheduled(fixedRate = 1000*60*10)
-	public void evaluateStartDoSomething() {
-		QueryWrapper queryWrapper = new QueryWrapper();
-		queryWrapper.eq("candidate_state", 0);
-		queryWrapper.ge("candidate_cutoff_time_start", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00")));
-		queryWrapper.le("candidate_cutoff_time_start", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd 23:59:59")));
-		List<EvaluateTaskEntity> entities = evaluateTaskService.list(queryWrapper);
-		if (entities.size() > 0) {
-			List<EvaluateTaskEntity> editList = entities.stream()
-				.map(ate -> {
-					ate.setCandidateState(1);  // 给每个对象的属性设置新值
-					return ate;  // 返回修改后的对象
-				})
-				.collect(Collectors.toList());  // 收集流中的对象到一个新的列表中
-
-			evaluateTaskService.updateBatchById(editList);
-
-			log.info("评优任务根据开始时间修改状态,修改数量为:" + entities.size());
-		} else
-			log.info("评优任务根据开始时间修改状态,修改数量为:0");
-	}
-
-	/**
 	 * 最终评优任务根据开始时间修改状态
 	 */
-	@Scheduled(fixedRate = 1000*60*10)
+	@Scheduled(fixedRate = 1000*60*5)
 	public void evaluateFinallyStartDoSomething() {
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("evaluate_state", 0);
-		queryWrapper.ge("evaluate_cutoff_time_start", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00")));
-		queryWrapper.le("evaluate_cutoff_time_start", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd 23:59:59")));
+		queryWrapper.le("evaluate_cutoff_time_start", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
 		List<EvaluateTaskEntity> entities = evaluateTaskService.list(queryWrapper);
 		if (entities.size() > 0) {
 			List<EvaluateTaskEntity> editList = entities.stream()
@@ -164,7 +161,7 @@
 	/**
 	 * 最终评优任务根据结束时间修改状态
 	 */
-	@Scheduled(fixedRate = 1000*60*10)
+	@Scheduled(fixedRate = 1000*60*5)
 	public void evaluateFinallyEndDoSomething() {
 		QueryWrapper queryWrapper = new QueryWrapper();
 		queryWrapper.eq("evaluate_state", 1);

--
Gitblit v1.9.3