From 0d04bc5d8080b82338302fba0a59fccff2eaedfc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 06 七月 2025 11:28:29 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java | 22 ++++++++++++++++++----
1 files changed, 18 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 7b30f2c..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,11 +4,14 @@
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;
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.BasConveyorStaService;
import com.zy.asrs.wcs.core.service.BasShuttleService;
import com.zy.asrs.wcs.core.utils.NavigateMapUtils;
import com.zy.asrs.wcs.core.utils.Utils;
@@ -46,6 +49,8 @@
private DictService dictService;
@Autowired
private NavigateMapUtils navigateMapUtils;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
@Scheduled(cron = "0/1 * * * * ? ")
public void sync() {
@@ -53,6 +58,7 @@
// shuttle
wsVo.setShuttleVos(syncShuttle());
wsVo.setLockPath(getMapLocPath());
+ wsVo.setConveyorSta(getMapConveyorSta());
MapWebSocket.broadcast(JSON.toJSONString(wsVo));
}
@@ -101,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));
@@ -111,10 +117,18 @@
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() {
+ return basConveyorStaService.list();
}
}
--
Gitblit v1.9.1