From 642428dd870c2f288bb0f3a5fc94373a69a425cf Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 25 四月 2025 13:08:53 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 64 ++++++++++++++++++++++++++++++-- 1 files changed, 60 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java index 1413527..f61788a 100644 --- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java @@ -1,23 +1,36 @@ package com.zy.asrs.task; +import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.core.common.Cools; +import com.zy.asrs.entity.BasDevp; import com.zy.asrs.entity.WrkMast; +import com.zy.asrs.service.BasDevpService; import com.zy.asrs.service.WrkMastService; +import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.handler.WorkMastHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; +import java.util.Date; import java.util.List; /** * Created by vincent on 2020/7/7 */ -//@Component +@Component public class WorkMastScheduler { + + private static final Logger log = LoggerFactory.getLogger(WorkMastScheduler.class); @Autowired private WrkMastService wrkMastService; @Autowired private WorkMastHandler workMastHandler; + @Autowired + private BasDevpService basDevpService; @Scheduled(cron = "0/3 * * * * ? ") private void execute(){ @@ -26,10 +39,53 @@ return; } for (WrkMast wrkMast : wrkMasts) { - ReturnT<String> start = workMastHandler.start(wrkMast); + try{ + if (wrkMast.getIoType().equals(101)){ + if (Cools.isEmpty(wrkMast.getSheetNo()) || !wrkMast.getSheetNo().equals("3")){ + continue; + } + } + ReturnT<String> returnT = workMastHandler.start(wrkMast); + if (!returnT.isSuccess()) { + wrkMast.setUpdMk("X"); + wrkMast.setErrorMemo(returnT.getMsg()); + wrkMast.setErrorTime(new Date()); + if (!wrkMastService.updateById(wrkMast)) { + log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo()); + } + } + }catch (Exception e){ + log.error("宸ヤ綔妗workNo={}]鏇存柊搴撳瓨澶勭悊澶辫触", wrkMast.getWrkNo()); + log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e); + } + } + } - - + @Scheduled(cron = "0/3 * * * * ? ") + private void execute202(){ + BasDevp basDevp = basDevpService.selectById(144); + if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y")){ + WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>() + .eq("wrk_no", basDevp.getWrkNo()).eq("io_type", 202).eq("wrk_sts", 52L)); + if (!Cools.isEmpty(wrkMast)){ + wrkMast.setWrkSts(56L); + wrkMastService.updateById(wrkMast); + } + } + List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData202(); + if (wrkMasts.isEmpty()) { + return; + } + for (WrkMast wrkMast : wrkMasts) { + try{ + wrkMast.setWrkSts(57L); + if (!wrkMastService.updateById(wrkMast)) { + log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo()); + } + }catch (Exception e){ + log.error("宸ヤ綔妗workNo={}]杞畬鎴愬鐞嗗け璐�", wrkMast.getWrkNo()); + log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e); + } } } -- Gitblit v1.9.1