From bd6f16c7a6695606d7ebb5baa56eefe65b603cf2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 11 六月 2024 16:48:01 +0800
Subject: [PATCH] #

---
 src/core/warehouse.jsx |   55 +++++++++++++++++++++++++++++--------------------------
 1 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/core/warehouse.jsx b/src/core/warehouse.jsx
index acb57d5..b37c8ae 100644
--- a/src/core/warehouse.jsx
+++ b/src/core/warehouse.jsx
@@ -20,17 +20,28 @@
 
 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 = (data) => {
-        //     Utils.updateMapStatusInRealTime(data, () => curFloorRef.current, setCurSPrite);
-        // }
+        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 => {
@@ -44,28 +55,15 @@
                 // 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 () => {
             if (timer) {
                 clearInterval(timer);
             }
-           
+
             if (websocket) {
-                websocket.onMessage = (data) => {}
+                websocket.onMessage = (data) => { }
                 websocket.close();
             }
         }
@@ -87,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) => {
@@ -102,7 +104,8 @@
                 {tunnelEl}
                 {areaEl}
                 {shelfEl}
-                {agvEl}
+                {agv1El}
+                {agv2El}
                 {boxEl}
             </group>
         </>

--
Gitblit v1.9.1