perf: socket send message optimize

ww
1 parent cc2941d6
Showing 3 changed files with 328 additions and 95 deletions
src/main/webapp/js/const/const.js
src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Charts.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/const/const.js
View file @d69a95b
+++ b/src/main/webapp/js/const/const.js
View file @d69a95b
@@ -33,7 +33,6 @@ const GLOBAL_PLATFORM_INFO = (() => {
 	 * @type {{JWT_TOKEN: {value: string}}}
 	 */
 	const common = ls.get(GLOBAL_PLATFORM_INFO_KEY) 
-	console.log(common)
 	return common
 })()
--- a/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Charts.js
View file @d69a95b
+++ b/src/main/webapp/js/diagramly/sidebar/thingskit/Sidebar-Charts.js
View file @d69a95b
@@ -174,10 +174,15 @@
 		if (!chartDom) return
 		chartDom.style.width = `${width}px`
 		chartDom.style.height = `${height}px`
-		const myChart = echarts.init(chartDom);
-		const option = chartOptionMapping[chartType] ? chartOptionMapping[chartType]() : {}
-		option && myChart.setOption(option);
-		chartsInstanceMapping.set(id, myChart)
+		try {
+			const myChart = echarts.init(chartDom);
+			const option = chartOptionMapping[chartType] ? chartOptionMapping[chartType]() : {}
+			option && myChart.setOption(option);
+			chartsInstanceMapping.set(id, myChart)
+		} catch (error) {
+
+		}
+
 	}
 	/**
--- a/src/main/webapp/js/grapheditor/Format.js
View file @d69a95b
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @d69a95b
@@ -13033,18 +13033,56 @@ function previewAction(editorUi, currentPage) {
 class DispatchCenter {
     /**
-     * @description 节点映射
-     * @type {Map<string, Map<string, object>>}
-     */
-    nodeMapping
-
-    /**
      * @description cmd ID 与 node 映射关系
      * @type {Map<number, string>}
      */
     cmdIdMapping = new Map()
     /**
+     * @type { Map<string, {
+     * deviceId: string,
+     * dataOrigin: 'dataSources' | 'act',
+     * slaveDeviceId: string,
+     * nodeId: string,
+     * attr: string
+     * condition?: { max?: number, min?: number },
+     * additional?: {
+     *  agg?: string,
+     *  attrName?: string,
+     *  dataType?: 'tsSubCmds' | 'historyCmds',
+     *  deviceName?: string,
+     *  effectScope?: string,
+     *  interval?: string,
+     *  orgName?: string,
+     *  slaveDeviceName?: string
+     * }
+     * }[]>}
+     */
+    deviceIdMapping = new Map()
+
+    /**
+     * @type {Map<number, {
+     * deviceId: string,
+     * slaveDeviceId: string,
+     * nodeId: string,
+     * attr: string
+     * dataOrigin: 'dataSources' | 'act',
+     * condition?: { max?: number, min?: number },
+     * additional?: {
+     *  agg?: string,
+     *  attrName?: string,
+     *  dataType?: 'tsSubCmds' | 'historyCmds',
+     *  deviceName?: string,
+     *  effectScope?: string,
+     *  interval?: string,
+     *  orgName?: string,
+     *  slaveDeviceName?: string
+     * }
+     * }[]>}
+     */
+    subscribeIdMapping = new Map()
+
+    /**
      * @description
      */
     editorUi
@@ -13150,7 +13188,6 @@ class DispatchCenter {
     constructor(editorUi, currentPage) {
-        this.nodeMapping = new Map()
         this.editorUi = editorUi
         this.init(editorUi, currentPage)
     }
@@ -13169,6 +13206,7 @@ class DispatchCenter {
         this.dataInteractionInstance = new HandleDataInteraction(this)
         this.dynamicEffectInstance = new HandleDynamicEffect(this)
         this.updateQueueInstance = new UpdateQueue(this)
+        this.sendSubscribeMessage()
     }
     /**
@@ -13176,7 +13214,7 @@ class DispatchCenter {
      */
     connectSocket() {
         Ws.instance?.destroy?.()
-        this.socket = Ws.getInstance({ url: GLOBAL_WS_URL(), onmessageCallback: this.socketOnmessage })
+        this.socket = Ws.getInstance({ url: GLOBAL_WS_URL(), onmessageCallback: this.socketOnMessage.bind(this) })
     }
     /**
@@ -13185,9 +13223,29 @@ class DispatchCenter {
      * @param event
      * @param ws
      */
-    socketOnmessage(message, event, ws) {
-        const { subscriptionId, data } = message
-        DispatchCenter.instance.publishEvent(subscriptionId, data, message, event, ws)
+    socketOnMessage(message, event, ws) {
+        const { subscriptionId, errorMsg } = message
+        if (errorMsg) return
+        const subList = this.subscribeIdMapping.get(subscriptionId)
+        subList.forEach(item => {
+            const { dataOrigin, additional } = item
+            if (dataOrigin === 'dataSources') {
+                if (additional)
+                    this.dataSourceHandlerInstance.updateRealTimeDataSource(message, item)
+                else
+                    this.dataSourceHandlerInstance.updateCommonDataSource(message, item)
+            }
+            if (dataOrigin === 'act') {
+                const { type } = item
+                // this.dynamicEffectInstance.videoPlay()
+                const handleFunction = this.dynamicEffectInstance.dispatch.call(this.dynamicEffectInstance, type)
+                handleFunction(message, item)
+            }
+        })
+        // this.subscribeEvent(cmdId, this.updateCommonDataSource.bind(this))
+        return
+        // const { subscriptionId, data } = message
+        // DispatchCenter.instance.publishEvent(subscriptionId, data, message, event, ws)
     }
     /**
@@ -13220,6 +13278,175 @@ class DispatchCenter {
         this.contentData = res
     }
+    sendSubscribeMessage() {
+        const message = this.generateSubscribeMessage()
+        this.socket.send(JSON.stringify(message))
+    }
+
+    /**
+     * @description 创建订阅消息
+     */
+    generateSubscribeMessage() {
+
+        /**
+         * @type {{dataSources: [], act: [], event: [], enabled: boolean}}
+         */
+        const data = JSON.parse(JSON.stringify(this.contentData))
+        delete data.enabled
+
+        /**
+         *
+         * @param {'dataSources' | 'act'} key
+         * @param {{
+         * id: string,
+         * enabled: boolean,
+         * deviceId: string,
+         * slaveDeviceId: string,
+         * nodeId: string,
+         * attr: string
+         * condition?: { max?: number, min?: number },
+         * additional?: {
+         *  agg?: string,
+         *  attrName?: string,
+         *  dataType?: 'tsSubCmds' | 'historyCmds',
+         *  deviceName?: string,
+         *  effectScope?: string,
+         *  interval?: string,
+         *  orgName?: string,
+         *  slaveDeviceName?: string
+         * }
+         * }} record 
+         */
+        const setDeviceMapping = (record) => {
+            const { deviceId, slaveDeviceId } = record
+            if (this.deviceIdMapping.has(slaveDeviceId || deviceId)) {
+                const group = this.deviceIdMapping.get(slaveDeviceId || deviceId)
+                group.push(record)
+            } else {
+                this.deviceIdMapping.set(slaveDeviceId || deviceId, [record])
+            }
+        }
+
+        Object.keys(data).forEach(key => {
+            /**
+             * @type {{
+             * id: string,
+             * nodeId: string, 
+             * deviceId: string,
+             * slaveDeviceId: string, 
+             * attr: string, 
+             * enabled: boolean, 
+             * additional: object, 
+             * condition: object
+             * }[]}
+             */
+            const list = data[key]
+            if (key === 'dataSources') {
+                for (const item of list) {
+                    setDeviceMapping({ dataOrigin: key, ...item })
+                }
+            }
+            if (key === 'act') {
+                for (const item of list) {
+                    const { enabled } = item
+                    if (!enabled) continue
+                    setDeviceMapping({ dataOrigin: key, ...item })
+                }
+            }
+        })
+
+        /**
+         * @param {{ 
+         *  entityId: string, 
+         *  cmdId: number, 
+         *  keys: string, 
+         *  agg?: string,
+         *  interval?: number,
+         *  startTs?: number,
+         *  endTs?: number
+         *  }} params
+         * @returns {{ entityType: string, entityId: string, scope: string, cmdId: number, keys: string }}
+         */
+        const generateMessage = (params) => {
+            const getDynamicAttr = (attr) => params[attr] ? { [attr]: params[attr] } : {}
+            return {
+                entityType: 'DEVICE',
+                entityId: params.entityId,
+                cmdId: params.cmdId,
+                keys: params.keys,
+
+                ... (params.interval ? {} : { scope: 'LATEST_TELEMETRY' }),
+                ...getDynamicAttr('agg'),
+                ...getDynamicAttr('interval'),
+                ...getDynamicAttr('startTs'),
+                ...getDynamicAttr('endTs'),
+            }
+        }
+
+        const generateGroupMessage = () => {
+            /**
+             * @type {{
+             * historyCmds: {
+             *   entityType: 'DEVICE',
+             *   entityId: string,
+             *   scope?: 'LATEST_TELEMETRY',
+             *   cmdId: number,
+             *   keys: string,
+             *   startTs?: number
+             *   endTs?: number
+             *  }[],
+             * tsSubCmds: {
+             *   entityType: 'DEVICE',
+             *   entityId: string,
+             *   scope?: 'LATEST_TELEMETRY',
+             *   cmdId: number,
+             *   keys: string,
+             *   startTs?: number
+             *   endTs?: number
+             *  }[]}}
+             */
+            const messageList = { tsSubCmds: [], historyCmds: [] }
+            let cmdId = 0
+
+            const getKeys = (list) => Array.from(new Set(list)).join(',')
+
+            const toNumber = (string, defaultValue = 0) => isNaN(string) ? defaultValue : Number(string)
+
+            const setSubscribeMapping = (cmdId, record) => this.subscribeIdMapping.set(cmdId, record)
+
+            this.deviceIdMapping.forEach((value, key) => {
+                const basicRecord = value.filter(item => !item.additional)
+                const moreFilterRecord = value.filter(item => item.additional)
+
+                const message = generateMessage({ entityId: key, cmdId, keys: getKeys(basicRecord.map(item => item.attr)) })
+                setSubscribeMapping(cmdId, basicRecord)
+                cmdId++
+                moreFilterRecord.forEach(item => {
+                    const { additional = {} } = item
+                    const { dataType = 'tsSubCmds', interval, effectScope, agg } = additional
+                    const message = generateMessage({
+                        entityId: key,
+                        cmdId,
+                        agg,
+                        keys: getKeys(moreFilterRecord.map(item => item.attr)),
+                        interval: toNumber(interval, 1000),
+                        startTs: Date.now() - toNumber(effectScope),
+                        ...(dataType === HandleDataSource.enumDataBindType.REAL ? {} : { endTs: Date.now() })
+                    })
+                    setSubscribeMapping(cmdId, moreFilterRecord)
+                    messageList[dataType].push(message)
+                    cmdId++
+                })
+
+                messageList.tsSubCmds.push(message)
+            })
+
+            return messageList
+        }
+
+        return generateGroupMessage()
+    }
+
     /**
      * @description 发送消息去获取实时数据
      */
@@ -13242,7 +13469,7 @@ class DispatchCenter {
     /**
      * @description 生成节点映射表
      * @param dataSources
-     * @return {{cmdId: number, entityType: string, keys: *, scope: string, entityId: *}[]}
+     * @return {{cmdId: number, entityType: string, keys: string, scope: string, entityId: string}[]}
      */
     generatorDataSourceMapping(dataSources = []) {
         return dataSources.map((datum) => {
@@ -13264,12 +13491,7 @@ class DispatchCenter {
      * @description 分发事件
      */
     publishEvent(eventName, data, message, event, ws) {
-        // data = data ? data : {}
         this.eventBus.emit(eventName, message, event, ws)
-        // console.log(arguments)
-        // Object.keys(data).forEach(() => {
-        //     this.eventBus.emit(eventName, message, event, ws)
-        // })
     }
     /**
@@ -13414,8 +13636,8 @@ class HandleDataSource {
     constructor(DispatchInstance) {
         this.DispatchInstance = DispatchInstance
-        this.generatorCommonDataSourceMapping()
-        this.generatorChartDataSourceMapping()
+        // this.generatorCommonDataSourceMapping()
+        // this.generatorChartDataSourceMapping()
     }
     get graph() {
@@ -13536,10 +13758,12 @@ class HandleDataSource {
      * @description 更新变量值
      * @param {} message 
      */
-    updateCommonDataSource(message) {
-        const { subscriptionId } = message
-        const node = this.getNodeByCmdId(subscriptionId)
-        const { attr } = this.getBindData(subscriptionId)
+    updateCommonDataSource(message, record) {
+        // const { subscriptionId } = message
+        const { nodeId, attr } = record
+        const node = this.getNodeByCmdId(nodeId)
+
+        // const { attr } = this.getBindData(nodeId) 
         node && this.updatePage(() => {
             const { data } = message
             const type = this.getComponentType(node)
@@ -13554,7 +13778,7 @@ class HandleDataSource {
             }
             if (type === this.componentType.IMAGE) {
-                this.handleImageComponent(message)
+                this.handleImageComponent(message, record)
                 return
             }
@@ -13568,11 +13792,11 @@ class HandleDataSource {
      * @description 处理switch 组件
      * @param {} message 
      */
-    handleSwitchComponent(message) {
-        const { subscriptionId, data = {} } = message
-        const node = this.getNodeByCmdId(subscriptionId)
-        const { nodeId, attr } = this.getBindData(subscriptionId)
-        const [[timespan, receiveValue] = []] = data[attr] || []
+    handleSwitchComponent(message, record) {
+        const { data = {} } = message
+        const { nodeId, attr } = record
+        const node = this.getNodeByCmdId(nodeId)
+        const [[_timespan, receiveValue] = []] = data[attr] || []
         const switchConfig = this.DispatchInstance.contentData.act.find(item => item.id === nodeId && item.type === 'SWITCH')
         const { condition = [] } = switchConfig || {}
         let reg = /image=[^;]+/g
@@ -13611,22 +13835,22 @@ class HandleDataSource {
     }
-    handleParamSettingButton(message) {
-        const { subscriptionId, data = {} } = message
+    handleParamSettingButton(message, record) {
+        const { data = {} } = message
         if (!data) return
-        const node = this.getNodeByCmdId(subscriptionId)
-        const { attr } = this.getBindData(subscriptionId)
-        const [[timespan, receiveValue] = []] = data[attr] || []
+        const { nodeId, attr } = record
+        const node = this.getNodeByCmdId(nodeId)
+        const [[_timespan, receiveValue] = []] = data[attr] || []
         this.updatePage(() => {
             node.setAttribute('label', `<button class="param-setting-button">${receiveValue}</button>`)
         }, node)
     }
-    handleImageComponent(message) {
-        const { subscriptionId, data = {} } = message
-        const node = this.getNodeByCmdId(subscriptionId)
-        const { attr } = this.getBindData(subscriptionId)
-        const [[timespan, receiveValue] = []] = data[attr] || []
+    handleImageComponent(message, record) {
+        const { data = {} } = message
+        const { nodeId, attr } = record
+        const node = this.getNodeByCmdId(nodeId)
+        const [[_timespan, receiveValue] = []] = data[attr] || []
         this.updatePage(() => {
             node.setAttribute('label', `<img class="basic-component__image" alt="图片" src="${receiveValue}" />`)
         }, node)
@@ -13635,18 +13859,19 @@ class HandleDataSource {
     /**
      * @description 更新实时数据
      * @param {} message 
-     * @param {} agg  聚合方式
+     * @param {} record  聚合方式
      */
-    updateRealTimeDataSource(message, agg) {
-        const { data = {}, subscriptionId } = message
-        const node = this.getNodeByCmdId(subscriptionId)
+    updateRealTimeDataSource(message, record) {
+        const { data = {} } = message
+        const { nodeId, attr, additional = {} } = record
+        const { agg } = additional
+        const node = this.getNodeByCmdId(nodeId)
         if (!node) return
         const enumConst = Sidebar.prototype.enumCellBasicAttribute
         const chartInstanceMap = Sidebar.prototype.chartsInstanceMapping
         const chartInstanceId = node.getAttribute(enumConst.CHART_INSTANCE_ID)
         const chartInstanceType = node.getAttribute(enumConst.COMPONENT_TYPE)
         const instance = chartInstanceMap.get(chartInstanceId)
-        const { attr = [[]], additional } = this.getBindData(subscriptionId)
         const realDataList = data[attr] || []
         const action = agg === 'NONE' ? 'unshift' : 'push'
@@ -13655,12 +13880,12 @@ class HandleDataSource {
         const isActive = instance.isActive
         if (!isActive) {
             instance.isActive = true
-            const chartOption = this.getChartComponentOption(chartInstanceType, { chartType: chartInstanceType, attr, dataList: realDataList, action, nodeId: node.id , additional})
+            const chartOption = this.getChartComponentOption(chartInstanceType, { chartType: chartInstanceType, attr, dataList: realDataList, action, nodeId: node.id, additional })
             instance.setOption(chartOption)
         } else {
             const oldOptions = instance.getOption()
-            const options = this.getRealTimeUpdateChartOption(chartInstanceType, { oldOptions, dataList: realDataList , additional})
+            const options = this.getRealTimeUpdateChartOption(chartInstanceType, { oldOptions, dataList: realDataList, additional })
             if (!instance) clearInterval(interval)
             instance && instance.setOption(options)
         }
@@ -13669,16 +13894,17 @@ class HandleDataSource {
     /**
      * @description 更新历史数据
      */
-    updateHistoryDataSource(message, agg) {
-        const { data = {}, subscriptionId } = message
-        const node = this.getNodeByCmdId(subscriptionId)
+    updateHistoryDataSource(message, record) {
+        const { data = {} } = message
+        const { nodeId, attr, additional = {} } = record
+        const { agg } = additional
+        const node = this.getNodeByCmdId(nodeId)
         if (!node) return
         const enumConst = Sidebar.prototype.enumCellBasicAttribute
         const chartInstanceMap = Sidebar.prototype.chartsInstanceMapping
         const chartInstanceId = node.getAttribute(enumConst.CHART_INSTANCE_ID)
         const chartInstanceType = node.getAttribute(enumConst.COMPONENT_TYPE)
         const instance = chartInstanceMap.get(chartInstanceId)
-        const { attr = [[]], additional } = this.getBindData(subscriptionId)
         const historyDataList = data[attr] || []
         const showNumberOf = 4
         const action = agg === 'NONE' ? 'unshift' : 'push'
@@ -13965,11 +14191,10 @@ class HandleDataSource {
     /**
      * @description 获取仪表盘配置
      */
-    getRealTimeUpdateDashboardChartOption(params = { dataList: [] , additional: {}}) {
+    getRealTimeUpdateDashboardChartOption(params = { dataList: [], additional: {} }) {
         const { dataList = [], oldOptions, additional } = params
         const { attrName } = additional
         const [timespan, value] = dataList[0] || []
-        console.log(value)
         return {
             series: [
                 {
@@ -13990,8 +14215,7 @@ class HandleDataSource {
      * @param actionType
      * @return {{attr: string, additional: { agg: string, dataType: string, effectScope: string, interval: string, unit: string, orgName: string, deviceName: string, slaveDeviceName: string, attrName: string }}}
      */
-    getBindData(subscriptionId) {
-        const nodeId = this.getNodeIdByCmdId(subscriptionId)
+    getBindData(nodeId) {
         const temp = this.dataSourceNodeMapping.get(nodeId) || {}
         return temp
     }
@@ -14011,7 +14235,8 @@ class HandleDataSource {
      * @return {string}
      */
     getNodeIdByCmdId(subscriptionId) {
-        return this.DispatchInstance.cmdIdMapping.get(subscriptionId)
+        // return this.DispatchInstance.cmdIdMapping.get(subscriptionId)
+        return this.DispatchInstance.subscribeIdMapping.get(subscriptionId)
     }
     /**
@@ -14019,8 +14244,8 @@ class HandleDataSource {
     * @param subscriptionId
     * @return {*}
     */
-    getNodeByCmdId(subscriptionId) {
-        const nodeId = this.getNodeIdByCmdId(subscriptionId)
+    getNodeByCmdId(nodeId) {
+        // const nodeId = this.getNodeIdByCmdId(subscriptionId)
         return this.contentAllCell.find(item => item.id === nodeId)
     }
@@ -14634,7 +14859,7 @@ class HandleDynamicEffect {
      */
     generatorMappingRelation() {
         this.videoPlay()
-        const tsSubCmds = []
+        // const tsSubCmds = []
         this.enableActList.forEach(each => {
             const { id, type, attr, deviceId, slaveDeviceId } = each
@@ -14642,13 +14867,13 @@ class HandleDynamicEffect {
             const temp = this.actNodeMapping.get(id)
             temp.value.set(type, each)
-            const cmdId = this.DispatchInstance.getCmdId(id)
+            // const cmdId = this.DispatchInstance.getCmdId(id)
-            tsSubCmds.push(this.generatorMessage(slaveDeviceId ? slaveDeviceId : deviceId, cmdId, attr))
+            // tsSubCmds.push(this.generatorMessage(slaveDeviceId ? slaveDeviceId : deviceId, cmdId, attr))
-            this.subscribeEvent(cmdId, this.dispatch(type))
+            // this.subscribeEvent(cmdId, this.dispatch(type))
         })
-        if (tsSubCmds.length) this.sendMsg({ tsSubCmds })
+        // if (tsSubCmds.length) this.sendMsg({ tsSubCmds })
     }
     /**
@@ -14718,15 +14943,16 @@ class HandleDynamicEffect {
      * @param message
      * @param attr
      */
-    rotate(message) {
-        const { subscriptionId, data } = message
-        const node = this.getNodeByCmdId(subscriptionId)
+    rotate(message, record) {
+        const { data } = message
+        const { id } = record
+        const node = this.getNodeByCmdId(id)
         const key = node.id + DispatchCenter.enumDynamicEffectType.ROTATE
         if (!this.validatePriority(node.id)) {
             this.delUpdateFn(key)
             return
         }
-        const { flag } = this.validate(subscriptionId, DispatchCenter.enumDynamicEffectType.ROTATE, data)
+        const { flag } = this.validate(record, DispatchCenter.enumDynamicEffectType.ROTATE, data)
         let deg = 0
         const updateFn = () => {
             if (deg === 360) deg = 0
@@ -14750,11 +14976,12 @@ class HandleDynamicEffect {
      * @param message
      * @param attr
      */
-    display(message) {
-        const { subscriptionId, data = {} } = message
-        const { flag, condition } = this.validate(subscriptionId, HandleDynamicEffect.enumActType.DISPLAY, data)
+    display(message, record) {
+        const { data = {} } = message
+        const { id } = record
+        const { flag, condition } = this.validate(record, HandleDynamicEffect.enumActType.DISPLAY, data)
         if (!flag) return
-        const node = this.getNodeByCmdId(subscriptionId)
+        const node = this.getNodeByCmdId(id)
         let isShow = false
         if (condition.type === HandleDynamicEffect.enumDisplayType.SHOW) {
             isShow = true
@@ -14784,15 +15011,16 @@ class HandleDynamicEffect {
      * @param message
      * @param attr
      */
-    flash(message) {
-        const { subscriptionId, data } = message
-        const node = this.getNodeByCmdId(subscriptionId)
+    flash(message, record) {
+        const { data } = message
+        const { id } = record
+        const node = this.getNodeByCmdId(id)
         const key = node.id + DispatchCenter.enumDynamicEffectType.FLASH
-        if (!this.validatePriority(node.id)) {
+        if (!this.validatePriority(id)) {
             this.delUpdateFn(key)
             return
         }
-        const { flag, condition } = this.validate(subscriptionId, HandleDynamicEffect.enumActType.FLASH, data)
+        const { flag } = this.validate(record, HandleDynamicEffect.enumActType.FLASH, data)
         let flashFlag = false
         const updateFn = () => {
             node.setVisible(flashFlag)
@@ -14810,10 +15038,11 @@ class HandleDynamicEffect {
     /**
      * @description 处理变量图片
      */
-    varImage(message) {
-        const { subscriptionId, data } = message
-        const node = this.getNodeByCmdId(subscriptionId)
-        const { flag, condition } = this.validate(subscriptionId, HandleDynamicEffect.enumActType.IMAGE, data)
+    varImage(message, record) {
+        const { data } = message
+        const { id } = record
+        const node = this.getNodeByCmdId(id)
+        const { flag, condition } = this.validate(record, HandleDynamicEffect.enumActType.IMAGE, data)
         if (flag && node) {
             const { imagePath } = condition
             this.insertOnceUpdateFn(
@@ -14822,7 +15051,7 @@ class HandleDynamicEffect {
                     node.setStyle(`image;image=${imagePath};imageAspect=0;`)
                 })
         } else if (!flag && node) {
-            const { condition = [], attr } = this.getBindData(subscriptionId, HandleDynamicEffect.enumActType.IMAGE)
+            const { condition = [], attr } = record
             const flag = HandleDynamicEffect.enumVarImageConst.DEFAULT_IMAGE_FLAG
             const defaultBindData = condition.find(item => item[flag])
             if (defaultBindData) {
@@ -14837,11 +15066,12 @@ class HandleDynamicEffect {
         }
     }
-    running(message) {
-        const { subscriptionId, data = {} } = message
-        const { flag, condition } = this.validate(subscriptionId, HandleDynamicEffect.enumActType.RUNNING, data)
+    running(message, record) {
+        const { id } = record
+        const { data = {} } = message
+        const { flag, condition } = this.validate(record, HandleDynamicEffect.enumActType.RUNNING, data)
         if (!flag) return
-        const node = this.getNodeByCmdId(subscriptionId)
+        const node = this.getNodeByCmdId(id)
         let isRun = false
         if (condition.type === HandleDynamicEffect.enumRunningType.RUN) {
             isRun = true
@@ -14897,7 +15127,7 @@ class HandleDynamicEffect {
             const { geometry = {} } = cell
             const { width, height } = geometry
             const idEl = getIdEl()
-            graph.getModel().beginUpdate() 
+            graph.getModel().beginUpdate()
             try {
                 let type
                 if (videoUrl.replace(reg, '') === 'm3u8') type = 'application/x-mpegURL'
@@ -14939,13 +15169,13 @@ class HandleDynamicEffect {
     /**
      * @description 验证是否满足条件列表中的任意一条
-     * @param subscriptionId
+     * @param record
      * @param type
      * @param value
      * @return {{flag: boolean, condition: {}}}
      */
-    validate(subscriptionId, type, value) {
-        const { condition = [], attr } = this.getBindData(subscriptionId, type)
+    validate(record, type, value) {
+        const { condition = [], attr } = record
         const result = { condition: {}, flag: false }
         for (let i = 0; i < condition.length; i++) {
             const { min, max } = condition[i]
@@ -14996,8 +15226,7 @@ class HandleDynamicEffect {
      * @param subscriptionId
      * @return {*}
      */
-    getNodeByCmdId(subscriptionId) {
-        const nodeId = this.getNodeIdByCmdId(subscriptionId)
+    getNodeByCmdId(nodeId) {
         return this.contentAllCell.find(item => item.id === nodeId)
     }