From afbd08deb5101d2f2ff97f66f4388162f38860a2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 17 八月 2024 11:21:55 +0800
Subject: [PATCH] #
---
src/core/warehouse.jsx | 62 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index c3117e7..b37c8ae 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -14,19 +14,34 @@
import agvRealDataList from '@/assets/data/agv';
import { getBoxData } from '../api/box';
import { getAgvData } from '../api/agv';
-import { INTERVAL_TIME, WEBSOCKET_BASE_URL, IP, PORT } from '@/config/setting'
+import { INTERVAL_TIME } from '@/config/setting'
let index = 0;
const Warehouse = (props) => {
- const [agvData, setAgvData] = useState([
- {}
- ]);
- const [boxData, setBoxData] = useState([])
+ const [agv1Data, setAgv1Data] = useState({});
+ const [agv2Data, setAgv2Data] = useState({});
+ const [boxData, setBoxData] = useState([]);
useEffect(() => {
-
+ const websocket = new WebSocketClient('/ws/digitalTwin/websocket');
+ websocket.connect();
+ websocket.onMessage = (jsonStr) => {
+ const data = JSON.parse(jsonStr);
+ if (data.type === 'agv') {
+ switch (data.no) {
+ case "1":
+ setAgv1Data(data.obj);
+ break;
+ case "2":
+ setAgv2Data(data.obj);
+ break;
+ default:
+ break;
+ }
+ }
+ }
const timer = setInterval(() => {
getBoxData().then(res => {
@@ -40,23 +55,17 @@
// console.log(res);
setBoxData(res);
})
-
- getAgvData().then(res => {
- // console.log(JSON.stringify(res))
- if (res && res.length > 0) {
- setAgvData(res);
- }
- })
-
- const agvRealData = agvRealDataList[index];
- if (agvRealData) {
- // setAgvData(agvRealData);
- }
- index++;
}, INTERVAL_TIME);
return () => {
- clearInterval(timer);
+ if (timer) {
+ clearInterval(timer);
+ }
+
+ if (websocket) {
+ websocket.onMessage = (data) => { }
+ websocket.close();
+ }
}
}, [])
@@ -76,9 +85,13 @@
return boxData.map((data, idx) => <Box key={idx} {...data} />)
}, [boxData]);
- const agvEl = useMemo(() => {
- return agvData.map((data, idx) => <Agv key={idx} {...data} />)
- }, [agvData]);
+ const agv1El = useMemo(() => {
+ return <Agv key={1} {...agv1Data} />
+ }, [agv1Data]);
+
+ const agv2El = useMemo(() => {
+ return <Agv key={2} {...agv2Data} />
+ }, [agv2Data]);
useFrame((state, delta) => {
@@ -91,7 +104,8 @@
{tunnelEl}
{areaEl}
{shelfEl}
- {agvEl}
+ {agv1El}
+ {agv2El}
{boxEl}
</group>
</>
--
Gitblit v1.9.1