From 5c698a110c552d5ef7af812f89d2950b82724c02 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 12 六月 2024 15:10:43 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java
index 925be94..c452134 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java
@@ -6,8 +6,10 @@
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.zy.asrs.wcs.core.map.entity.MapWsShuttleVo;
import com.zy.asrs.wcs.core.map.entity.MapWsVo;
+import com.zy.asrs.wcs.core.model.NavigateNode;
import com.zy.asrs.wcs.core.model.enums.DeviceCtgType;
import com.zy.asrs.wcs.core.service.BasShuttleService;
+import com.zy.asrs.wcs.core.utils.Utils;
import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
import com.zy.asrs.wcs.rcs.entity.Device;
import com.zy.asrs.wcs.rcs.model.enums.SlaveType;
@@ -22,6 +24,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
+import java.util.stream.Collectors;
/**
* Created by vincent on 4/11/2024
@@ -61,7 +64,6 @@
if (null != basShuttle && !Cools.isEmpty(basShuttle.getProtocol())) {
ShuttleProtocol protocol = JSON.parseObject(basShuttle.getProtocol(), ShuttleProtocol.class);
shuttleVo.setCurLocNo(protocol.getCurrentLocNo());
-
}
}
};
@@ -78,6 +80,13 @@
}
shuttleVo.setCurLocNo(protocol.getCurrentLocNo());
+
+ List<NavigateNode> moveAdvancePath = thread.getMoveAdvancePath();
+ if (!Cools.isEmpty(moveAdvancePath)) {
+ shuttleVo.setTravelPath(moveAdvancePath.stream()
+ .map(path -> Utils.getLocNo(path.getX(), path.getY(), path.getZ()))
+ .collect(Collectors.toList()));
+ }
}
return shuttleVos;
--
Gitblit v1.9.1