From 2bc10d832acd06bc6511e50405202fde99b0e7c2 Mon Sep 17 00:00:00 2001 From: zhangc <zc@123> Date: 星期六, 18 一月 2025 10:20:25 +0800 Subject: [PATCH] java 优化库位检索逻辑,添加AGV工作明细服务,修复定时任务 --- src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 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..b517d61 100644 --- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java +++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java @@ -2,34 +2,50 @@ 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.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; - @Scheduled(cron = "0/3 * * * * ? ") + @Scheduled(fixedDelay = 60000) + //@Scheduled(cron = "0/1 * * * * ? ") private void execute(){ List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData(); if (wrkMasts.isEmpty()) { return; } for (WrkMast wrkMast : wrkMasts) { - ReturnT<String> start = workMastHandler.start(wrkMast); - - - + ReturnT<String> returnT = workMastHandler.start(wrkMast); + if (!returnT.isSuccess()) { + wrkMast.setUpdMk("X"); + if (returnT.getMsg().length() > 255) { + returnT.setMsg(returnT.getMsg().substring(0, 150)); + } + wrkMast.setErrorMemo(returnT.getMsg()); + wrkMast.setErrorTime(new Date()); + if (!wrkMastService.updateById(wrkMast)) { + log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo()); + } + } } } -- Gitblit v1.9.1