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 | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 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 67178fe..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,8 +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
@@ -11,6 +22,43 @@
@EqualsAndHashCode(callSuper = true)
public class AgvResult extends Agv {
- private Double vol;
+ private String agvStatus = "-";
+
+ 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, 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()));
+ }
+ 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