From 9a7e2eb57c6db37992470dbb30cf04bebb1cab02 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Fri, 31 Mar 2023 10:20:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=90=8C=E6=AD=A5=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoOrderService.java | 3 + .../inout/impl/IoOrderServiceImpl.java | 5 ++ .../service/sync/SpsSyncDownloadService.java | 84 ++----------------- .../java/com/glxp/api/task/AsyncSpsTask.java | 9 +- 4 files changed, 19 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderService.java b/src/main/java/com/glxp/api/service/inout/IoOrderService.java index 735112a9..1f94597c 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderService.java @@ -22,6 +22,9 @@ public interface IoOrderService { IoOrderEntity findByBillNo(String billNO); + + List findByStatus(String action, Integer status); + int insertOrder(IoOrderEntity orderEntity); int insertOrUpdate(IoOrderEntity orderEntity); diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index cb9e6573..f5b902fc 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -135,6 +135,11 @@ public class IoOrderServiceImpl implements IoOrderService { return orderDao.selectOne(new QueryWrapper().eq("billNo", billNO)); } + @Override + public List findByStatus(String action, Integer status) { + return orderDao.selectList(new QueryWrapper().eq("action", action).eq("status", status)); + } + @Override public int insertOrder(IoOrderEntity orderEntity) { orderEntity.setId(null); diff --git a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java index 48bb1153..e0db99f5 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java +++ b/src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java @@ -75,86 +75,16 @@ public class SpsSyncDownloadService { //查询数据同步设置 SyncDataSetResponse syncDataSetEntity = syncDataSetService.selectSet(); List orderEntities = new ArrayList<>(); - - - //待校验 - if (syncDataSetEntity.isOrderUnCheck()) { - FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - - if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { - for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { - List filterList = new ArrayList<>(); - filterList.add(syncDataBustypeEntity.getAction()); - orderFilterRequest.setActions(filterList); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK); - List temps = orderService.filterOrderList(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } + FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); + BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); + if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { + for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { + List temps = orderService.findByStatus(syncDataBustypeEntity.getAction(), syncDataBustypeEntity.getOrderStatus()); + if (CollUtil.isNotEmpty(temps)) { + orderEntities.addAll(temps); } } } - - //待核对 - if (syncDataSetEntity.isOrderUnCheck()) { - FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - - if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { - for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { - List filterList = new ArrayList<>(); - filterList.add(syncDataBustypeEntity.getAction()); - orderFilterRequest.setActions(filterList); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS); - List temps = orderService.filterOrderList(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - } - - } - - //待审核 - if (syncDataSetEntity.isOrderUnReceive()) { - FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - - if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { - for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { - List filterList = new ArrayList<>(); - filterList.add(syncDataBustypeEntity.getAction()); - orderFilterRequest.setActions(filterList); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_CHECK_REW); - List temps = orderService.filterOrderList(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - } - } - - //已完成 - if (syncDataSetEntity.isOrderScanFinish()) { - FilterOrderRequest orderFilterRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(spsSyncDataRequest, orderFilterRequest); - - if (CollUtil.isNotEmpty(syncDataSetEntity.getBusTypes())) { - for (SyncDataBustypeEntity syncDataBustypeEntity : syncDataSetEntity.getBusTypes()) { - List filterList = new ArrayList<>(); - filterList.add(syncDataBustypeEntity.getAction()); - orderFilterRequest.setActions(filterList); - orderFilterRequest.setStatus(ConstantStatus.ORDER_STATUS_AUDITED); - List temps = orderService.filterOrderList(orderFilterRequest); - if (CollUtil.isNotEmpty(temps)) { - orderEntities.addAll(temps); - } - } - } - } - - syncOrderResponse.setOrderEntities(orderEntities); List codeEntities = new ArrayList<>(); List orderDetailBizEntities = new ArrayList<>(); diff --git a/src/main/java/com/glxp/api/task/AsyncSpsTask.java b/src/main/java/com/glxp/api/task/AsyncSpsTask.java index ae77be28..73deacca 100644 --- a/src/main/java/com/glxp/api/task/AsyncSpsTask.java +++ b/src/main/java/com/glxp/api/task/AsyncSpsTask.java @@ -36,7 +36,7 @@ public class AsyncSpsTask implements SchedulingConfigurer { scheduledRequest.setCronName("syncIdcSps"); logger.info("syncIdcSps----------------"); ScheduledEntity scheduledEntity = scheduledDao.findScheduled(scheduledRequest); - String cron = scheduledEntity!=null ? scheduledEntity.getCron() : "* 0/30 * * * ?"; + String cron = scheduledEntity != null ? scheduledEntity.getCron() : "* 0/30 * * * ?"; if (cron.isEmpty()) { logger.error("cron is null"); @@ -47,9 +47,8 @@ public class AsyncSpsTask implements SchedulingConfigurer { } private void process() { - logger.info("syncIdcSps----process------------"); - - idcService.asyncSpsTask(); - } + logger.info("syncIdcSps----process------------"); + idcService.asyncSpsTask(); + } }