From 9dd2b6186b18c6d3281fe8c48f1ff4c2bc1fc8d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 14:00:56 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
index e129094..0bf1c9f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
@@ -5,6 +5,7 @@
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
+import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
import lombok.Data;
@@ -29,12 +30,15 @@
private String code = "-";
+ private Boolean online = Boolean.FALSE;
+
private List<Long> taskIds = new ArrayList<>();
- public void sync(Object obj, CodeService codeService, TaskService taskService) {
+ public void sync(Object obj, CodeService codeService, TaskService taskService, AgvService agvService) {
if (null == obj) return;
if (obj instanceof AgvDetail) {
AgvDetail agvDetail = (AgvDetail) obj;
+ this.setOnline(agvService.judgeOnline(agvDetail.getAgvId()));
this.setAgvStatus(agvDetail.getStatusDesc());
if (null != agvDetail.getPos()) {
this.setPos(String.valueOf(agvDetail.getPos()));
@@ -48,9 +52,6 @@
List<Task> tasks = taskService.selectInSts(agvDetail.getAgvId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
if (!Cools.isEmpty(tasks)) {
this.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
- this.getTaskIds().add(6441L);
- this.getTaskIds().add(6442L);
- this.getTaskIds().add(6443L);
}
}
}
--
Gitblit v1.9.1