Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java

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();

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) {

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();

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();

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();

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();

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();

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();

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();

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();