From b67f13b04339ac0cd1a10b07d58e9c30c53b97a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 03 四月 2024 15:04:39 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java | 15 +++++++++++++++
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsVo.java | 16 ++++++++++++++++
zy-asrs-flow/src/pages/map/utils.js | 6 +++++-
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java | 13 ++++++++++++-
4 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 19978e9..f25e436 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -585,5 +585,9 @@
}
export const updateMapStatusInRealTime = (data) => {
- console.log('map: ' + data);
+ const mapVo = JSON.parse(data);
+ // shuttle
+ for (const shuttleVo of mapVo.shuttleVos) {
+ console.log(shuttleVo);
+ }
}
\ No newline at end of file
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
new file mode 100644
index 0000000..5322c90
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsShuttleVo.java
@@ -0,0 +1,15 @@
+package com.zy.asrs.wcs.core.map.entity;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 4/3/2024
+ */
+@Data
+public class MapWsShuttleVo {
+
+ private String shuttleNo;
+
+ private String curLocNo;
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsVo.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsVo.java
new file mode 100644
index 0000000..17cf170
--- /dev/null
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapWsVo.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.wcs.core.map.entity;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 4/3/2024
+ */
+@Data
+public class MapWsVo {
+
+ private List<MapWsShuttleVo> shuttleVos = new ArrayList<>();
+
+}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
index 72123df..0bfef8e 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/websocket/MockScheduler.java
@@ -1,5 +1,8 @@
package com.zy.asrs.wcs.core.map.websocket;
+import com.alibaba.fastjson.JSON;
+import com.zy.asrs.wcs.core.map.entity.MapWsShuttleVo;
+import com.zy.asrs.wcs.core.map.entity.MapWsVo;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -11,7 +14,15 @@
@Scheduled(cron = "0/1 * * * * ? ")
public void mock() {
- MapWebSocket.broadcast("test data");
+ MapWsVo wsVo = new MapWsVo();
+
+ // shuttle
+ MapWsShuttleVo shuttleVo = new MapWsShuttleVo();
+ shuttleVo.setShuttleNo("1");
+ shuttleVo.setCurLocNo("1-1-1");
+ wsVo.getShuttleVos().add(shuttleVo);
+
+ MapWebSocket.broadcast(JSON.toJSONString(wsVo));
}
}
--
Gitblit v1.9.1