From fb0e407cf53d37d55fce3294b54379b5caa8270e Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 十一月 2024 14:57:22 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java | 8 ++++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java | 2 ++
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 1 +
4 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
index 38863f0..ddba884 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/MapWsAgvVo.java
@@ -25,6 +25,8 @@
private Integer battery;
+ private String error;
+
// public int getBackpackLoadedCount() {
// if (Cools.isEmpty(this.backpack)) {
// return 0;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 9f6b7f2..da259c9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -88,6 +88,7 @@
vo.setDirection(agvDetail.getAgvAngle());
vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
vo.setBattery(agvDetail.getSoc());
+ vo.setError(agvDetail.getError());
vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
index 7fc2714..9f4521a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AgvDataService.java
@@ -130,7 +130,7 @@
}
// 鏁呴殰澶嶄綅
- if (!Cools.isEmpty(detail.getError()) && !"NONE".equals(detail.getError())) {
+ if (!Cools.isEmpty(detail.getError())) {
assert detail.getErrorTime() != null;
if (DateUtils.diffToSeconds(detail.getErrorTime(), new Date()) > 20) {
detail.setError("NONE");
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
index dafe940..c498585 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/AgvDetail.java
@@ -302,4 +302,12 @@
return null;
}
+ public String getError() {
+ if (!Cools.isEmpty(this.error) && !"NONE".equals(this.error)) {
+ return this.error;
+ } else {
+ return "";
+ }
+ }
+
}
--
Gitblit v1.9.1