From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 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 5d6ae0b..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
@@ -1,10 +1,19 @@
package com.zy.acs.manager.manager.controller.result;
+import com.zy.acs.framework.common.Cools;
import com.zy.acs.manager.manager.entity.Agv;
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;
import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* Created by vincent on 9/20/2024
@@ -17,15 +26,21 @@
private String vol = "-";
+ private String soc = "-";
+
private String pos = "-";
private String code = "-";
+ private Boolean online = Boolean.FALSE;
- public void sync(Object obj, CodeService codeService) {
+ private List<Long> taskIds = new ArrayList<>();
+
+ 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()));
@@ -33,9 +48,16 @@
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()));
+ }
}
}
--
Gitblit v1.9.1