From 7100219174b447399a00a42d5ba275a20de1334e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 十月 2024 16:05:31 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 14 ++++++++++----
1 files changed, 10 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..155e1d4 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;
@@ -25,16 +26,21 @@
private String vol = "-";
+ private String soc = "-";
+
private String pos = "-";
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()));
@@ -42,15 +48,15 @@
if (null != agvDetail.getVol()) {
this.setVol(String.valueOf(agvDetail.getVol()));
}
+ if (null != agvDetail.getSoc()) {
+ this.setSoc(String.valueOf(agvDetail.getSoc()));
+ }
if (null != agvDetail.getRecentCode()) {
this.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
}
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