删除-定时任务循环未执行完放弃当次任务

pang.jiabao

18 小时以前 bf706895204ada40082e4c0c8165b51d2b4ff97c

删除-定时任务循环未执行完放弃当次任务

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -15,7 +15,6 @@
import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.ReentrantLock;
import java.util.stream.Collectors;

/**
@@ -44,54 +43,44 @@
    @Resource
    private ThreadPoolTaskExecutor orderThreadPool;

    private final ReentrantLock lock = new ReentrantLock();

//    @Scheduled(cron = "0/5 * * * * ? ")
    // 10分钟执行一次
    @Scheduled(cron = "0 0/10 * * * ?")
    public void completeAndReport() {
        if (!lock.tryLock()) {
            log.info("上一次任务未执行完，跳过本次");
            return;
        }
        try {
            String erpReport = Parameter.get().getErpReport();
            if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
                List<Order> orders = orderService.selectComplete();
                if (orders.isEmpty()) {
                    return;
                }
                // 按单据类型分组
                Map<String, List<Order>> groupedOrders = orders.stream()
                        .collect(Collectors.groupingBy(order -> {
                            String type = order.getDocType$();
                            switch (type) {
                                case "采购订单":
                                case "采购到货单":
                                case "委外订单":
                                case "委外到货单":
                                case "到货单":
                                case "来料检验单":
                                    return "采购入库";
                                case "销售发货单":
                                    return "销售出库";
                                case "生产订单":
                                case "检验单":
                                    return "产成品入库单";
                                case "领料申请单":
                                    return "材料出库单";
                                default:
                                    return type;
                            }
                        }));
                for (Map.Entry<String, List<Order>> map : groupedOrders.entrySet()) {
                    orderThreadPool.submit(() -> {
                        orderSyncHandler.startNew(map);
                    });
                }
        String erpReport = Parameter.get().getErpReport();
        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
            List<Order> orders = orderService.selectComplete();
            if (orders.isEmpty()) {
                return;
            }
        } finally {
            lock.unlock();
            // 按单据类型分组
            Map<String, List<Order>> groupedOrders = orders.stream()
                    .collect(Collectors.groupingBy(order -> {
                        String type = order.getDocType$();
                        switch (type) {
                            case "采购订单":
                            case "采购到货单":
                            case "委外订单":
                            case "委外到货单":
                            case "到货单":
                            case "来料检验单":
                                return "采购入库";
                            case "销售发货单":
                                return "销售出库";
                            case "生产订单":
                            case "检验单":
                                return "产成品入库单";
                            case "领料申请单":
                                return "材料出库单";
                            default:
                                return type;
                        }
                    }));
            for (Map.Entry<String, List<Order>> map : groupedOrders.entrySet()) {
                orderThreadPool.submit(() -> {
                    orderSyncHandler.startNew(map);
                });
            }
        }
    }