From c61be765fe40fce1a57471a8fc8b93932c0a970c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@63.com> Date: 星期六, 02 四月 2022 15:37:50 +0800 Subject: [PATCH] Merge branch 'jkasrs' of http://47.97.1.152:5880/r/zy-asrs into jkasrs --- src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 23 +++++++++++++++++------ 1 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java index ac0033c..06a0624 100644 --- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java +++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java @@ -1,28 +1,39 @@ package com.zy.asrs.task; +import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.WrkMastService; +import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.WorkLogHandler; -import com.zy.system.entity.Config; -import com.zy.system.service.ConfigService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; +import java.util.List; + /** * Created by vincent on 2020/7/7 */ +@Slf4j @Component public class WorkLogScheduler { @Autowired private WorkLogHandler workLogHandler; @Autowired - private ConfigService configService; + private WrkMastService wrkMastService; @Scheduled(cron = "0/3 * * * * ? ") private void execute(){ - ReturnT<Config> result = workLogHandler.start(); - if (!result.isSuccess()) { - configService.insert(result.getContent()); + List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData(); + if (wrkMasts.isEmpty()) { + return; + } + for (WrkMast wrkMast : wrkMasts) { + ReturnT<String> result = workLogHandler.start(wrkMast); + if (!result.isSuccess()) { + log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗e鐞嗗け璐�", wrkMast.getWrkNo()); + } } } -- Gitblit v1.9.1