From 8a830f3e5f9ff3bca3161b5bf800abeb1a64e866 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 22 六月 2024 16:30:35 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 a70c0d9..5b5eff6 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wcs.core.domain.dto.MapLockPathDto;
import com.zy.asrs.wcs.core.entity.BasConveyorSta;
import com.zy.asrs.wcs.core.entity.BasShuttle;
import com.zy.asrs.wcs.core.map.entity.MapWsShuttleVo;
@@ -106,8 +107,8 @@
return shuttleVos;
}
- private List<NavigateNode> getMapLocPath() {
- List<NavigateNode> navigateNodes = new ArrayList<>();
+ private List<MapLockPathDto> getMapLocPath() {
+ List<MapLockPathDto> list = new ArrayList<>();
Dict dict = dictService.getOne(new LambdaQueryWrapper<Dict>()
.eq(Dict::getFlag, "floor-list")
.eq(Dict::getStatus, 1));
@@ -116,10 +117,14 @@
JSONObject jsonObject = JSON.parseObject(o.toString());
Integer lev = jsonObject.getInteger("value");
List<NavigateNode> path = navigateMapUtils.getLockPath(lev);
- navigateNodes.addAll(path);
+
+ MapLockPathDto lockPathDto = new MapLockPathDto();
+ lockPathDto.setPath(path);
+ lockPathDto.setLev(lev);
+ list.add(lockPathDto);
}
}
- return navigateNodes;
+ return list;
}
private List<BasConveyorSta> getMapConveyorSta() {
--
Gitblit v1.9.1