diff --git a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java index 651e868..9e685bd 100644 --- a/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/service/impl/TaskServiceImpl.java @@ -8,6 +8,7 @@ import com.muyu.domain.*; import com.muyu.domain.req.TaskInfoReq; import com.muyu.mapper.TaskMapper; import com.muyu.service.*; +import com.muyu.task.PriorityThreadPool; import com.muyu.task.feign.DataValueClient; import com.muyu.task.feign.RuleFeign; import jakarta.validation.constraints.NotNull; @@ -197,8 +198,16 @@ public class TaskServiceImpl extends ServiceImpl implement log.info("执行查询语句为{}", limitSelect); if(taskInfo.getWeigh() == 4){ log.info("执行紧急任务"); + PriorityThreadPool.activeEmergencyTasks.set(0); + PriorityThreadPool.remainingTasks.set(0); executeUrgently(() -> { - selectAndAdd(finalDatabaseId, basicId, limitSelect, tableId,newAndOldMap, finalFirstArray,two); + try { + selectAndAdd(finalDatabaseId, basicId, limitSelect, tableId,newAndOldMap, finalFirstArray,two); + } finally { + if (PriorityThreadPool.remainingTasks.decrementAndGet() == 0) { + System.out.println("All emergency tasks have completed."); + } + } }); } diff --git a/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java b/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java index 774d872..746dbc3 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java +++ b/cloud-task-server/src/main/java/com/muyu/task/PriorityThreadPool.java @@ -221,7 +221,7 @@ public class PriorityThreadPool { // 创建固定大小的线程池 executor = new ThreadPoolExecutor( totalThreads, totalThreads, - 80L, TimeUnit.SECONDS, + 40L, TimeUnit.SECONDS, new LinkedBlockingQueue() ); highPrioritySemaphore = new Semaphore(defaultHighThreads); diff --git a/cloud-task-server/src/main/resources/bootstrap.yml b/cloud-task-server/src/main/resources/bootstrap.yml index d6c3b42..6a1486b 100644 --- a/cloud-task-server/src/main/resources/bootstrap.yml +++ b/cloud-task-server/src/main/resources/bootstrap.yml @@ -22,12 +22,12 @@ spring: active: dev cloud: - openfeign: - client: - config: - default: - connectTimeout: 5000 - readTimeout: 5000 +# openfeign: +# client: +# config: +# default: +# connectTimeout: 5000 +# readTimeout: 5000 nacos: discovery: # 服务注册地址