diff --git a/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/TabOrderMonitorController.java b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/TabOrderMonitorController.java index 115b6019..af1c1752 100644 --- a/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/TabOrderMonitorController.java +++ b/bms-back/bms-admin/src/main/java/com/bms/web/controller/monitor/TabOrderMonitorController.java @@ -1,24 +1,44 @@ package com.bms.web.controller.monitor; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; +import java.util.Map; +import java.util.UUID; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import com.bms.common.annotation.Log; import com.bms.common.constant.HttpStatus; import com.bms.common.core.controller.BaseController; +import com.bms.common.core.domain.AjaxResult; import com.bms.common.core.page.PageDomain; 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; /** - * 订单数据源：查询上游 Oracle TAB_ORDER。 + * 订单数据源：查询上游 Oracle TAB_ORDER，并分批同步计费。 */ @RestController @RequestMapping("/monitor/orderSource") @@ -27,6 +47,15 @@ public class TabOrderMonitorController extends BaseController @Autowired private TabOrderMonitorService tabOrderMonitorService; + @Autowired + private IPrcBillingTaskService billingTaskService; + + @Autowired + private TabOrderSyncAsyncRunner tabOrderSyncAsyncRunner; + + @Autowired + private IBillSearchStore billSearchStore; + @PreAuthorize("@ss.hasPermi('monitor:orderSource:list')") @GetMapping("/list") public TableDataInfo list(TabOrderMonitorQuery query) @@ -52,6 +81,142 @@ public class TabOrderMonitorController extends BaseController return rsp; } + @PreAuthorize("@ss.hasPermi('monitor:orderSource:sync')") + @Log(title = "order source sync filter", businessType = BusinessType.UPDATE) + @PostMapping("/syncByFilter") + public AjaxResult syncByFilter(@RequestBody TabOrderMonitorQuery query) + { + if (!hasRequiredFilters(query)) + { + return error("customerCodes and pickup time required"); + } + tabOrderMonitorService.count(query); + String asyncTaskId = UUID.randomUUID().toString().replace("-", ""); + tabOrderSyncAsyncRunner.put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_PENDING, 0, "queued", + 0, 0, 0, 0, null); + tabOrderSyncAsyncRunner.run(asyncTaskId, query, TabOrderSyncAsyncRunner.clampBatch(query.getBatchSize())); + Map data = new HashMap(); + data.put("asyncTaskId", asyncTaskId); + TabOrderSyncEsLog.save(billSearchStore, asyncTaskId, "FILTER", query, data, "SUCCESS", null); + return success(data); + } + + @PreAuthorize("@ss.hasPermi('monitor:orderSource:sync') or @ss.hasPermi('monitor:orderSource:list')") + @GetMapping("/syncTask/{asyncTaskId}") + public AjaxResult syncTaskProgress(@PathVariable("asyncTaskId") String asyncTaskId) + { + PrcBillingTaskRetryTask task = tabOrderSyncAsyncRunner.get(asyncTaskId); + if (task == null) + { + return error("sync task not found or expired"); + } + return success(task); + } + + @PreAuthorize("@ss.hasPermi('monitor:orderSource:sync')") + @Log(title = "order source sync selected", businessType = BusinessType.UPDATE) + @PostMapping("/sync") + public AjaxResult syncSelected(@RequestBody List rows) + { + if (rows == null || rows.isEmpty()) + { + return error("rows required"); + } + if (rows.size() > 200) + { + return error("selected rows exceed 200"); + } + int ok = 0; + int fail = 0; + List> details = new ArrayList>(); + for (TabOrderMonitorVo row : rows) + { + Map item = new HashMap(); + 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 data = new HashMap(); + data.put("ok", Integer.valueOf(ok)); + data.put("fail", Integer.valueOf(fail)); + data.put("details", details); + String action = rows.size() == 1 ? "ONE" : "SELECTED"; + String bizId = firstOrderBizId(rows, action); + String status = fail > 0 && ok == 0 ? "FAIL" : "SUCCESS"; + String err = fail > 0 ? ("fail=" + fail) : null; + TabOrderSyncEsLog.save(billSearchStore, bizId, action, rows, data, status, err); + return success(data); + } + + @PreAuthorize("@ss.hasPermi('monitor:orderSource:list')") + @GetMapping("/syncLog/list") + public TableDataInfo syncLogList( + @RequestParam(value = "bizId", required = false) String bizId, + @RequestParam(value = "status", required = false) String status) + { + PageDomain pageDomain = TableSupport.buildPageRequest(); + int pageNum = pageDomain.getPageNum() == null ? 1 : pageDomain.getPageNum().intValue(); + int pageSize = pageDomain.getPageSize() == null ? 10 : pageDomain.getPageSize().intValue(); + BillSearchPage page = billSearchStore.search(EsLogType.ORDER_SOURCE_SYNC, bizId, status, pageNum, pageSize); + TableDataInfo rsp = new TableDataInfo(); + rsp.setCode(HttpStatus.SUCCESS); + rsp.setMsg("\u67e5\u8be2\u6210\u529f"); + rsp.setRows(page.getRows()); + rsp.setTotal(page.getTotal()); + return rsp; + } + + @PreAuthorize("@ss.hasPermi('monitor:orderSource:list')") + @GetMapping("/syncLog/{docId}") + public AjaxResult syncLogInfo(@PathVariable("docId") String docId) + { + return success(billSearchStore.getByDocId(docId)); + } + + private static String firstOrderBizId(List rows, String action) + { + String prefix = action == null ? "SYNC" : action; + if (rows != null) + { + for (TabOrderMonitorVo row : rows) + { + if (row == null) + { + continue; + } + if (StringUtils.isNotEmpty(row.getOrderId())) + { + return prefix + "_" + row.getOrderId(); + } + if (StringUtils.isNotEmpty(row.getTransferOrderId())) + { + return prefix + "_" + row.getTransferOrderId(); + } + } + } + return prefix + "_" + System.currentTimeMillis(); + } + private static boolean hasRequiredFilters(TabOrderMonitorQuery query) { if (query == null) diff --git a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java index 70eedd06..75fce353 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/domain/vo/TabOrderMonitorQuery.java @@ -25,4 +25,6 @@ public class TabOrderMonitorQuery implements Serializable private String orgOrderId; /** 转单号 TRANSFER_ORDER_ID */ private String transferOrderId; + /** 分批同步计费每批条数 */ + private Integer batchSize; } diff --git a/bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java b/bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java index e3752496..b5a02e7f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/EsLogType.java @@ -12,6 +12,8 @@ public final class EsLogType public static final String CREDIT = "CREDIT"; /** Clear order credit arrears after balance in */ public static final String ARREARS = "ARREARS"; + /** Monitor: sync billing from TAB_ORDER */ + public static final String ORDER_SOURCE_SYNC = "ORDER_SOURCE_SYNC"; private EsLogType() { diff --git a/bms-back/bms-system/src/main/java/com/bms/price/search/TabOrderSyncEsLog.java b/bms-back/bms-system/src/main/java/com/bms/price/search/TabOrderSyncEsLog.java new file mode 100644 index 00000000..ddbf6ed9 --- /dev/null +++ b/bms-back/bms-system/src/main/java/com/bms/price/search/TabOrderSyncEsLog.java @@ -0,0 +1,45 @@ +package com.bms.price.search; + +import java.util.LinkedHashMap; +import java.util.Map; +import com.alibaba.fastjson2.JSON; +import com.bms.common.utils.SecurityUtils; +import com.bms.common.utils.StringUtils; + +/** Write order-source sync actions to ES. */ +public final class TabOrderSyncEsLog +{ + private TabOrderSyncEsLog() + { + } + + public static String operator() + { + try + { + String name = SecurityUtils.getUsername(); + return StringUtils.isEmpty(name) ? "unknown" : name; + } + catch (Exception e) + { + return "unknown"; + } + } + + public static void save(IBillSearchStore store, String bizId, String action, Object request, Object response, + String status, String errorMessage) + { + if (store == null || StringUtils.isEmpty(bizId)) + { + return; + } + Map req = new LinkedHashMap(); + req.put("action", action); + req.put("operator", operator()); + req.put("payload", request); + String reqJson = JSON.toJSONString(req); + String respJson = response == null ? null : JSON.toJSONString(response); + String st = StringUtils.isEmpty(status) ? EsBizLogSupport.STATUS_SUCCESS : status; + store.save(EsLogType.ORDER_SOURCE_SYNC, bizId, reqJson, respJson, st, errorMessage); + } +} diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java index 529cf19e..bb8d124f 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/IPrcBillingTaskService.java @@ -11,6 +11,9 @@ public interface IPrcBillingTaskService /** Warehouse inbound: create task + publish MQ. */ PrcBillingTask submitInbound(BillingTaskSubmitRequest request); + /** Monitor sync: create task then process immediately (no extra MQ). */ + PrcBillingTask submitAndProcess(BillingTaskSubmitRequest request); + /** MQ consumer entry: Oracle query -> bill -> writeback success status. */ void processTask(Long taskId); diff --git a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java index 7cf85c6b..8b4dc46c 100644 --- a/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java +++ b/bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcBillingTaskServiceImpl.java @@ -106,6 +106,52 @@ public class PrcBillingTaskServiceImpl implements IPrcBillingTaskService return task; } + @Override + public PrcBillingTask submitAndProcess(BillingTaskSubmitRequest request) + { + PrcBillingTask task = createWaitingTask(request, "monitor"); + processTask(task.getTaskId()); + return billingTaskMapper.selectPrcBillingTaskById(task.getTaskId()); + } + + private PrcBillingTask createWaitingTask(BillingTaskSubmitRequest request, String createBy) + { + if (request == null) + { + throw new ServiceException("billing task request required"); + } + String transferNo = trim(request.getTransferNo()); + String trackingNo = trim(request.getTrackingNo()); + String orderNo = trim(request.getOrderNo()); + Date billTime = request.getBillTime(); + if (StringUtils.isEmpty(transferNo) && StringUtils.isEmpty(trackingNo) && StringUtils.isEmpty(orderNo)) + { + throw new ServiceException("transferNo or trackingNo or orderNo required"); + } + if (billTime == null) + { + throw new ServiceException("billTime required (billing time from mobile)"); + } + BillTaskType type = BillTaskType.fromCode(request.getBillType()); + if (type == null) + { + type = resolveAutoType(transferNo, trackingNo, orderNo); + } + PrcBillingTask task = new PrcBillingTask(); + task.setTransferNo(transferNo); + task.setTrackingNo(trackingNo); + task.setOrderNo(orderNo); + task.setCustomerCode(trim(request.getCustomerCode())); + task.setBillTime(billTime); + task.setBillType(type.getCode()); + task.setSuccessStatus(BillTaskSuccessStatus.WAITING.getCode()); + task.setCreateBy(StringUtils.isEmpty(createBy) ? "tms" : createBy); + billingTaskMapper.insertPrcBillingTask(task); + log.info("billing task created taskId={} type={} billTime={} customerCode={} transferNo={} trackingNo={} orderNo={}", + task.getTaskId(), task.getBillType(), billTime, task.getCustomerCode(), transferNo, trackingNo, orderNo); + return task; + } + private static final int BILL_DB_RETRY_MAX = 3; private static final long BILL_DB_RETRY_BASE_MS = 80L; diff --git a/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java b/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java new file mode 100644 index 00000000..136c3d59 --- /dev/null +++ b/bms-back/bms-system/src/main/java/com/bms/price/task/TabOrderSyncAsyncRunner.java @@ -0,0 +1,185 @@ +package com.bms.price.task; + +import java.util.List; +import java.util.concurrent.TimeUnit; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import com.bms.common.core.redis.RedisCache; +import com.bms.common.utils.StringUtils; +import com.bms.price.domain.PrcBillingTask; +import com.bms.price.domain.PrcBillingTaskRetryTask; +import com.bms.price.domain.vo.BillingTaskSubmitRequest; +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.IBillSearchStore; +import com.bms.price.search.TabOrderSyncEsLog; +import com.bms.price.service.IPrcBillingTaskService; + +/** + * Page Oracle TAB_ORDER then submitAndProcess each row. + */ +@Component +public class TabOrderSyncAsyncRunner +{ + private static final Logger log = LoggerFactory.getLogger(TabOrderSyncAsyncRunner.class); + + public static final String CACHE_KEY_PREFIX = "billing:orderSource:sync:"; + public static final int TTL_MINUTES = 120; + public static final int DEFAULT_BATCH = 50; + public static final int MIN_BATCH = 20; + public static final int MAX_BATCH = 200; + + @Autowired + private TabOrderMonitorService tabOrderMonitorService; + + @Autowired + @Lazy + private IPrcBillingTaskService billingTaskService; + + @Autowired + private RedisCache redisCache; + + @Autowired + private IBillSearchStore billSearchStore; + + @Async("threadPoolTaskExecutor") + public void run(String asyncTaskId, TabOrderMonitorQuery query, int batchSize) + { + int batch = clampBatch(batchSize); + try + { + long totalLong = tabOrderMonitorService.count(query); + int total = totalLong > Integer.MAX_VALUE ? Integer.MAX_VALUE : (int) totalLong; + put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_RUNNING, 0, "starting", total, 0, 0, 0, null); + if (total <= 0) + { + put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_SUCCESS, 100, "no tasks", 0, 0, 0, 0, null); + return; + } + int processed = 0; + int ok = 0; + int fail = 0; + int pageNum = 1; + while (true) + { + List rows = tabOrderMonitorService.selectPage(query, pageNum, batch); + if (rows == null || rows.isEmpty()) + { + break; + } + put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_RUNNING, + Math.min(99, (int) ((processed * 100L) / Math.max(1, total))), + "processing " + processed + "/" + total, total, processed, ok, fail, null); + for (TabOrderMonitorVo row : rows) + { + try + { + PrcBillingTask task = billingTaskService.submitAndProcess(toSubmit(row)); + if (task != null && BillTaskSuccessStatus.SUCCESS.getCode().equals(task.getSuccessStatus())) + { + ok++; + } + else + { + fail++; + } + } + catch (RuntimeException e) + { + fail++; + log.warn("orderSource sync failed orderId={} transfer={} msg={}", + row == null ? null : row.getOrderId(), + row == null ? null : row.getTransferOrderId(), + e.getMessage()); + } + processed++; + int percent = Math.min(99, (int) ((processed * 100L) / Math.max(1, total))); + put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_RUNNING, percent, + "processing " + processed + "/" + total, total, processed, ok, fail, null); + } + if (rows.size() < batch) + { + break; + } + pageNum++; + } + put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_SUCCESS, 100, + "done ok=" + ok + " fail=" + fail, total, processed, ok, fail, null); + java.util.Map resp = new java.util.LinkedHashMap(); + resp.put("asyncTaskId", asyncTaskId); + resp.put("total", Integer.valueOf(total)); + resp.put("processed", Integer.valueOf(processed)); + resp.put("ok", Integer.valueOf(ok)); + resp.put("fail", Integer.valueOf(fail)); + TabOrderSyncEsLog.save(billSearchStore, asyncTaskId, "FILTER_DONE", query, resp, "SUCCESS", null); + log.info("orderSource sync done asyncTaskId={} total={} ok={} fail={}", asyncTaskId, total, ok, fail); + } + catch (Exception e) + { + log.error("orderSource sync failed asyncTaskId={}", asyncTaskId, e); + String msg = e.getMessage(); + if (StringUtils.isEmpty(msg)) + { + msg = e.getClass().getSimpleName(); + } + put(asyncTaskId, PrcBillingTaskRetryTask.STATUS_FAIL, 100, "failed", 0, 0, 0, 0, msg); + TabOrderSyncEsLog.save(billSearchStore, asyncTaskId, "FILTER_DONE", query, null, "FAIL", msg); + } + } + + public void put(String taskId, String status, int percent, String message, + int total, int processed, int ok, int fail, String error) + { + PrcBillingTaskRetryTask task = new PrcBillingTaskRetryTask(); + task.setTaskId(taskId); + task.setStatus(status); + task.setPercent(percent); + task.setMessage(message); + task.setTotal(total); + task.setProcessed(processed); + task.setOk(ok); + task.setFail(fail); + task.setError(error); + redisCache.setCacheObject(CACHE_KEY_PREFIX + taskId, task, TTL_MINUTES, TimeUnit.MINUTES); + } + + public PrcBillingTaskRetryTask get(String taskId) + { + return redisCache.getCacheObject(CACHE_KEY_PREFIX + taskId); + } + + public static int clampBatch(Integer batchSize) + { + int n = batchSize == null ? DEFAULT_BATCH : batchSize.intValue(); + if (n < MIN_BATCH) + { + return MIN_BATCH; + } + if (n > MAX_BATCH) + { + return MAX_BATCH; + } + return n; + } + + public static BillingTaskSubmitRequest toSubmit(TabOrderMonitorVo row) + { + if (row == null) + { + throw new com.bms.common.exception.ServiceException("order row required"); + } + BillingTaskSubmitRequest req = new BillingTaskSubmitRequest(); + req.setTransferNo(row.getTransferOrderId()); + req.setTrackingNo(row.getOrgOrderId()); + req.setOrderNo(row.getOrderId()); + req.setCustomerCode(row.getCustomerCode()); + req.setBillTime(row.getPickupDate()); + return req; + } +} diff --git a/bms-back/sql/monitor/order_source_menu.sql b/bms-back/sql/monitor/order_source_menu.sql index 53405db2..86b3d795 100644 --- a/bms-back/sql/monitor/order_source_menu.sql +++ b/bms-back/sql/monitor/order_source_menu.sql @@ -9,6 +9,10 @@ INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, SELECT 2326, N'查询', 2325, 1, '', NULL, 1, 0, 'F', '0', '0', 'monitor:orderSource:list', '#', 'admin', sysdate() FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2326); +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark) +SELECT 2327, N'同步计费', 2325, 2, '', NULL, 1, 0, 'F', '0', '0', 'monitor:orderSource:sync', '#', 'admin', sysdate(), N'按筛选分页同步上游订单计费' +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2327 OR perms = 'monitor:orderSource:sync'); + INSERT INTO sys_role_menu (role_id, menu_id) -SELECT 1, m.menu_id FROM (SELECT 2325 AS menu_id UNION SELECT 2326) m +SELECT 1, m.menu_id FROM (SELECT 2325 AS menu_id UNION SELECT 2326 UNION SELECT 2327) m WHERE NOT EXISTS (SELECT 1 FROM sys_role_menu rm WHERE rm.role_id = 1 AND rm.menu_id = m.menu_id); diff --git a/bms-back/sql/monitor/order_source_sync_menu.sql b/bms-back/sql/monitor/order_source_sync_menu.sql new file mode 100644 index 00000000..6c0d3372 --- /dev/null +++ b/bms-back/sql/monitor/order_source_sync_menu.sql @@ -0,0 +1,10 @@ +-- 订单数据源 同步计费按钮 +SET NAMES utf8mb4; + +INSERT INTO sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, remark) +SELECT 2327, N'同步计费', 2325, 2, '', NULL, 1, 0, 'F', '0', '0', 'monitor:orderSource:sync', '#', 'admin', sysdate(), N'按筛选分页同步上游订单计费' +FROM DUAL WHERE NOT EXISTS (SELECT 1 FROM sys_menu WHERE menu_id = 2327 OR perms = 'monitor:orderSource:sync'); + +INSERT INTO sys_role_menu (role_id, menu_id) +SELECT 1, 2327 FROM DUAL +WHERE NOT EXISTS (SELECT 1 FROM sys_role_menu rm WHERE rm.role_id = 1 AND rm.menu_id = 2327); diff --git a/bms-front/src/api/monitor/orderSource.js b/bms-front/src/api/monitor/orderSource.js index 06c3f9b8..0f826761 100644 --- a/bms-front/src/api/monitor/orderSource.js +++ b/bms-front/src/api/monitor/orderSource.js @@ -8,3 +8,43 @@ export function listOrderSource(query) { timeout: 60000 }) } + +export function syncOrderSourceByFilter(data) { + return request({ + url: '/monitor/orderSource/syncByFilter', + method: 'post', + data, + timeout: 60000 + }) +} + +export function getOrderSourceSyncProgress(asyncTaskId) { + return request({ + url: '/monitor/orderSource/syncTask/' + asyncTaskId, + method: 'get' + }) +} + +export function syncOrderSourceSelected(rows) { + return request({ + url: '/monitor/orderSource/sync', + method: 'post', + data: rows, + timeout: 180000 + }) +} + +export function listOrderSourceSyncLog(query) { + return request({ + url: '/monitor/orderSource/syncLog/list', + method: 'get', + params: query + }) +} + +export function getOrderSourceSyncLog(docId) { + return request({ + url: '/monitor/orderSource/syncLog/' + encodeURIComponent(docId), + method: 'get' + }) +} diff --git a/bms-front/src/views/monitor/eslog/index.vue b/bms-front/src/views/monitor/eslog/index.vue index c2fb303a..2e2bd94c 100644 --- a/bms-front/src/views/monitor/eslog/index.vue +++ b/bms-front/src/views/monitor/eslog/index.vue @@ -80,7 +80,8 @@ const typeOptions = [ { label: '计费', value: 'BILL' }, { label: '试算', value: 'QUOTE' }, { label: '扣减额度', value: 'CREDIT' }, - { label: '欠费清除', value: 'ARREARS' } + { label: '欠费清除', value: 'ARREARS' }, + { label: '订单数据源同步', value: 'ORDER_SOURCE_SYNC' } ] const statusOptions = [ diff --git a/bms-front/src/views/monitor/orderSource/components/OrderSourceSyncDialog.vue b/bms-front/src/views/monitor/orderSource/components/OrderSourceSyncDialog.vue new file mode 100644 index 00000000..e9a02653 --- /dev/null +++ b/bms-front/src/views/monitor/orderSource/components/OrderSourceSyncDialog.vue @@ -0,0 +1,313 @@ + + + + + diff --git a/bms-front/src/views/monitor/orderSource/components/OrderSourceSyncLogDrawer.vue b/bms-front/src/views/monitor/orderSource/components/OrderSourceSyncLogDrawer.vue new file mode 100644 index 00000000..c5208f66 --- /dev/null +++ b/bms-front/src/views/monitor/orderSource/components/OrderSourceSyncLogDrawer.vue @@ -0,0 +1,158 @@ + + + + + diff --git a/bms-front/src/views/monitor/orderSource/index.vue b/bms-front/src/views/monitor/orderSource/index.vue index 5bdc644a..85455fc7 100644 --- a/bms-front/src/views/monitor/orderSource/index.vue +++ b/bms-front/src/views/monitor/orderSource/index.vue @@ -1,5 +1,19 @@ + @@ -30,15 +75,40 @@ + + + + + +