From fa170e55a9377cff4d5b13137d3d8f28222a3417 Mon Sep 17 00:00:00 2001
From: g82tt <snow82@vip.qq.com>
Date: Thu, 4 Jun 2026 03:08:18 +0800
Subject: [PATCH] =?UTF-8?q?warehouse=20P0=E4=BF=AE=E5=A4=8D:=20http.js(lan?=
 =?UTF-8?q?g=5Fstorage=5Fkey)+SignalR=E5=86=85=E5=AD=98=E6=B3=84=E6=BC=8F(?=
 =?UTF-8?q?LRU)+Pinia=20store=E5=90=88=E5=B9=B6(7=E6=96=87=E4=BB=B6import?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5)+Camera=20type=E5=AF=BC=E5=85=A5=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 warehouse/src/api/http.js                     |   2 +
 warehouse/src/components/DisplayColor.vue     |   2 +-
 warehouse/src/components/DisplayRouteLine.vue |   2 +-
 warehouse/src/components/Fence.vue            |   2 +-
 warehouse/src/components/Filter.vue           |   2 +-
 warehouse/src/components/Sky.vue              |   2 +-
 warehouse/src/components/Weather.vue          |   2 +-
 warehouse/src/store/useMapStore.js            |  29 -----
 warehouse/src/stores/mapStore.js              |  56 ++++-----
 warehouse/src/view/Map.vue                    |   2 +-
 warehouse/src/view/index.js                   | 111 +++++++-----------
 warehouse/src/view/video/History.vue          |   3 +-
 warehouse/src/view/video/Live.vue             |   3 +-
 warehouse/src/view/video/VideoWall.vue        |   3 +-
 14 files changed, 77 insertions(+), 144 deletions(-)
 delete mode 100644 warehouse/src/store/useMapStore.js

diff --git a/warehouse/src/api/http.js b/warehouse/src/api/http.js
index 3b4cec9..2787aff 100644
--- a/warehouse/src/api/http.js
+++ b/warehouse/src/api/http.js
@@ -38,6 +38,8 @@ if (!axios.defaults.baseURL.endsWith('/')) {
   axios.defaults.baseURL += '/'
 }
 
+const lang_storage_key = 'lang'
+
 let ipAddress = axios.defaults.baseURL;
 if (!ipAddress || ipAddress == '/') {
   ipAddress = window.location.origin + '/';
diff --git a/warehouse/src/components/DisplayColor.vue b/warehouse/src/components/DisplayColor.vue
index bfda85b..d9e128e 100644
--- a/warehouse/src/components/DisplayColor.vue
+++ b/warehouse/src/components/DisplayColor.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { watch, computed } from "vue"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 
 // 可以使用pinia等管理全局数据，这里只是方便演示, 直接注入了上层提供的数据
 const store = useMapStore()
diff --git a/warehouse/src/components/DisplayRouteLine.vue b/warehouse/src/components/DisplayRouteLine.vue
index 73b7a0b..d84d96b 100644
--- a/warehouse/src/components/DisplayRouteLine.vue
+++ b/warehouse/src/components/DisplayRouteLine.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from "vue"
 import { useNavi } from "../hooks/useNavi"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 
 // 可以使用pinia等管理全局数据，这里只是方便演示, 直接注入了上层提供的数据
 const store = useMapStore()
diff --git a/warehouse/src/components/Fence.vue b/warehouse/src/components/Fence.vue
index 4dd16a2..a8d5342 100644
--- a/warehouse/src/components/Fence.vue
+++ b/warehouse/src/components/Fence.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { inject, onBeforeUnmount } from "vue"
 import { useFence } from "../hooks/useFence"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 
 const { THREE } = VgoMap
 
diff --git a/warehouse/src/components/Filter.vue b/warehouse/src/components/Filter.vue
index fde35fa..ad185ec 100644
--- a/warehouse/src/components/Filter.vue
+++ b/warehouse/src/components/Filter.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { inject, ref, watch, onBeforeUnmount } from "vue"
 import { useClassPolygon } from "../hooks/useClassPolygon"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 import http from "../api/http"
 
 const { THREE } = VgoMap
diff --git a/warehouse/src/components/Sky.vue b/warehouse/src/components/Sky.vue
index 46e3ad6..60924e8 100644
--- a/warehouse/src/components/Sky.vue
+++ b/warehouse/src/components/Sky.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch, onBeforeUnmount } from "vue"
 import { useSkyLight } from "../hooks/useSkyLight"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 import CustomSwitch from "./CustomSwitch.vue"
 
 const store = useMapStore()
diff --git a/warehouse/src/components/Weather.vue b/warehouse/src/components/Weather.vue
index faf7a34..a498f0c 100644
--- a/warehouse/src/components/Weather.vue
+++ b/warehouse/src/components/Weather.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, watch } from "vue"
 import { useWeatherEffect, WeatherType } from "../hooks/useWeather"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 import CustomSwitch from "./CustomSwitch.vue"
 
 const store = useMapStore()
diff --git a/warehouse/src/store/useMapStore.js b/warehouse/src/store/useMapStore.js
deleted file mode 100644
index 8ab6986..0000000
--- a/warehouse/src/store/useMapStore.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { ref, computed } from "vue"
-import { defineStore } from "pinia"
-
-export const useMapStore = defineStore('map', () => {
-  const map = ref(null)
-
-  const polygonDataAll = computed(() => {
-    const outDoor = map.value?.mapData?.polygonData ?? []
-
-    const inDoor = map?.mapData?.build?.reduce((result, build) => {
-      build.floor.forEach(fItem => {
-        result.push(...fItem.polygonData)
-      })
-      return result
-    }, []) ?? []
-    
-    return [...outDoor, ...inDoor]
-  })
-
-  function setMap(mapInstance) {
-    map.value = mapInstance
-  }
-
-  return {
-    map,
-    polygonDataAll,
-    setMap,
-  }
-})
diff --git a/warehouse/src/stores/mapStore.js b/warehouse/src/stores/mapStore.js
index b725e17..cfaf123 100644
--- a/warehouse/src/stores/mapStore.js
+++ b/warehouse/src/stores/mapStore.js
@@ -1,48 +1,34 @@
-import { ref } from "vue"
+import { ref, computed } from "vue"
 import { defineStore } from "pinia"
 
 export const useMapStore = defineStore('map', () => {
   const map = ref(null)
-  const lastClickedPosition = ref(null) // 存储地图最后点击位置的经纬度
-  const editingMode = ref(false) // 编辑状态标识
+  const lastClickedPosition = ref(null)
+  const editingMode = ref(false)
 
-  function setMap(mapInstance) {
-    map.value = mapInstance
-  }
+  /** 聚合所有楼层+室外的 polygonData */
+  const polygonDataAll = computed(() => {
+    const outDoor = map.value?.mapData?.polygonData ?? []
+    const builds = map.value?.mapData?.build ?? []
+    const inDoor = builds.reduce((result, build) => {
+      build.floor?.forEach(f => { result.push(...(f.polygonData ?? [])) })
+      return result
+    }, [])
+    return [...outDoor, ...inDoor]
+  })
 
-  // 设置地图最后点击位置的经纬度
-  function setLastClickedPosition(lng, lat) {
-    lastClickedPosition.value = { lng, lat }
-  }
-
-  // 设置编辑状态
+  function setMap(mapInstance) { map.value = mapInstance }
+  function setLastClickedPosition(lng, lat) { lastClickedPosition.value = { lng, lat } }
   function setEditingMode(mode) {
     editingMode.value = mode
-    if(mode){
-      map.value.setViewMode('2D')
-    }
-    else{
-      map.value.setViewMode('3D')
-    }
-  }
-
-  // 获取编辑状态
-  function getEditingMode() {
-    if(editingMode.value){
-      return editingMode.value
-    }
-    else{
-      return false
-    }
+    map.value?.setViewMode(mode ? '2D' : '3D')
   }
+  function getEditingMode() { return editingMode.value }
 
   return {
-    map,
-    setMap,
-    lastClickedPosition,
-    setLastClickedPosition,
-    editingMode,
-    setEditingMode,
-    getEditingMode
+    map, setMap,
+    lastClickedPosition, setLastClickedPosition,
+    editingMode, setEditingMode, getEditingMode,
+    polygonDataAll,
   }
 })
diff --git a/warehouse/src/view/Map.vue b/warehouse/src/view/Map.vue
index f92414d..cf33035 100644
--- a/warehouse/src/view/Map.vue
+++ b/warehouse/src/view/Map.vue
@@ -6,7 +6,7 @@ import Sky from "../components/Sky.vue"
 import DisplayColor from "../components/DisplayColor.vue"
 import DisplayRouteLine from "../components/DisplayRouteLine.vue"
 import Weather from "../components/Weather.vue"
-import { useMapStore } from "../store/useMapStore"
+import { useMapStore } from "../stores/mapStore"
 
 const { VgoMap } = window
 let mapId = /#\/(\d+)/.exec(location.hash)[1]
diff --git a/warehouse/src/view/index.js b/warehouse/src/view/index.js
index 5a85959..95e1452 100644
--- a/warehouse/src/view/index.js
+++ b/warehouse/src/view/index.js
@@ -2,89 +2,60 @@ import * as signalR from "@microsoft/signalr";
 import { ElNotification } from "element-plus";
 import { ElMessageBox } from "element-plus";
 import store from "@/store/index";
+
 export default function (http, receive) {
-  let connection;
+  let connection
 
-  let messageQueue = [];
-  let isProcessingQueue = false;
-  let displayedMessageIds = new Set(); // 用于存储已显示的消息ID，避免重复显示
+  // LRU: 最近 500 条 ID，防内存无限增长
+  const MAX_IDS = 500
+  const displayedIds = new Set()
+  const idList = []
 
-  // 消息队列处理函数 - 移到闭包内部，确保可以访问所有必要的变量
-  function processMessageQueue() {
-    if (messageQueue.length === 0) {
-      isProcessingQueue = false;
-      return;
+  function addId(id) {
+    if (displayedIds.has(id)) return
+    displayedIds.add(id)
+    idList.push(id)
+    if (idList.length > MAX_IDS) {
+      displayedIds.delete(idList.shift())
     }
+  }
+  function hasId(id) { return displayedIds.has(id) }
 
-    isProcessingQueue = true;
-    const currentMessage = messageQueue.shift();
-    
-    // 直接调用receive回调处理消息显示
-    if (receive) {
-      try {
-        receive(currentMessage);
-        console.log('成功调用receive回调处理消息:', currentMessage);
-      } catch (error) {
-        console.error('调用receive回调时出错:', error);
-      }
+  // 重试启动: 最多 5 次, 间隔 2s
+  async function startWithRetry(conn, retries = 5) {
+    for (let i = 1; i <= retries; i++) {
+      try { await conn.start(); return }
+      catch (e) { if (i < retries) await new Promise(r => setTimeout(r, 2000)) }
     }
-
-    // 可以设置一定的延迟，避免消息显示过于密集
-    setTimeout(() => {
-      processMessageQueue();
-    }, 3000); // 3秒后处理下一条消息
+    console.error('SignalR 连接失败 (5次重试后放弃)')
   }
 
-  http.post("api/user/GetCurrentUserInfo").then((result) => {
-    console.log(result,'result');
+  http.post("api/user/GetCurrentUserInfo").then(async (result) => {
+    if (!result?.data?.userName) {
+      console.error('获取用户信息失败: 缺少 userName')
+      return
+    }
     connection = new signalR.HubConnectionBuilder()
       .withAutomaticReconnect()
-      .withUrl(
-        `/hub/message?userName=${result.data.userName}`,
-        {
-          //withCredentials: true // 启用凭证模式
-          // accessTokenFactory: () => store.getters.getToken()
-        }
-      )
-      //.withUrl(`${http.ipAddress}message`)
-      .build();
+      .withUrl('/hub/message?userName=' + result.data.userName)
+      .build()
+
+    startWithRetry(connection)
+
+    connection.onreconnected(function (id) {
+      if (import.meta.env.DEV) console.log('SignalR reconnected:', id)
+    })
 
-    connection.start().catch((err) => console.log(err.message));
-    //自动重连成功后的处理
-    connection.onreconnected((connectionId) => {
-      console.log(connectionId, 'connectionId');
-    });
     connection.on("ReceiveHomePageMessage", function (data) {
-      console.log('接收到新消息:', data);
-      
-      // 检查消息是否已显示过
-      if (data.id && displayedMessageIds.has(data.id)) {
-        console.log('消息已显示过，跳过:', data.id);
-        return;
-      }
+      if (data?.id && hasId(data.id)) return
+      if (data?.id) addId(data.id)
 
-      // 将消息ID添加到已显示集合
-      if (data.id) {
-        displayedMessageIds.add(data.id);
-        console.log('添加到已显示集合:', data.id);
-      }
-
-      // 添加到store
-      // store.getters.data().pushMessage(data);
-      console.log(data, 'data_after_push');
-      // 直接调用receive回调
       if (receive) {
-        try {
-          receive(data);
-          console.log('成功调用receive回调:', data);
-        } catch (error) {
-          console.error('调用receive回调时出错:', error);
-        }
-      } else {
-        console.warn('receive回调未定义，无法处理消息');
+        try { receive(data) }
+        catch (e) { console.error('receive callback error:', e) }
       }
-    });
-  }).catch(error => {
-    console.error('获取用户信息时出错:', error);
-  });
+    })
+  }).catch(function (e) {
+    console.error('getUserInfo failed:', e)
+  })
 }
diff --git a/warehouse/src/view/video/History.vue b/warehouse/src/view/video/History.vue
index a15f21e..317554e 100644
--- a/warehouse/src/view/video/History.vue
+++ b/warehouse/src/view/video/History.vue
@@ -61,7 +61,8 @@
 import { ref, computed, onMounted } from 'vue'
 import { VideoPlay } from '@element-plus/icons-vue'
 import { ElMessage } from 'element-plus'
-import { fetchCameras, gwGet, Camera } from '@/api/gateway'
+import { fetchCameras, gwGet } from '@/api/gateway'
+import type { Camera } from '@/api/gateway'
 
 const cameras = ref<Camera[]>([])
 const selectedCamera = ref<Camera | null>(null)
diff --git a/warehouse/src/view/video/Live.vue b/warehouse/src/view/video/Live.vue
index e9ec136..4161d62 100644
--- a/warehouse/src/view/video/Live.vue
+++ b/warehouse/src/view/video/Live.vue
@@ -92,7 +92,8 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue'
 import { VideoCamera } from '@element-plus/icons-vue'
-import { fetchCameras, gwGet, gwPost, Camera } from '@/api/gateway'
+import { fetchCameras, gwGet, gwPost } from '@/api/gateway'
+import type { Camera } from '@/api/gateway'
 
 const cameras = ref<Camera[]>([])
 const selectedCamera = ref<Camera | null>(null)
diff --git a/warehouse/src/view/video/VideoWall.vue b/warehouse/src/view/video/VideoWall.vue
index 308af24..657ea56 100644
--- a/warehouse/src/view/video/VideoWall.vue
+++ b/warehouse/src/view/video/VideoWall.vue
@@ -106,7 +106,8 @@
 
 <script setup lang="ts">
 import { ref, computed, onMounted, watch } from 'vue'
-import { fetchCameras, gwGet, gwPost, Camera } from '@/api/gateway'
+import { fetchCameras, gwGet, gwPost } from '@/api/gateway'
+import type { Camera } from '@/api/gateway'
 
 const cameras = ref<Camera[]>([])
 const streamUrls = ref<Record<string, string>>({})