From 91415a2950e3b6935920c4b8f2f520ffb210b9ca Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 四月 2024 10:59:47 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MapRealTimeDataScheduler.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 a63e648..925be94 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
@@ -2,6 +2,8 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.framework.common.Cools;
+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.enums.DeviceCtgType;
@@ -19,6 +21,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.function.Consumer;
/**
* Created by vincent on 4/11/2024
@@ -46,21 +49,35 @@
List<Device> deviceList = deviceService.list(new LambdaQueryWrapper<Device>().eq(Device::getDeviceType, DeviceCtgType.SHUTTLE.val()));
for (Device device : deviceList) {
-// basShuttleService.
+ MapWsShuttleVo shuttleVo = new MapWsShuttleVo();
+ shuttleVos.add(shuttleVo);
+
+ shuttleVo.setShuttleNo(device.getDeviceNo());
+
+ Consumer<Device> consumer = new Consumer<Device>() {
+ @Override
+ public void accept(Device device) {
+ BasShuttle basShuttle = basShuttleService.getOne(new LambdaQueryWrapper<BasShuttle>().eq(BasShuttle::getDeviceId, device.getId()));
+ if (null != basShuttle && !Cools.isEmpty(basShuttle.getProtocol())) {
+ ShuttleProtocol protocol = JSON.parseObject(basShuttle.getProtocol(), ShuttleProtocol.class);
+ shuttleVo.setCurLocNo(protocol.getCurrentLocNo());
+
+ }
+ }
+ };
+
ShuttleThread thread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, device.getId().intValue());
if (null == thread) {
+ consumer.accept(device);
continue;
}
ShuttleProtocol protocol = thread.getStatus();
if (null == protocol) {
+ consumer.accept(device);
continue;
}
- MapWsShuttleVo shuttleVo = new MapWsShuttleVo();
-// shuttleVo.setShuttleNo();
-
-
- shuttleVos.add(shuttleVo);
+ shuttleVo.setCurLocNo(protocol.getCurrentLocNo());
}
return shuttleVos;
--
Gitblit v1.9.1