From 94c6d9bec3103526631e03d0e24afea0b23e26a5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 20 九月 2024 13:15:16 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 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..5d6ae0b 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,6 +1,8 @@
package com.zy.acs.manager.manager.controller.result;
import com.zy.acs.manager.manager.entity.Agv;
+import com.zy.acs.manager.manager.entity.AgvDetail;
+import com.zy.acs.manager.manager.service.CodeService;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -11,6 +13,30 @@
@EqualsAndHashCode(callSuper = true)
public class AgvResult extends Agv {
- private Double vol;
+ private String agvStatus = "-";
+
+ private String vol = "-";
+
+ private String pos = "-";
+
+ private String code = "-";
+
+
+ public void sync(Object obj, CodeService codeService) {
+ if (null == obj) return;
+ if (obj instanceof AgvDetail) {
+ AgvDetail agvDetail = (AgvDetail) obj;
+ 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.getRecentCode()) {
+ this.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
+ }
+ }
+ }
}
--
Gitblit v1.9.1