Merge branch 'perf/configuration-id' into 'main_dev'

fix: 修复实时数据获取节点信息变更id为configurationNodeId

See merge request yunteng/thingskit-scada!258

@@ -25,7 +25,7 @@ const loading = ref(false)
 // 存储视频数据
 // 存储视频数据
 const videoConfig = computed(() => {
 const videoConfig = computed(() => {
   return contentDataStore?.contentData.filter((item) => {
   return contentDataStore?.contentData.filter((item) => {
-    return props.config.cellInfo?.id === item.id
+    return props.config.cellInfo?.id === item.configurationNodeId
   })
   })
 })
 })
 
 

@@ -56,8 +56,8 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
    * @returns
    * @returns
    */
    */
   getNodeDataSubscribers(nodeData: NodeDataType) {
   getNodeDataSubscribers(nodeData: NodeDataType) {
-    const { dataSourceJson, actJson, id } = nodeData
-    const cell = this.nodeUtils.getCellById(id)
+    const { dataSourceJson, actJson, configurationNodeId } = nodeData
+    const cell = this.nodeUtils.getCellById(configurationNodeId)
     if (!cell) return []
     if (!cell) return []
     const componentKey = this.nodeUtils.getNodeComponentKey(cell)
     const componentKey = this.nodeUtils.getNodeComponentKey(cell)
     const categoryKey = this.nodeUtils.getNodeCategory(cell)
     const categoryKey = this.nodeUtils.getNodeCategory(cell)
@@ -77,7 +77,7 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
         const { deviceId, attr } = actJson[key as ActTypeEnum]
         const { deviceId, attr } = actJson[key as ActTypeEnum]
         // 无entityId及属性时不订阅
         // 无entityId及属性时不订阅
         if (deviceId && attr) {
         if (deviceId && attr) {
-          const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(id, DataSourceTypeEnum.ACT, actJson[key as ActTypeEnum], key as ActTypeEnum))
+          const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(configurationNodeId, DataSourceTypeEnum.ACT, actJson[key as ActTypeEnum], key as ActTypeEnum))
           subscribers.push(subscribe)
           subscribers.push(subscribe)
         }
         }
       }
       }
@@ -86,7 +86,7 @@ export class LightboxModeWebsocketService extends TelemetryWebsockerService {
     const { deviceId, attr } = dataSourceJson || {}
     const { deviceId, attr } = dataSourceJson || {}
 
 
     if (deviceId && attr) {
     if (deviceId && attr) {
-      const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(id, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
+      const subscribe = TelemetrySubscriber.createTimeseriesSubscription(this, { id: deviceId, entityType: EntityType.DEVICE }, attr, this.getCommandSource(configurationNodeId, DataSourceTypeEnum.DATASOURCE, dataSourceJson))
       subscribers.push(subscribe)
       subscribers.push(subscribe)
     }
     }
 
 

@@ -34,7 +34,7 @@ export const useContentDataStore = defineStore('app-content-data', {
   actions: {
   actions: {
 
 
     getNodeDataById(id: string): Undefineable<NodeDataType> {
     getNodeDataById(id: string): Undefineable<NodeDataType> {
-      const data = this.contentData.find(item => item.id === id)
+      const data = this.contentData.find(item => item.configurationNodeId === id)
       return data
       return data
     },
     },
 
 
@@ -68,7 +68,7 @@ export const useContentDataStore = defineStore('app-content-data', {
       const { cellInfo } = config
       const { cellInfo } = config
       const { id } = cellInfo || {}
       const { id } = cellInfo || {}
       if (!id) return null
       if (!id) return null
-      return this.contentData.find(item => item.id === id) || null
+      return this.contentData.find(item => item.configurationNodeId === id) || null
     },
     },
 
 
     setPermissions(string: string[]) {
     setPermissions(string: string[]) {