From c47395fe29493062a3f0bc2cf1d02a2946b20b88 Mon Sep 17 00:00:00 2001
From: zyh <zyh@123>
Date: 星期日, 04 一月 2026 08:41:35 +0800
Subject: [PATCH] 修改了判断空库位，查询语句的bug,和摄像头的连接
---
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 48 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..c574b8c 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -1,23 +1,40 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.zy.asrs.entity.Task;
import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.MesService;
+import com.zy.asrs.service.TaskService;
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 javax.annotation.Resource;
+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 TaskService taskService;
+ @Resource
+ private MesService mesService;
+ // TODO锛歳eporterTask()
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
@@ -26,10 +43,37 @@
return;
}
for (WrkMast wrkMast : wrkMasts) {
- ReturnT<String> start = workMastHandler.start(wrkMast);
+ 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());
+ }
+ }
+ }
+ }
-
-
+ /**
+ * AGV 304浠诲姟瀹屾垚锛屾湁鍜學MS鍏宠仈浠诲姟锛屽鍏宠仈浠诲姟鍋氬搴斿鐞嗭紝浠诲姟鐘舵�佷粠304--銆�305锛涙病鏈夊叧鑱斾换鍔★紝浠诲姟鐘舵�佷粠304--銆�305
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeTask(){
+ List<Task> wrkMasts = taskService.selectList(new EntityWrapper<Task>().eq("wrk_sts", 304));
+ if (wrkMasts.isEmpty()) {
+ return;
+ }
+ for (Task wrkMast : wrkMasts) {
+ ReturnT<String> returnT = workMastHandler.AgvStart(wrkMast);
+ if (!returnT.isSuccess()) {
+ wrkMast.setUpdMk("X");
+ wrkMast.setErrorMemo(returnT.getMsg());
+ wrkMast.setErrorTime(new Date());
+ if (!taskService.updateById(wrkMast)) {
+ log.error("宸ヤ綔妗workNo={}]鏍囪寰呭鐞嗗け璐�", wrkMast.getWrkNo());
+ }
+ }
}
}
--
Gitblit v1.9.1