diff --git a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java index 8a4b355..6837456 100644 --- a/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java +++ b/cloud-task-server/src/main/java/com/muyu/task/server/service/impl/TaskInfoServiceImpl.java @@ -42,7 +42,7 @@ import static com.muyu.task.server.thread.OptimizedPrioritizedThreadPool.*; @Service public class TaskInfoServiceImpl extends ServiceImpl implements TaskInfoService { - private final Integer PAGE_SIZE = 5000; + private final Long PAGE_SIZE = 5000L; @Resource private TaskInfoMapper taskInfoMapper; @@ -247,18 +247,12 @@ public class TaskInfoServiceImpl extends ServiceImpl i String finalFieName = fieName; String finalJoint = joint; long count = data/PAGE_SIZE==0?1:data/PAGE_SIZE+1; - long pageSize; if (Weight.high.getValue().equals(weight)){ log.info("执行高级任务"); for (long i = 1; i <= count; i++) { long pageNum = (i - 1) * PAGE_SIZE; - pageSize = data - pageNum; - if (pageSize>=PAGE_SIZE){ - pageSize=PAGE_SIZE; - } - long finalPageSize = pageSize; submitHighPriorityTask(()->{ - getString(pageNum, finalFieName, finalJoint,basicId,newBasicId,tableId,map, finalPageSize,num); + getString(pageNum, finalFieName, finalJoint,basicId,newBasicId,tableId,map, PAGE_SIZE,num); }); } @@ -267,13 +261,9 @@ public class TaskInfoServiceImpl extends ServiceImpl i log.info("执行中级任务"); for (long i = 1; i <= count; i++) { long pageNum = (i - 1) * PAGE_SIZE; - pageSize = data - pageNum; - if (pageSize>=PAGE_SIZE){ - pageSize=PAGE_SIZE; - } - long finalPageSize1 = pageSize; + submitMediumPriorityTask(()->{ - getString(pageNum, finalFieName, finalJoint,basicId,newBasicId,tableId,map, finalPageSize1,num); + getString(pageNum, finalFieName, finalJoint,basicId,newBasicId,tableId,map, PAGE_SIZE,num); }); } } @@ -281,13 +271,8 @@ public class TaskInfoServiceImpl extends ServiceImpl i log.info("执行低级任务"); for (long i = 1; i <= count; i++) { long pageNum = (i - 1) * PAGE_SIZE; - pageSize = data - pageNum; - if (pageSize>=PAGE_SIZE){ - pageSize=PAGE_SIZE; - } - long finalPageSize2 = pageSize; submitLowPriorityTask(()->{ - getString(pageNum, finalFieName, finalJoint,basicId,newBasicId,tableId,map, finalPageSize2,num); + getString(pageNum, finalFieName, finalJoint,basicId,newBasicId,tableId,map, PAGE_SIZE,num); }); } } @@ -298,14 +283,9 @@ public class TaskInfoServiceImpl extends ServiceImpl i OptimizedPrioritizedThreadPool.remainingTasks.set(0); for (long i = 1; i <= count; i++) { long pageNum = (i - 1) * PAGE_SIZE; - pageSize = data - pageNum; - if (pageSize>=PAGE_SIZE){ - pageSize=PAGE_SIZE; - } - long finalPageSize3 = pageSize; submitEmergencyTask(()->{ try { - getString(pageNum, finalFieName, finalJoint, basicId, newBasicId, tableId, map, finalPageSize3, num); + getString(pageNum, finalFieName, finalJoint, basicId, newBasicId, tableId, map, PAGE_SIZE, num); } finally { // 减少剩余任务计数 if (OptimizedPrioritizedThreadPool.remainingTasks.decrementAndGet() == 0) {