Merge branch 'feat/tcp-product-thingsmodel-add-zoom-factory' into 'main_dev'

feat: tcp产品新增物模型缩放因子字段 See merge request yunteng/thingskit-scada!110

Merge branch 'feat/tcp-product-thingsmodel-add-zoom-factory' into 'main_dev'
feat: tcp产品新增物模型缩放因子字段 See merge request yunteng/thingskit-scada!110
xp.Huang
2 parents ae226a6d 33f174b1
Showing 1 changed file with 33 additions and 15 deletions
src/main/webapp/js/grapheditor/Format.js
--- a/src/main/webapp/js/grapheditor/Format.js
View file @a8dde75
+++ b/src/main/webapp/js/grapheditor/Format.js
View file @a8dde75
@@ -6588,7 +6588,24 @@ DataFormatPanel.prototype.addDataFont = function (container) {
         function getSwitchSubmitValue(field) {
             const dataSources = getDataSourceBindValue()
             const enableStatus = getEnableStatus(field)
-            return { configurationId, contentId: currentPageId.id, nodeId: graphId, dataSources: { ...dataSources, additional: { deviceCode: dataSources?.deviceCode, method: dataSources?.method, registerAddress: dataSources?.registerAddress, thingsModelDataType: dataSources?.thingsModelDataType, deviceName: dataSources?.deviceName, attrName: dataSources?.attrName } }, ...enableStatus }
+            return {
+                configurationId,
+                contentId: currentPageId.id,
+                nodeId: graphId,
+                dataSources: {
+                    ...dataSources,
+                    additional: {
+                        deviceCode: dataSources?.deviceCode,
+                        method: dataSources?.method,
+                        registerAddress: dataSources?.registerAddress,
+                        thingsModelDataType: dataSources?.thingsModelDataType,
+                        deviceName: dataSources?.deviceName,
+                        attrName: dataSources?.attrName,
+                        zoomFactor: dataSources?.zoomFactor
+                    }
+                },
+                ...enableStatus
+            }
         }
@@ -8728,7 +8745,8 @@ DataFormatPanel.prototype.addDataFont = function (container) {
             DEVICE_COED: 'deviceCode',
             REGISTER_ADDRESS: 'registerAddress',
             DATA_TYPE: 'thingsModelDataType',
-            ACTION_TYPE: 'actionType'
+            ACTION_TYPE: 'actionType',
+            ZOOM_FACTOR: 'zoomFactor'
         }
         /**
@@ -8788,6 +8806,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.REGISTER_ADDRESS]: null,
                         [enumDataSourceConst.DATA_TYPE]: null,
                         [enumDataSourceConst.ACTION_TYPE]: null,
+                        [enumDataSourceConst.ZOOM_FACTOR]: null,
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_TYPE] = value
@@ -8817,6 +8836,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         [enumDataSourceConst.REGISTER_ADDRESS]: null,
                         [enumDataSourceConst.DATA_TYPE]: null,
                         [enumDataSourceConst.ACTION_TYPE]: null,
+                        [enumDataSourceConst.ZOOM_FACTOR]: null,
                     })
                     currentDataSource[enumDataSourceConst.DEVICE_PROFILE_ID] = value
@@ -8853,6 +8873,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.ACTION_TYPE}" class="layui-input">
                 </div>
+                <div class="layui-form-item" style="margin-bottom: 0; display: none;">
+                    <input style="display: none" type="text" name="${enumDataSourceConst.ZOOM_FACTOR}" class="layui-input">
+                </div>                
             `
             $(component).append(template)
         }
@@ -8982,23 +9005,13 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                     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]: selected?.extensionDesc?.actionType,
                         [enumDataSourceConst.REGISTER_ADDRESS]: selected?.extensionDesc?.registerAddress,
                         [enumDataSourceConst.DATA_TYPE]: selected?.extensionDesc?.dataType,
                         [enumDataSourceConst.ACTION_TYPE]: selected?.extensionDesc?.actionType,
+                        [enumDataSourceConst.ZOOM_FACTOR]: selected?.extensionDesc?.zoomFactor,
                     })
                 }
             })
@@ -9010,7 +9023,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, thingsModelDataType, actionType } = dataSource
+            const { orgId, deviceId, deviceProfileId, deviceType, attr, method, deviceCode, registerAddress, thingsModelDataType, actionType, zoomFacor } = dataSource
             const queue = []
             currentDataSource = { organizationId: orgId, deviceProfileId, deviceType }
             queue.push(getProduct(deviceType))
@@ -9041,6 +9054,7 @@ DataFormatPanel.prototype.addDataFont = function (container) {
                         actionType,
                         deviceName,
                         attrName,
+                        zoomFacor
                     })
                 })
@@ -16261,7 +16275,7 @@ class HandleDataInteraction {
             if (commandType == enumCommandType.MODBUS) {
                 value = data[enumActionEl.CUSTOM_TCP_COMMAND]
-                const { method, deviceCode } = additional || {}
+                const { method, deviceCode, zoomFactor = 1 } = additional || {}
                 const validate = new Validate([
                     { value: deviceCode, required: true, message: '未找到设备地址码' },
                     { value: method, required: true, message: '未找到Modbus命令操作类型' },
@@ -16270,6 +16284,10 @@ class HandleDataInteraction {
                     ...(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 == '06' || method == '16') {
+                    value = value * zoomFactor
+                }
                 if (method == '16') {
                     const hexValue = UseLayUi.numberToHex(value).split(' ').join('')