perf: tcp子设备下发参数时使用modbus生成命令

ww
1 parent 2aead0f8
Showing 3 changed files with 124 additions and 27 deletions
src/main/webapp/index.html
src/main/webapp/js/api/index.js
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/index.html
View file @7dc2310
+++ b/src/main/webapp/index.html
View file @7dc2310
@@ -273,7 +273,7 @@
 				// Forces includes for dev environment in node.js
 				mxForceIncludes = true;
 			}
-			if (location.hostname == 'localhost' || location.hostname == '127.0.0.1' || location.hostname == '192.168.10.111') {
+			if (location.hostname == 'localhost' || location.hostname == '127.0.0.1' || location.hostname == '192.168.10.114') {
 				drawDevUrl = `http://${location.hostname}:3000/`;
 				geBasePath = `http://${location.hostname}:3000/js/grapheditor`;
 				mxBasePath = `http://${location.hostname}:3000/mxgraph`;
--- a/src/main/webapp/js/api/index.js
View file @7dc2310
+++ b/src/main/webapp/js/api/index.js
View file @7dc2310
@@ -255,4 +255,9 @@ class ConfigurationNodeApi {
     static getAlarmList(params) {
         return defHttp.post('/yt/alarm/configuration/page', params)
     }
+
+    static getModbusCommand(params) {
+        return defHttp.post('/yt/js/modbus', params)
+    }
+
 }
--- a/src/main/webapp/js/grapheditor/Format.js
View file @7dc2310
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @7dc2310
@@ -5075,7 +5075,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
     /**
      * @description 用于在其他位置获取数据源绑定的数据，在生成数据源面板中进行了改写
-     * @return  {{orgId: string, attr: string, deviceId: string, deviceType: string, deviceProfileId: string}}
+     * @return  {{orgId: string, attr: string, deviceId: string, deviceType: string, deviceProfileId: string, deviceCode: string, registerAddress: string, method: string, dataType: string}}
      */
     function getDataSourceBindValue() {
@@ -5248,7 +5248,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             echoRefreshFn = function () {
                 refreshFn.apply(this)
                 const { dataSources: [dataSource] = [] } = currentNodeData || {}
-                echoDataSource(dataSource)
+                echoDataSource({ ...dataSource, ...(dataSource?.additional || {}) })
                 form.render(null, CONTAINER_FILTER)
             }
@@ -6586,7 +6586,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function getSwitchSubmitValue(field) {
             const dataSources = getDataSourceBindValue()
             const enableStatus = getEnableStatus(field)
-            return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources, ...enableStatus }
+            return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources: { ...dataSources, additional: { deviceCode: dataSources?.deviceCode, method: dataSources?.method, registerAddress: dataSources?.registerAddress, dataType: dataSources?.dataType } }, ...enableStatus }
         }
@@ -7711,7 +7711,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: 'none' })
                 $(`#${enumActionEl.SERVICE_EL}`).css({ display: 'none' })
-                $(`#${enumActionEl.TCP_COMMAND_INPUT}`).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' })
@@ -7720,9 +7720,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 $(`#${enumActionEl.COMMAND_TYPE_EL}`).css({ display: 'block' })
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).css({ display: isCustom ? 'none' : 'block' })
-                $(`#${enumActionEl.WAY_SELECT}`).css({ display: isCustom ? 'block' : 'none' })
+                $(`#${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.TCP_COMMAND_INPUT}`).css({ display: isTCP && isCustom ? 'block' : 'none' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCP && isCustom ? 'flex' : 'none' })
             }
         }
@@ -7737,6 +7737,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             const { COMPONENT_TYPE } = Sidebar.prototype.enumCellBasicAttribute
             const { SWITCH } = Sidebar.prototype.enumComponentType
             const isSwitchComponent = vertices[0].getAttribute(COMPONENT_TYPE) === SWITCH
+            const isTCPTransportType = formVal[enumConst.TRANSPORTTYPE] === 'TCP'
             if (isParamsSetting && isSwitchComponent && (!currentNodeData.act || !currentNodeData.act.find(item => item.type === enumDynamicEffectType.SWITCH))) {
                 UseLayUi.topErrorMsg('请先配置数据动效中的状态设置')
@@ -7744,17 +7745,24 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             }
             if (isParamsSetting) {
-                const isTCPTransportType = formVal[enumConst.TRANSPORTTYPE] === 'TCP'
                 const isCustom = formVal[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
                 let inputData = form.val(enumActionEl.INPUT_DATA_FORM_FILTER)
                 const validateParamsSetting = () => {
                     if (isCustom) {
                         if (isTCPTransportType) {
-                            if (!formVal[enumConst.TCP_COMMAND]) {
-                                UseLayUi.topErrorMsg('请输入自定义下发指令')
-                                return false
+                            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
+                            // }
                         } else {
                             if (!isJson(formVal[enumConst.JSON_COMMAND])) {
                                 UseLayUi.topErrorMsg('命令配置存在错误')
@@ -7796,7 +7804,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumConst.CALL_TYPE]: formVal[enumConst.CALL_TYPE],
                         [enumConst.IDENTIFIER]: formVal[enumConst.IDENTIFIER],
                         [enumConst.JSON_COMMAND]: formVal[enumConst.JSON_COMMAND],
-                        [enumConst.WAY]: formVal[enumConst.WAY],
+                        [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],
@@ -7866,8 +7874,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     return
                 }
                 originType = value
-                const isCustom = form.val(enumActionEl.ACTION_SELECT_FILTER)[enumConst.COMMAND_TYPE] === COMMAND_TYPE_ENUM.CUSTOM
-                controlFormDisplay(value, transportType, isCustom)
+                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
+
+                controlFormDisplay(value, transportType === 'TCP', isCustom)
             })
             /**
@@ -7878,9 +7890,9 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 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: flag ? 'block' : 'none' })
+                $(`#${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.TCP_COMMAND_INPUT}`).css({ display: !isTCPTransportType && flag ? 'block' : 'none' })
                 $(`#${enumActionEl.EDITOR_CONTAINER}`).css({ display: !isTCPTransportType && flag ? 'flex' : 'none' })
                 form.val(enumActionEl.FORM_FILTER, { [enumConst.TCP_COMMAND]: '', [enumConst.SERVICE]: '', [enumConst.COMMAND]: '', [enumConst.IDENTIFIER]: '' })
                 $(`#${enumActionEl.INPUT_DATA_FORM}`).html('')
@@ -8057,12 +8069,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>
@@ -8685,7 +8697,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             GATEWAY: 'GATEWAY',
             ORG_NAME: 'orgName',
             DEVICE_NAME: 'deviceName',
-            ATTR_NAME: 'attrName'
+            ATTR_NAME: 'attrName',
+            METHOD: 'method',
+            DEVICE_COED: 'deviceCode',
+            REGISTER_ADDRESS: 'registerAddress',
+            DATA_TYPE: 'dataType'
         }
         /**
@@ -8700,6 +8716,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
          */
         let currentDataSource = {}
+        let thingsModel = []
+
         const component = document.createElement('div')
         $(component)
@@ -8738,6 +8756,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.DEVICE_ID]: null,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
+                        [enumDataSourceConst.DEVICE_COED]: null,
+                        [enumDataSourceConst.METHOD]: null,
+                        [enumDataSourceConst.REGISTER_ADDRESS]: null,
+                        [enumDataSourceConst.DATA_TYPE]: null,
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_TYPE] = value
@@ -8762,6 +8784,11 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.DEVICE_ID]: null,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
+                        [enumDataSourceConst.DEVICE_COED]: null,
+                        [enumDataSourceConst.METHOD]: null,
+                        [enumDataSourceConst.REGISTER_ADDRESS]: null,
+                        [enumDataSourceConst.DATA_TYPE]: null,
+
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_PROFILE_ID] = value
                     getMeetConditionsDevice(currentDataSource)
@@ -8782,6 +8809,18 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 <div class="layui-form-item" style="margin-bottom: 0">
                     <input style="display: none" type="text" name="${enumDataSourceConst.ATTR_NAME}" class="layui-input">
                 </div>
+                <div class="layui-form-item" style="margin-bottom: 0; display: none;">
+                    <input style="display: none" type="text" name="${enumDataSourceConst.DEVICE_COED}" class="layui-input">
+                </div>
+                <div class="layui-form-item" style="margin-bottom: 0; display: none;">
+                    <input style="display: none" type="text" name="${enumDataSourceConst.METHOD}" class="layui-input">
+                </div>
+                <div class="layui-form-item" style="margin-bottom: 0; display: none;">
+                    <input style="display: none" type="text" name="${enumDataSourceConst.REGISTER_ADDRESS}" class="layui-input">
+                </div>
+                <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>
             `
             $(component).append(template)
         }
@@ -8804,6 +8843,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         async function getMeetConditionsDevice(params) {
             if (!params.organizationId) return
             const items = await ConfigurationNodeApi.getMeetConditionsDevice(params);
+            deviceList = items
             $(`#${componentId} `).find(`select[name="${enumDataSourceConst.DEVICE_ID}"]`).html(UseLayUi.generateOptionTemplate({ dataSource: items, valueField: 'tbDeviceId', labelField: 'name', alias: 'alias' }))
             form.render('select', componentFilter)
         }
@@ -8815,6 +8855,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         async function getAttrByDeviceId(deviceProfileId) {
             if (deviceProfileId) {
                 const [err, res] = await to(ConfigurationNodeApi.getDeviceAttribute(deviceProfileId))
+                thingsModel = res
                 $(`#${componentId} `).find(`select[name="${enumDataSourceConst.ATTR}"]`).html(UseLayUi.generateOptionTemplate({ dataSource: Array.isArray(res) ? res : [], labelField: 'name', valueField: 'identifier' }))
                 form.render('select', componentFilter)
             }
@@ -8847,6 +8888,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     click(node) {
                         form.val(componentFilter, {
                             [enumDataSourceConst.ORG_NAME]: node?.data?.title,
+                            [enumDataSourceConst.DEVICE_COED]: null,
                             [enumDataSourceConst.DEVICE_ID]: null,
                             [enumDataSourceConst.DEVICE_NAME]: null,
                         })
@@ -8869,10 +8911,12 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 ...validateRule,
                 onClick(data) {
                     const { value } = data
-                    const selected = deviceList.find(item => item.id === value)
+                    const selected = deviceList.find(item => item.tbDeviceId === value)
+
                     if (!selected) return
                     form.val(componentFilter, {
                         [enumDataSourceConst.DEVICE_NAME]: selected?.name,
+                        [enumDataSourceConst.DEVICE_COED]: selected?.code,
                         [enumDataSourceConst.ATTR]: null,
                         [enumDataSourceConst.ATTR_NAME]: null,
                     })
@@ -8895,9 +8939,31 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                 ...validateRule,
                 onClick(data) {
                     const { value } = data
+
                     form.val(componentFilter, {
                         [enumDataSourceConst.ATTR_NAME]: value,
                     })
+
+                    const selected = thingsModel.find(item => item.identifier === value)
+
+                    if (!selected) return
+                    const type = selected?.extensionDesc?.dataType
+
+                    let method
+
+                    if (type === 'short' || type === 'unshort') {
+                        method = '06'
+                    } else if (type === 'bit') {
+                        method = '05'
+                    } else {
+                        method = '10'
+                    }
+
+                    form.val(componentFilter, {
+                        [enumDataSourceConst.METHOD]: method,
+                        [enumDataSourceConst.REGISTER_ADDRESS]: selected?.extensionDesc?.registerAddress,
+                        [enumDataSourceConst.DATA_TYPE]: selected?.extensionDesc?.dataType,
+                    })
                 }
             })
             $(component).append(attrsSelect)
@@ -8908,7 +8974,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 } = dataSource
+            const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, dataType } = dataSource
             const queue = []
             currentDataSource = { organizationId: orgId, deviceProfileId, deviceType }
             queue.push(getProduct(deviceType))
@@ -8926,6 +8992,10 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         deviceProfileId,
                         deviceType,
                         attr,
+                        method,
+                        deviceCode,
+                        registerAddress,
+                        dataType
                     })
                 })
@@ -14626,7 +14696,7 @@ class DispatchCenter {
                         ...(dataType === HandleDataSource.enumDataBindType.REAL ? {} : { endTs: Date.now() })
                     })
                     setSubscribeMapping(cmdId, [item])
-                    messageList[dataType].push(message)
+                    messageList[dataType]?.push(message)
                     cmdId++
                 })
@@ -15803,7 +15873,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.CUSTOM_TCP_COMMAND}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input">
+                                <input type="number" name="${enumActionEl.CUSTOM_TCP_COMMAND}" lay-verify="required" autocomplete="off" placeholder="请输入下发值" class="layui-input">
                             </div>
                         </div>
                     </div>
@@ -15982,7 +16052,8 @@ class HandleDataInteraction {
         const validate = (data) => {
             const { commandType, transportType } = content
-            let { attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            let dataSource = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            const { attr, additional } = dataSource
             let flag = false
             let value
@@ -15993,8 +16064,11 @@ class HandleDataInteraction {
             if (isCustom) {
                 if (isTCP) {
                     value = data[enumActionEl.CUSTOM_TCP_COMMAND]
+                    const { dataType } = additional
                     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 {
@@ -16039,16 +16113,34 @@ class HandleDataInteraction {
             defaultHandler(result, callback)
         }
+        async function getTCPCommand(registerValue, dataSource) {
+            const { additional } = dataSource || {}
+            const { method, deviceCode, registerAddress } = additional || {}
+
+            const params = {
+                crc: 'CRC_16_LOWER',
+                deviceCode,
+                method,
+                registerAddr: Number(registerAddress),
+                registerNumber: 1,
+                registerValues: [Number(registerValue)]
+            }
+
+            const command = await ConfigurationNodeApi.getModbusCommand(params)
+
+            return command
+        }
+
         async function defaultHandler(value, callback) {
-            let { deviceId, attr } = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
-            console.log(content)
+            let dataSource = contentData.dataSources.find(item => item.nodeId === nodeId) || {}
+            const { deviceId, attr, deviceProfileId } = dataSource
             /**
              * @type {command: string , commandType: string, service: string, wary: string, tcpCommand: string}
              */
             let { command, way, service, callType } = content
             const identifier = content?.identifier
             const params = content?.transportType === 'TCP'
-                ? value
+                ? await getTCPCommand(value, dataSource)
                 : identifier
                     ? { [identifier]: value }
                     : value