feat: 参数设置新增modbus指令下发选项

ww
1 parent e790793c
Showing 1 changed file with 376 additions and 202 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @cae021b
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @cae021b
@@ -7641,7 +7641,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         const COMMAND_TYPE_ENUM = {
             CUSTOM: '0',
-            SERVICE: '1'
+            SERVICE: '1',
+            MODBUS: '2'
         }
         /**
@@ -7681,7 +7682,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 form.val(enumActionEl.INPUT_DATA_FORM_FILTER, content[enumConst.SERVICE_COMMAND])
             }
-            controlFormDisplay(content.type, isTCPTransportType, isCustom)
+            controlFormDisplay(content.type, val)
             form.val(enumActionEl.FORM_FILTER, val)
         }
@@ -7690,40 +7691,26 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @description 控制form
          * @param {enumActionType} value
          */
-        async function controlFormDisplay(value, isTCP, isCustom) {
+        async function controlFormDisplay(value, formValue) {
+            $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'none' })
+            $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'none' })
+            $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
+            $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'none' })
+            $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'none' })
+            $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
+            $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
+            $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: 'none' })
+            $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
+
             if (value === enumActionType.PAGE) {
-                $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'none' })
                 $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'block' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
-                $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'none' })
-                $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'none' })
-
-                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
-                $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
-                $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: 'none' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
             } else if (value === enumActionType.LINK) {
-                $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'none' })
                 $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'block' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
-                $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'none' })
-                $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'none' })
-
-                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
-                $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
-                // $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: 'none' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
             } else if (value === enumActionType.PARAMS_SETTING) {
-                $(`#${enumActionEl.LINK_EL_ID}`).css({ display: 'none' })
-                $(`#${enumActionEl.PAGE_EL_ID}`).css({ display: 'none' })
-                // $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'flex' })
                 $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'block' })
-
-                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: isCustom ? 'none' : 'block' })
-                $(`#${enumActionEl.WAY_SELECT}`).css({ display: !isTCP && isCustom ? 'block' : 'none' })
-                $(`#${enumActionEl.SERVICE_EL}`).css({ display: isCustom ? 'none' : 'block' })
-                // $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: isTCP && isCustom ? 'block' : 'none' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCP && isCustom ? 'flex' : 'none' })
+                const { commandType, transportType } = formValue
+                handleDiffCommandType(commandType, transportType === 'TCP')
+                editorAssignValue()
             }
         }
@@ -7746,29 +7733,41 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             if (isParamsSetting) {
                 const isCustom = formVal[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
+                const commandType = formVal[enumConst.COMMAND_TYPE]
                 let inputData = form.val(enumActionEl.INPUT_DATA_FORM_FILTER)
                 const validateParamsSetting = () => {
-                    if (isCustom) {
+                    if (commandType === COMMAND_TYPE_ENUM.CUSTOM) {
                         if (isTCPTransportType) {
-                            const dataSource = currentNodeData?.dataSources?.[0]
-                            if (dataSource) {
-                                const additional = dataSource?.additional || {}
-                                if (dataSource?.deviceType !== 'SENDOR' && !additional?.deviceCode) {
-                                    UseLayUi.topErrorMsg('设备地址码不存在')
-                                    return false
-                                }
+                            if (!formVal[enumConst.TCP_COMMAND]) {
+                                UseLayUi.topErrorMsg('请输入自定义下发指令')
+                                return false
                             }
-                            // if (!formVal[enumConst.TCP_COMMAND]) {
-                            //     UseLayUi.topErrorMsg('请输入自定义下发指令')
-                            //     return false
-                            // }
                         } else {
                             if (!isJson(formVal[enumConst.JSON_COMMAND])) {
                                 UseLayUi.topErrorMsg('命令配置存在错误')
                                 return false
                             }
                         }
+                    } else if (commandType === COMMAND_TYPE_ENUM.MODBUS) {
+                        const dataSource = currentNodeData?.dataSources?.[0]
+                        if (dataSource) {
+                            const additional = dataSource?.additional || {}
+                            if (dataSource?.deviceType !== 'SENDOR' && !additional?.deviceCode) {
+                                UseLayUi.topErrorMsg('设备地址码不存在')
+                                return false
+                            }
+
+                            if (UseLayUi.isNullOrUnDef(additional?.registerAddress)) {
+                                UseLayUi.topErrorMsg('寄存器地址不存在')
+                                return false
+                            }
+
+                            if (UseLayUi.isNullOrUnDef(additional?.method)) {
+                                UseLayUi.topErrorMsg('操作类型不存在')
+                                return false
+                            }
+                        }
                     } else {
                         if (!formVal[enumConst.SERVICE]) {
                             UseLayUi.topErrorMsg('请选择服务')
@@ -7779,6 +7778,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                             return flag
                         }
                     }
+
                     return true
                 }
@@ -7790,6 +7790,19 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 }
             }
+            const getParamsSettingData = (formVal = {}) => {
+                let fields = [enumConst.COMMAND_TYPE, enumConst.TRANSPORTTYPE, enumConst.WAY]
+                const commandType = formVal[enumConst.COMMAND_TYPE]
+
+                if (commandType === COMMAND_TYPE_ENUM.CUSTOM) {
+                    fields = [...fields, enumConst.JSON_COMMAND, enumConst.TCP_COMMAND]
+                } else if (commandType === COMMAND_TYPE_ENUM.SERVICE) {
+                    fields = [...fields, enumConst.CALL_TYPE, enumConst.IDENTIFIER, enumConst.SERVICE, enumConst.SERVICE_COMMAND, enumConst.SERVICE_ORIGINAL_CONFIGURATION]
+                }
+
+                return fields.reduce((prev, next) => ({ ...prev, [next]: formVal[next] }), {})
+            }
+
             const data = {
                 type: event.data.type,
                 configurationId,
@@ -7800,18 +7813,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 content: {
                     type: formVal[enumConst.ACTION],
                     value: formVal[enumGetValue[formVal[enumConst.ACTION]]],
-                    ...(isParamsSetting ? {
-                        [enumConst.CALL_TYPE]: formVal[enumConst.CALL_TYPE],
-                        [enumConst.IDENTIFIER]: formVal[enumConst.IDENTIFIER],
-                        [enumConst.JSON_COMMAND]: formVal[enumConst.JSON_COMMAND],
-                        [enumConst.WAY]: isTCPTransportType ? 'oneway' : formVal[enumConst.WAY],
-                        [enumConst.COMMAND_TYPE]: formVal[enumConst.COMMAND_TYPE],
-                        [enumConst.TCP_COMMAND]: formVal[enumConst.TCP_COMMAND],
-                        [enumConst.TRANSPORTTYPE]: formVal[enumConst.TRANSPORTTYPE],
-                        [enumConst.SERVICE]: formVal[enumConst.SERVICE],
-                        [enumConst.SERVICE_COMMAND]: formVal[enumConst.SERVICE_COMMAND],
-                        [enumConst.SERVICE_ORIGINAL_CONFIGURATION]: formVal[enumConst.SERVICE_ORIGINAL_CONFIGURATION],
-                    } : {}),
+                    ...(isParamsSetting ? getParamsSettingData(formVal) : {}),
                 },
             }
             await to(autoSaveGraphInfo())
@@ -7843,6 +7845,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function generateCommandTypeOptions() {
             const options = [
                 { name: '自定义命令', id: COMMAND_TYPE_ENUM.CUSTOM },
+                { name: 'modbus命令', id: COMMAND_TYPE_ENUM.MODBUS },
                 { name: '服务调用', id: COMMAND_TYPE_ENUM.SERVICE },
             ]
             return UseLayUi.generateOptionTemplate({ dataSource: options, addPlaceholderOption: false })
@@ -7856,6 +7859,24 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             return UseLayUi.generateOptionTemplate({ dataSource: options, addPlaceholderOption: false })
         }
+        function handleDiffCommandType(type, isTCPTransportType) {
+            $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
+            $(`#${enumActionEl.WAY_SELECT}`).css({ display: 'none' })
+            $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
+            $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: 'none' })
+            $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: 'none' })
+
+            if (type === COMMAND_TYPE_ENUM.CUSTOM) {
+                $(`#${enumActionEl.WAY_SELECT}`).css({ display: isTCPTransportType ? 'none' : 'block' })
+                $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: isTCPTransportType ? 'block' : 'NONE' })
+                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: isTCPTransportType ? 'none' : 'flex' })
+            } else if (type === COMMAND_TYPE_ENUM.MODBUS) {
+            } else {
+                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'block' })
+                $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'block' })
+            }
+        }
+
         async function generatorEventListen(data) {
             const info = getLayerBindInfo('event', event.data.type) || {}
             let originType = (info.content || {}).type
@@ -7877,9 +7898,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 form.val(enumActionEl.FORM_FILTER, {
                     [enumConst.COMMAND_TYPE]: COMMAND_TYPE_ENUM.CUSTOM
                 })
-                const isCustom = form.val(enumActionEl.FORM_FILTER)[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
+                const formValue = form.val(enumActionEl.FORM_FILTER)
-                controlFormDisplay(value, transportType === 'TCP', isCustom)
+                controlFormDisplay(value, formValue)
             })
             /**
@@ -7887,13 +7908,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
              */
             form.on(`select(${enumActionEl.COMMAND_TYPE_EL})`, (data) => {
                 const { value } = data
-                const flag = value === COMMAND_TYPE_ENUM.CUSTOM
                 const isTCPTransportType = transportType === 'TCP'
-                $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: flag ? 'none' : 'block' })
-                $(`#${enumActionEl.WAY_SELECT}`).css({ display: !isTCPTransportType && flag ? 'block' : 'none' })
-                $(`#${enumActionEl.SERVICE_EL}`).css({ display: flag ? 'none' : 'block' })
-                // $(`#${enumActionEl.TCP_COMMAND_INPUT}`).css({ display: !isTCPTransportType && flag ? 'block' : 'none' })
-                $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCPTransportType && flag ? 'flex' : 'none' })
+                handleDiffCommandType(value, isTCPTransportType)
+
                 form.val(enumActionEl.FORM_FILTER, { [enumConst.TCP_COMMAND]: '', [enumConst.SERVICE]: '', [enumConst.COMMAND]: '', [enumConst.IDENTIFIER]: '' })
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).html('')
                 editorAssignValue()
@@ -7987,6 +8004,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const stringValue = JSON.stringify(defaultValue, null, 2)
             editor.insert(stringValue)
             $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(stringValue)
+            console.log($(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val())
             editor.session.setMode("ace/mode/json");
             editor.getSession().on('change', (event, editor) => {
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).parent().find(`textarea[name="${enumConst.JSON_COMMAND}"]`).val(editor.getValue())
@@ -8069,12 +8087,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         <div id="${enumActionEl.EDITOR}" style="width: 100%; height: 100%;border: 2px solid #eee;"></div>
                         <textarea name="${enumConst.JSON_COMMAND}" class="layui-textarea" style="display: none;" />
                     </div>
-                    <!-- <div id="${enumActionEl.TCP_COMMAND_INPUT}" style="display: none;">
+                    <div id="${enumActionEl.TCP_COMMAND_INPUT}" style="display: none;">
                         <label class="layui-form-label" style="width: 120px;">命令 ${createHelpMessage('用户预览模式下，点击参数设置后。输入的变量值将作为"attrPlaceholder"的值,并以JSON格式下发给服务器。', 'command')}</label>
                         <div class="layui-input-block" style="margin-left: 150px;">
                             <input type="text" lay-verType="tips" name="${enumConst.TCP_COMMAND}" placeholder="请输入自定义下发命令" class="layui-input">
                         </div>
-                    </div> -->
+                    </div>
                     <div style="display: none;">
                         <input type="text" lay-verType="tips" name="${enumConst.TRANSPORTTYPE}" placeholder="请输入自定义下发命令" class="layui-input">
                     </div>
@@ -8701,7 +8719,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             METHOD: 'method',
             DEVICE_COED: 'deviceCode',
             REGISTER_ADDRESS: 'registerAddress',
-            DATA_TYPE: 'dataType'
+            DATA_TYPE: 'dataType',
+            ACTION_TYPE: 'actionType'
         }
         /**
@@ -8760,6 +8779,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.METHOD]: null,
                         [enumDataSourceConst.REGISTER_ADDRESS]: null,
                         [enumDataSourceConst.DATA_TYPE]: null,
+                        [enumDataSourceConst.ACTION_TYPE]: null,
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_TYPE] = value
@@ -8788,6 +8808,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.METHOD]: null,
                         [enumDataSourceConst.REGISTER_ADDRESS]: null,
                         [enumDataSourceConst.DATA_TYPE]: null,
+                        [enumDataSourceConst.ACTION_TYPE]: null,
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_PROFILE_ID] = value
@@ -8821,6 +8842,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 <div class="layui-form-item" style="margin-bottom: 0; display: none;">
                     <input style="display: none" type="text" name="${enumDataSourceConst.DATA_TYPE}" class="layui-input">
                 </div>
+                <div class="layui-form-item" style="margin-bottom: 0; display: none;">
+                    <input style="display: none" type="text" name="${enumDataSourceConst.ACTION_TYPE}" class="layui-input">
+                </div>
             `
             $(component).append(template)
         }
@@ -8915,7 +8939,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     if (!selected) return
                     form.val(componentFilter, {
-                        [enumDataSourceConst.DEVICE_NAME]: selected?.name,
+                        [enumDataSourceConst.DEVICE_NAME]: selected?.alias || selected?.name,
                         [enumDataSourceConst.DEVICE_COED]: selected?.code,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
@@ -8947,22 +8971,23 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     const selected = thingsModel.find(item => item.identifier === value)
                     if (!selected) return
-                    const type = selected?.extensionDesc?.dataType
+                    // const type = selected?.extensionDesc?.dataType
-                    let method
+                    // let method
-                    if (type === 'short' || type === 'unshort') {
-                        method = '06'
-                    } else if (type === 'bit') {
-                        method = '05'
-                    } else {
-                        method = '10'
-                    }
+                    // if (type === 'short' || type === 'unshort') {
+                    //     method = '06'
+                    // } else if (type === 'bit') {
+                    //     method = '05'
+                    // } else {
+                    //     method = '10'
+                    // }
                     form.val(componentFilter, {
-                        [enumDataSourceConst.METHOD]: method,
+                        [enumDataSourceConst.METHOD]: selected?.extensionDesc?.actionType,
                         [enumDataSourceConst.REGISTER_ADDRESS]: selected?.extensionDesc?.registerAddress,
                         [enumDataSourceConst.DATA_TYPE]: selected?.extensionDesc?.dataType,
+                        [enumDataSourceConst.ACTION_TYPE]: selected?.extensionDesc?.actionType,
                     })
                 }
             })
@@ -8974,7 +8999,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          * @param {{orgId: string, deviceId: string, slaveDeviceId?: string, attr: string}} dataSource
          */
         function echoDataSource(dataSource = {}) {
-            const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, dataType } = dataSource
+            const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, dataType, actionType } = dataSource
             const queue = []
             currentDataSource = { organizationId: orgId, deviceProfileId, deviceType }
             queue.push(getProduct(deviceType))
@@ -8995,7 +9020,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         method,
                         deviceCode,
                         registerAddress,
-                        dataType
+                        dataType,
+                        actionType
                     })
                 })
@@ -13227,6 +13253,176 @@ class UseLayUi {
     constructor() {
     }
+    static numberToHex(value) {
+        function InsertString(t, c, n) {
+            var r = new Array();
+
+            for (var i = 0;
+                i * 2 < t.length;
+                i++) {
+                r.push(t.substr(i * 2, n));
+
+            }
+            return r.join(c);
+
+        }
+        function FillString(t, c, n, b) {
+            if ((t == "") || (c.length != 1) || (n <= t.length)) {
+                return t;
+
+            }
+            var l = t.length;
+
+            for (var i = 0;
+                i < n - l;
+                i++) {
+                if (b == true) {
+                    t = c + t;
+
+                } else {
+                    t += c;
+
+                }
+            }
+            return t;
+
+        }
+        function SingleToHex(t) {
+            if (t == "") {
+                return "";
+
+            }
+            t = parseFloat(t);
+
+            if (isNaN(t) == true) {
+                return "Error";
+
+            }
+            if (t == 0) {
+                return "00000000";
+
+            }
+            var s,
+                e,
+                m;
+
+            if (t > 0) {
+                s = 0;
+
+            } else {
+                s = 1;
+
+                t = 0 - t;
+
+            }
+            m = t.toString(2);
+
+            if (m >= 1) {
+                if (m.indexOf(".") == -1) {
+                    m = m + ".0";
+
+                }
+                e = m.indexOf(".") - 1;
+
+            } else {
+                e = 1 - m.indexOf("1");
+
+            }
+            if (e >= 0) {
+                m = m.replace(".", "");
+
+            } else {
+                m = m.substring(m.indexOf("1"));
+
+            }
+            if (m.length > 24) {
+                m = m.substr(0, 24);
+
+            } else {
+                m = FillString(m, "0", 24, false)
+            }
+            m = m.substring(1);
+
+            e = (e + 127).toString(2);
+
+            e = FillString(e, "0", 8, true);
+
+            var r = parseInt(s + e + m, 2).toString(16);
+
+            r = FillString(r, "0", 8, true);
+
+            return InsertString(r, " ", 2).toUpperCase();
+
+        }
+        function FormatHex(t, n, ie) {
+            var r = new Array();
+
+            var s = "";
+
+            var c = 0;
+
+            for (var i = 0;
+                i < t.length;
+                i++) {
+                if (t.charAt(i) != " ") {
+                    s += t.charAt(i);
+
+                    c += 1;
+
+                    if (c == n) {
+                        r.push(s);
+
+                        s = "";
+
+                        c = 0;
+
+                    }
+                }
+                if (ie == false) {
+                    if ((i == t.length - 1) && (s != "")) {
+                        r.push(s);
+
+                    }
+                }
+            }
+            return r.join("\n");
+
+        }
+        function FormatHexBatch(t, n, ie) {
+            var a = t.split("\n");
+
+            var r = new Array();
+
+            for (var i = 0;
+                i < a.length;
+                i++) {
+                r[i] = FormatHex(a[i], n, ie);
+
+            }
+            return r.join("\n");
+
+        }
+        function SingleToHexBatch(t) {
+            var a = t.split("\n");
+
+            var r = new Array();
+
+            for (var i = 0;
+                i < a.length;
+                i++) {
+                r[i] = SingleToHex(a[i]);
+
+            }
+            return r.join("\r\n");
+
+        }
+        return SingleToHex(value)
+    }
+
+    static isNullOrUnDef = value => {
+        return value === null || value === undefined
+    }
+
     static isFunction = fn => {
         const result = Object.prototype.toString.call(fn)
         return result === '[object Function]' || result === '[object AsyncFunction]'
@@ -14674,16 +14870,34 @@ class DispatchCenter {
             const setSubscribeMapping = (cmdId, record) => this.subscribeIdMapping.set(cmdId, record)
+            const componentType = Sidebar.prototype.enumComponentType
+
+            const attributeFieldEnum = Sidebar.prototype.enumCellBasicAttribute
+
             this.deviceIdMapping.forEach((value, key) => {
-                const basicRecord = value.filter(item => !item.additional)
-                const moreFilterRecord = value.filter(item => item.additional)
-                const message = basicRecord.length ? generateMessage({ entityId: key, cmdId, keys: getKeys(basicRecord.map(item => item.attr)) }) : null
-                basicRecord.length && setSubscribeMapping(cmdId, basicRecord)
+                const chartRecord = []
+                const otherRecord = []
+                for (const item of value) {
+                    const id = item.nodeId
+                    const cell = this.graph.model.getCell(id)
+                    if (cell) {
+                        const type = cell.getAttribute(attributeFieldEnum.COMPONENT_TYPE)
+                        if ([componentType.LINE_CHART, componentType.BAR_CHART, componentType.DASHBOARD_CHART].includes(type)) {
+                            chartRecord.push(item)
+                            continue
+                        }
+                    }
+
+                    otherRecord.push(item)
+                }
+
+                const message = otherRecord.length ? generateMessage({ entityId: key, cmdId, keys: getKeys(otherRecord.map(item => item.attr)) }) : null
+                otherRecord.length && setSubscribeMapping(cmdId, otherRecord)
                 cmdId++
                 // 图表控件订阅
-                moreFilterRecord.forEach(item => {
+                chartRecord.forEach(item => {
                     const { additional = {} } = item
                     const { dataType = 'tsSubCmds', interval, effectScope, agg } = additional
                     const message = generateMessage({
@@ -14706,7 +14920,8 @@ class DispatchCenter {
             return messageList
         }
-        return generateGroupMessage()
+        const returnMessage = generateGroupMessage()
+        return returnMessage
     }
     /**
@@ -14729,49 +14944,12 @@ class DispatchCenter {
     }
     /**
-     * @description 生成节点映射表
-     * @param dataSources
-     * @return {{cmdId: number, entityType: string, keys: string, scope: string, entityId: string}[]}
-     */
-    generatorDataSourceMapping(dataSources = []) {
-        return dataSources.map((datum) => {
-            const { deviceId, attr, nodeId, slaveDeviceId } = datum
-            const cmdId = this.getCmdId(nodeId)
-            const sendMsgTemplate = {
-                entityType: "DEVICE",
-                entityId: slaveDeviceId ? slaveDeviceId : deviceId,
-                scope: "LATEST_TELEMETRY",
-                cmdId,
-                keys: attr,
-            }
-            this.subscribeDataSources(datum, cmdId, attr)
-            return sendMsgTemplate
-        })
-    }
-
-    /**
      * @description 分发事件
      */
     publishEvent(eventName, data, message, event, ws) {
         this.eventBus.emit(eventName, message, event, ws)
     }
-    /**
-     * @description 订阅数据源
-     * @param datum
-     * @param eventName
-     * @param key
-     */
-    subscribeDataSources(datum, eventName, key) {
-        const node = this.contentAllCell.find(item => item.id === datum.nodeId)
-        this.eventBus.on(eventName, (message) => {
-            node && this.updatePage(() => {
-                const { data } = message
-                const [[timespan, value]] = data[key]
-                node.setValue(value)
-            }, node)
-        })
-    }
     /**
      * @description 更新页面
@@ -15177,39 +15355,7 @@ class HandleDataSource {
         const chartOption = this.getChartComponentOption(chartInstanceType, { dataList: historyDataList, attr, chartType: chartInstanceType, action, additional })
-        let interval
-        // TODO 清除定时器
-        function autoMove() {
-            if (seriesValue.length <= 5) return
-            interval = setInterval(() => {
-                if (Number(chartOption.dataZoom[0].endValue) === seriesValue.length - 1) {
-                    chartOption.dataZoom[0].endValue = showNumberOf
-                    chartOption.dataZoom[0].startValue = 0
-                } else {
-                    chartOption.dataZoom[0].endValue = chartOption.dataZoom[0].endValue + 1
-                    chartOption.dataZoom[0].startValue = chartOption.dataZoom[0].startValue + 1
-                }
-                if (!chartInstanceMap.has(chartInstanceId)) {
-                    clearInterval(interval)
-                    return
-                }
-                instance && instance.setOption(chartOption)
-
-            }, 2000);
-        }
-
-        function stop() {
-            clearInterval(interval)
-        }
-
-        function goMove() {
-            autoMove()
-        }
-
         instance.setOption(chartOption)
-        // instance.on('mouseover', stop)
-        // instance.on('mouseout', goMove)
-        // autoMove()
     }
     getChartComponentOption(chartInstanceType, params) {
@@ -15320,18 +15466,20 @@ class HandleDataSource {
     getRealTimeUpdateBasicChartOption(params = { oldOptions: {}, dataList: [], additional: {} }) {
         const { oldOptions, dataList, additional = {} } = params
         const { slaveDeviceName, deviceName, attrName } = additional
-        const xAxisData = oldOptions.xAxis[0].data || []
-        const seriesValue = oldOptions.series[0].data || []
-        const oldEndValue = Number(oldOptions.dataZoom[0].endValue) || 0
-        const oldStartValue = Number(oldOptions.dataZoom[0].startValue) || 0
+        let xAxisData = oldOptions.xAxis[0].data || []
+        let seriesValue = oldOptions.series[0].data || []
         const showNumberOf = 4
+        const maxDataLength = 15
         for (let i = dataList.length - 1; i >= 0; i--) {
             const [timespan, value] = dataList[i]
             xAxisData.push(new Date(Number(timespan)).toLocaleTimeString())
             seriesValue.push(Number(value))
-            xAxisData = xAxisData.slice(0, 30)
-            seriesValue = seriesValue.slice(0, 30)
+        }
+
+        if (xAxisData?.length > maxDataLength) {
+            xAxisData = xAxisData.slice(xAxisData.length - maxDataLength, xAxisData.length)
+            seriesValue = seriesValue.slice(seriesValue.length - maxDataLength, seriesValue.length)
         }
         if (Number(oldOptions.dataZoom[0].endValue) === seriesValue.length - 1) {
@@ -15619,7 +15767,6 @@ class HandleDataInteraction {
     }
     get contentAllCell() {
-        // return this.graph.getDefaultParent().children || []
         return Object.entries(this.graph?.getModel()?.cells || {}).map(([_, item]) => item) || []
     }
@@ -15918,7 +16065,7 @@ class HandleDataInteraction {
                         <div class="layui-form-item">
                             <label class="layui-form-label" style="width: 120px;">自定义下发值</label>
                             <div class="layui-input-block" style="margin-left: 150px;">
-                                <input type="text" name="${enumActionEl.SERVICE_TCP_COMMAND}" lay-verify="required" autocomplete="off" disabled placeholder="请输入下发值" class="layui-input">
+                                <input type="text" name="${enumActionEl.SERVICE_TCP_COMMAND}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input">
                             </div>
                         </div>
                     </div>
@@ -15933,22 +16080,23 @@ class HandleDataInteraction {
         function createContent() {
             const { commandType, tcpCommand, jsonCommand, serviceCommand, serviceOriginalConfiguration, transportType } = content
-            const isCustom = commandType === '0'
             const isTCP = transportType === 'TCP'
             let template
-            if (isCustom) {
+            if (commandType == '0') {
                 if (isTCP) {
                     template = createCustomTCPParams()
                 } else {
                     template = createCustomJSONParams()
                 }
-            } else {
+            } else if (commandType == '1') {
                 if (isTCP) {
                     template = createServiceTCPParams()
                 } else {
                     template = createServiceInputDataParams()
                 }
+            } else {
+                template = createCustomTCPParams()
             }
             return `<form class="layui-form" lay-filter="${enumActionEl.FORM_FILTER}">${template}</form>`
         }
@@ -16056,50 +16204,65 @@ class HandleDataInteraction {
             const { attr, additional } = dataSource
             let flag = false
             let value
-
-            const isCustom = commandType === '0'
             const isTCP = transportType === 'TCP'
-            let template
-            if (isCustom) {
+            const enumCommandType = {
+                CUSTOM: '0',
+                SERVICE: '1',
+                MODBUS: '2',
+            }
+
+            if (commandType == enumCommandType.MODBUS) {
+                value = data[enumActionEl.CUSTOM_TCP_COMMAND]
+                const { method } = additional
+                const validate = new Validate([
+                    { value, required: true, message: '下发值是必填项' },
+                    ...(method == '05' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []),
+                    ...(method == '06' ? [{ value, message: '下发类型必须为整型', validator(value) { return !isNaN(value) && Number(value) % 1 === 0 } }, { value, message: '最大值不能超过65535', validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : []),
+                    ...(method == '16' ? [{ value, message: '下发类型精确到两位小数', validator(value) { return /^\d+(\.\d{0,2})?$/.test(value) } }] : [])
+                ])
+
+                if (method == '16') {
+                    const hexValue = UseLayUi.numberToHex(value).split(' ').slice(0, 2).join('')
+                    value = [parseInt(hexValue, 16), 0]
+                }
+
+                if (validate.begin()) flag = true
+            } else if (commandType == enumCommandType.SERVICE) {
                 if (isTCP) {
-                    value = data[enumActionEl.CUSTOM_TCP_COMMAND]
-                    const { dataType } = additional
+                    value = content.serviceCommand
                     const validate = new Validate([
                         { value, required: true, message: '下发值是必填项' },
-                        ...(dataType === 'bit' ? [{ value, message: '下发类型必须为0或1', validator(value) { return value == 0 || value == 1 } }] : []),
-                        ...(dataType === 'short' || dataType === 'unshort' ? [{ value, message: '下发类型必须为整型', validator(value) { return value % 1 === 0 } }, { value, message: '最大值不能超过65535', validator(value) { return Number(value) <= parseInt('ffff', 16) } }] : [])
                     ])
                     if (validate.begin()) flag = true
                 } else {
-                    value = data[enumActionEl.CUSTOM_JSON_COMMAND]
-                    const validate = new Validate([
-                        { value, required: true, message: '下发值是必填项' },
-                        { value, message: 'json格式校验不正确', validator: isJson },
-                    ])
-                    if (validate.begin()) {
-                        const replaceValue = currentNode.getAttribute(SWITCH_SEND_VALUE)
+                    value = data
+                    const { flag: validateFlag, value: validateValue } = UseLayUi.validateThingsModelInputDataForm(Utils.stringToJSON(content.serviceOriginalConfiguration), value, true)
+                    if (validateFlag) {
                         flag = true
-                        value = jsonParse(value)
-                        value = replaceAttrPlaceholder(value, attr)
+                        value = validateValue
                     }
-                    template = createCustomJSONParams()
                 }
             } else {
                 if (isTCP) {
-                    value = content.serviceCommand
+                    value = data[enumActionEl.CUSTOM_TCP_COMMAND]
                     const validate = new Validate([
                         { value, required: true, message: '下发值是必填项' },
                     ])
                     if (validate.begin()) flag = true
                 } else {
-                    value = data
-                    const { flag: validateFlag, value: validateValue } = UseLayUi.validateThingsModelInputDataForm(Utils.stringToJSON(content.serviceOriginalConfiguration), value, true)
-                    if (validateFlag) {
+                    value = data[enumActionEl.CUSTOM_JSON_COMMAND]
+                    const validate = new Validate([
+                        { value, required: true, message: '下发值是必填项' },
+                        { value, message: 'json格式校验不正确', validator: isJson },
+                    ])
+                    if (validate.begin()) {
                         flag = true
-                        value = validateValue
+                        value = jsonParse(value)
+                        value = replaceAttrPlaceholder(value, attr)
                     }
                 }
+
             }
             return { flag, value }
@@ -16117,13 +16280,18 @@ class HandleDataInteraction {
             const { additional } = dataSource || {}
             const { method, deviceCode, registerAddress } = additional || {}
+            if (Number(deviceCode) > parseInt('ff', 16) || Number(deviceCode) <= 1) {
+                UseLayUi.topErrorMsg('设备地址码范围不在1~255之间')
+                return
+            }
+
             const params = {
                 crc: 'CRC_16_LOWER',
-                deviceCode,
-                method,
+                deviceCode: Number(deviceCode).toString(16).padStart(2, 0).toUpperCase(),
+                method: Number(method).toString(16).padStart(2, 0),
                 registerAddr: Number(registerAddress),
-                registerNumber: 1,
-                registerValues: [Number(registerValue)]
+                registerNumber: Array.isArray(registerValue) ? 2 : 1,
+                registerValues: Array.isArray(registerValue) ? registerValue.map(item => Number(item)) : [Number(registerValue)]
             }
             const command = await ConfigurationNodeApi.getModbusCommand(params)
@@ -16139,15 +16307,29 @@ class HandleDataInteraction {
              */
             let { command, way, service, callType } = content
             const identifier = content?.identifier
-            const params = content?.transportType === 'TCP'
-                ? await getTCPCommand(value, dataSource)
-                : identifier
+
+            let params
+
+            if (content?.commandType == '0') {
+                params = value
+            }
+
+            if (content?.commandType == '1') {
+                params = identifier
                     ? { [identifier]: value }
                     : value
+            }
+
+            if (content?.commandType == '2') {
+                params = await getTCPCommand(value, dataSource)
+            }
+
+            if (!params) return
             if (service) {
                 way = callType === 'ASYNC' ? 'oneway' : 'twoway'
             }
+
             const instructionData = {
                 method: "methodThingskit",
                 additionalInfo: { cmdType: service ? '1' : 'API' },
@@ -16364,7 +16546,6 @@ class HandleDynamicEffect {
     }
     get contentAllCell() {
-        // return this.graph.getDefaultParent().children || []
         return Object.entries(this.graph?.getModel()?.cells || {}).map(([_, item]) => item) || []
     }
@@ -16399,14 +16580,7 @@ class HandleDynamicEffect {
             if (!this.actNodeMapping.has(id)) this.actNodeMapping.set(id, { display: true, value: new Map() })
             const temp = this.actNodeMapping.get(id)
             temp.value.set(type, each)
-
-            // const cmdId = this.DispatchInstance.getCmdId(id)
-
-            // tsSubCmds.push(this.generatorMessage(slaveDeviceId ? slaveDeviceId : deviceId, cmdId, attr))
-
-            // this.subscribeEvent(cmdId, this.dispatch(type))
         })
-        // if (tsSubCmds.length) this.sendMsg({ tsSubCmds })
     }
     /**