修改同步速率

bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/TabOrderMonitorController.java

@@ -1,6 +1,5 @@
 package com.bms.web.controller.monitor;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -24,17 +23,14 @@ import com.bms.common.core.page.TableDataInfo;
 import com.bms.common.core.page.TableSupport;
 import com.bms.common.enums.BusinessType;
 import com.bms.common.utils.StringUtils;
-import com.bms.price.domain.PrcBillingTask;
 import com.bms.price.domain.PrcBillingTaskRetryTask;
 import com.bms.price.domain.vo.TabOrderMonitorQuery;
 import com.bms.price.domain.vo.TabOrderMonitorVo;
-import com.bms.price.enums.BillTaskSuccessStatus;
 import com.bms.price.oracle.TabOrderMonitorService;
 import com.bms.price.search.BillSearchPage;
 import com.bms.price.search.EsLogType;
 import com.bms.price.search.IBillSearchStore;
 import com.bms.price.search.TabOrderSyncEsLog;
-import com.bms.price.service.IPrcBillingTaskService;
 import com.bms.price.task.TabOrderSyncAsyncRunner;
 
 /**
@@ -47,9 +43,6 @@ public class TabOrderMonitorController extends BaseController
     @Autowired
     private TabOrderMonitorService tabOrderMonitorService;
 
-    @Autowired
-    private IPrcBillingTaskService billingTaskService;
-
     @Autowired
     private TabOrderSyncAsyncRunner tabOrderSyncAsyncRunner;
 
@@ -126,40 +119,9 @@ public class TabOrderMonitorController extends BaseController
         {
             return error("selected rows exceed 200");
         }
-        int ok = 0;
-        int fail = 0;
-        List<Map<String, Object>> details = new ArrayList<Map<String, Object>>();
-        for (TabOrderMonitorVo row : rows)
-        {
-            Map<String, Object> item = new HashMap<String, Object>();
-            item.put("orderId", row == null ? null : row.getOrderId());
-            item.put("transferOrderId", row == null ? null : row.getTransferOrderId());
-            try
-            {
-                PrcBillingTask task = billingTaskService.submitAndProcess(TabOrderSyncAsyncRunner.toSubmit(row));
-                item.put("successStatus", task == null ? null : task.getSuccessStatus());
-                item.put("errorMessage", task == null ? null : task.getErrorMessage());
-                if (task != null && BillTaskSuccessStatus.SUCCESS.getCode().equals(task.getSuccessStatus()))
-                {
-                    ok++;
-                }
-                else
-                {
-                    fail++;
-                }
-            }
-            catch (RuntimeException e)
-            {
-                fail++;
-                item.put("successStatus", "ERROR");
-                item.put("errorMessage", e.getMessage());
-            }
-            details.add(item);
-        }
-        Map<String, Object> data = new HashMap<String, Object>();
-        data.put("ok", Integer.valueOf(ok));
-        data.put("fail", Integer.valueOf(fail));
-        data.put("details", details);
+        Map<String, Object> data = tabOrderSyncAsyncRunner.syncRowsParallel(rows);
+        int ok = data.get("ok") instanceof Number ? ((Number) data.get("ok")).intValue() : 0;
+        int fail = data.get("fail") instanceof Number ? ((Number) data.get("fail")).intValue() : 0;
         String action = rows.size() == 1 ? "ONE" : "SELECTED";
         String bizId = firstOrderBizId(rows, action);
         String status = fail > 0 && ok == 0 ? "FAIL" : "SUCCESS";

bms-back/bms-admin/src/main/resources/application.yml

@@ -26,6 +26,8 @@ bms:
     # Max messages popped per tick; processed by consumer-threads pool
     consumer-batch-size: 32
     consumer-threads: 8
+    # Concurrent threads for monitor order-source sync (2~16)
+    order-source-sync-threads: 8
     oracle:
       # SLAVE datasource Oracle main-order table (schema.table allowed)
       order-table: WEISHI_USER.TAB_ORDER