From 454617807941b7f155fe7b1f8e1e1fb54197bdf4 Mon Sep 17 00:00:00 2001 From: qiushengjie Date: Sun, 17 Sep 2023 17:08:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=90=AC=E5=AE=B6=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ms-biz/src/main/java/com/ms/api/common/TaskBaseService.java | 1 + .../com/ms/api/task/CheckAuditStatusTimeoutTaskService.java | 4 ++-- .../java/com/ms/api/task/CheckMaterialBizWaitTaskService.java | 2 +- .../com/ms/api/task/MoveMaterialAuditProcessTaskService.java | 4 ++-- .../com/ms/api/task/MoveMaterialBizProcessTaskService.java | 2 +- .../java/com/ms/api/task/MovePublishBufferTaskService.java | 2 +- .../src/main/java/com/ms/api/task/MoveUnlockTaskService.java | 2 +- .../com/ms/api/task/ProcessMovePublishToPicTaskService.java | 2 +- .../com/ms/api/task/ProcessProductPublishTaskService.java | 2 +- 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ms-biz/src/main/java/com/ms/api/common/TaskBaseService.java b/ms-biz/src/main/java/com/ms/api/common/TaskBaseService.java index 1d0b6ad4..f56b32e1 100644 --- a/ms-biz/src/main/java/com/ms/api/common/TaskBaseService.java +++ b/ms-biz/src/main/java/com/ms/api/common/TaskBaseService.java @@ -39,6 +39,7 @@ public abstract class TaskBaseService implements TaskHandler { } public void runTask() { + // // while (true) { try { setLogId(); diff --git a/ms-biz/src/main/java/com/ms/api/task/CheckAuditStatusTimeoutTaskService.java b/ms-biz/src/main/java/com/ms/api/task/CheckAuditStatusTimeoutTaskService.java index 54bea704..76534e65 100644 --- a/ms-biz/src/main/java/com/ms/api/task/CheckAuditStatusTimeoutTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/CheckAuditStatusTimeoutTaskService.java @@ -45,7 +45,7 @@ public class CheckAuditStatusTimeoutTaskService extends TaskBaseService { * 同时开启任务处理数量 */ public int getCorePoolSiz() { - return 1; + return 3; } @Override @@ -76,7 +76,7 @@ public class CheckAuditStatusTimeoutTaskService extends TaskBaseService { } @Async("checkAuditStatusTimeoutTaskPool") - @Scheduled(fixedRate = 2000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/CheckMaterialBizWaitTaskService.java b/ms-biz/src/main/java/com/ms/api/task/CheckMaterialBizWaitTaskService.java index a651d3fc..004174cb 100644 --- a/ms-biz/src/main/java/com/ms/api/task/CheckMaterialBizWaitTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/CheckMaterialBizWaitTaskService.java @@ -69,7 +69,7 @@ public class CheckMaterialBizWaitTaskService extends TaskBaseService { } @Async("checkBizMaterialSuccessTaskPool") - @Scheduled(fixedRate = 2000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/MoveMaterialAuditProcessTaskService.java b/ms-biz/src/main/java/com/ms/api/task/MoveMaterialAuditProcessTaskService.java index a70043fd..2ab3def7 100644 --- a/ms-biz/src/main/java/com/ms/api/task/MoveMaterialAuditProcessTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/MoveMaterialAuditProcessTaskService.java @@ -63,7 +63,7 @@ public class MoveMaterialAuditProcessTaskService extends TaskBaseService { */ @Override public int getCorePoolSiz() { - return 30; + return 15; } @Override @@ -94,7 +94,7 @@ public class MoveMaterialAuditProcessTaskService extends TaskBaseService { } @Async("moveMaterialAuditProcessPool") - @Scheduled(fixedRate = 1000) + @Scheduled(fixedRate = 500) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/MoveMaterialBizProcessTaskService.java b/ms-biz/src/main/java/com/ms/api/task/MoveMaterialBizProcessTaskService.java index 881b8a2e..610bc307 100644 --- a/ms-biz/src/main/java/com/ms/api/task/MoveMaterialBizProcessTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/MoveMaterialBizProcessTaskService.java @@ -87,7 +87,7 @@ public class MoveMaterialBizProcessTaskService extends TaskBaseService { } @Async("moveMaterialBizProcessTaskPool") - @Scheduled(fixedRate = 2000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/MovePublishBufferTaskService.java b/ms-biz/src/main/java/com/ms/api/task/MovePublishBufferTaskService.java index 4a65a555..be0d7630 100644 --- a/ms-biz/src/main/java/com/ms/api/task/MovePublishBufferTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/MovePublishBufferTaskService.java @@ -90,7 +90,7 @@ public class MovePublishBufferTaskService extends TaskBaseService { } @Async("movePublishBufferTaskPool") - @Scheduled(fixedRate = 2000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/MoveUnlockTaskService.java b/ms-biz/src/main/java/com/ms/api/task/MoveUnlockTaskService.java index 4d9b4220..1bef82ec 100644 --- a/ms-biz/src/main/java/com/ms/api/task/MoveUnlockTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/MoveUnlockTaskService.java @@ -57,7 +57,7 @@ public class MoveUnlockTaskService extends TaskBaseService { } @Async("moveUnlockTaskPool") - @Scheduled(fixedRate = 10000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/ProcessMovePublishToPicTaskService.java b/ms-biz/src/main/java/com/ms/api/task/ProcessMovePublishToPicTaskService.java index 8903a3e9..c53d16df 100644 --- a/ms-biz/src/main/java/com/ms/api/task/ProcessMovePublishToPicTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/ProcessMovePublishToPicTaskService.java @@ -149,7 +149,7 @@ public class ProcessMovePublishToPicTaskService extends TaskBaseService { } @Async("processMovePublishToPicTaskPool") - @Scheduled(fixedRate = 2000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); diff --git a/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java b/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java index 03f4247b..2ef7fd75 100644 --- a/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java +++ b/ms-biz/src/main/java/com/ms/api/task/ProcessProductPublishTaskService.java @@ -220,7 +220,7 @@ public class ProcessProductPublishTaskService extends TaskBaseService { } @Async("processProductPublishTaskPool") - @Scheduled(fixedRate = 2000) + @Scheduled(fixedRate = 1000) @Override public void runTask() { super.runTask(); From b466698f56cf2834c1191a6f902100dd85028042 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cxxxxxxx=E8=AF=A6?= <286460656@qq.com> Date: Sun, 17 Sep 2023 17:10:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8E=86=E5=8F=B2bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ms/api/spi/move/BatchDeleteTaskDetailService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ms-biz/src/main/java/com/ms/api/spi/move/BatchDeleteTaskDetailService.java b/ms-biz/src/main/java/com/ms/api/spi/move/BatchDeleteTaskDetailService.java index a433d5b8..43d2886e 100644 --- a/ms-biz/src/main/java/com/ms/api/spi/move/BatchDeleteTaskDetailService.java +++ b/ms-biz/src/main/java/com/ms/api/spi/move/BatchDeleteTaskDetailService.java @@ -74,7 +74,7 @@ public class BatchDeleteTaskDetailService extends SPIBaseService implements Exte for (int i = 0; i < moveCollectTaskDetailList.size(); i++) { MoveCollectTaskDetail taskDetail = moveCollectTaskDetailList.get(i); Long detailId = taskDetail.getMoveCollectTaskDetailId(); - if (deleteProduct > 0 && Objects.isNull(moveProductLogMap.get(detailId))) { + if (deleteProduct > 0 && !Objects.isNull(moveProductLogMap.get(detailId))) { Long productId = moveProductLogMap.get(detailId).getProductId(); boolean needDeleteToDd = true; if (deleteOnSaleProduct == 0) {