From 7b5ea29f32106ea9b0105063cd74adeb25736e98 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 22 六月 2024 09:54:33 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java | 9 +++++++++
1 files changed, 9 insertions(+), 0 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..a70c0d9 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,13 @@
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.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 +48,8 @@
private DictService dictService;
@Autowired
private NavigateMapUtils navigateMapUtils;
+ @Autowired
+ private BasConveyorStaService basConveyorStaService;
@Scheduled(cron = "0/1 * * * * ? ")
public void sync() {
@@ -53,6 +57,7 @@
// shuttle
wsVo.setShuttleVos(syncShuttle());
wsVo.setLockPath(getMapLocPath());
+ wsVo.setConveyorSta(getMapConveyorSta());
MapWebSocket.broadcast(JSON.toJSONString(wsVo));
}
@@ -117,4 +122,8 @@
return navigateNodes;
}
+ private List<BasConveyorSta> getMapConveyorSta() {
+ return basConveyorStaService.list();
+ }
+
}
--
Gitblit v1.9.1