Merge branch 'fix/DEFECT-1855' into 'main_dev'

fix: 修复组态属性下发tcp设备没有缩放因子

See merge request yunteng/thingskit-scada!205

@@ -27,7 +27,7 @@ export interface GenModbusCommandType {
   crc: string
   crc: string
   deviceCode: string
   deviceCode: string
   method: string
   method: string
-  registerAddress: string
+  registerAddress: number
   registerNumber?: number
   registerNumber?: number
   registerValues?: number[]
   registerValues?: number[]
 }
 }

+import type { Specs, StructJSON } from '@/api/device/model'
+import type { NodeDataDataSourceJsonType } from '@/api/node/model'
+import { type FormSchema, useComponentRegister } from '@/components/Form'
+import { ComponentEnum } from '@/components/Form/src/enum'
+import { ThingsModelForm, validateTCPCustomCommand } from '@/core/Library/components/ThingsModelForm'
+import { getFormSchemas } from '@/core/Library/components/ThingsModelForm/config'
+import { CodeTypeEnum, DataTypeEnum, TransportTypeEnum } from '@/enums/datasource'
+import { TCPObjectModelActionTypeEnum } from '@/enums/objectModelEnum'
+
+useComponentRegister(ComponentEnum.THINGS_MODEL_FORM, ThingsModelForm)
+
+export enum FormFieldsEnum {
+  ATTR_VALUE = 'attrValue',
+  PASSWORD = 'password',
+}
+
+export interface AttributeDeliverModalOpenParamsType {
+  title?: string
+  operationPassword?: string
+  operationPasswordEnable?: boolean
+  dataSourceJson: NodeDataDataSourceJsonType
+}
+
+function getStructJsonFromDataSourceJson(dataSourceJson: NodeDataDataSourceJsonType): StructJSON {
+  const { attrInfo } = dataSourceJson
+  const { identifier, name, detail } = attrInfo || {}
+  return {
+    functionName: name,
+    identifier,
+    dataType: detail.dataType,
+  }
+}
+
+function getTCPModbusSchemas({ structJson, required, actionType }: { structJson: StructJSON; required?: boolean; actionType: string }): FormSchema {
+  const { dataType } = structJson
+  const { specs, type } = dataType || {}
+  const { valueRange, length = 10240 } = specs! as Specs
+  const { max = Number.MAX_SAFE_INTEGER, min = Number.MIN_SAFE_INTEGER } = valueRange || {}
+
+  function createInputNumber({
+    identifier,
+    functionName,
+  }: StructJSON): FormSchema {
+    return {
+      field: identifier,
+      label: functionName,
+      component: ComponentEnum.INPUT_NUMBER,
+      required,
+      componentProps: {
+        max: actionType === TCPObjectModelActionTypeEnum.BOOL ? 1 : max,
+        min: actionType === TCPObjectModelActionTypeEnum.BOOL ? 0 : min,
+        precision: actionType === TCPObjectModelActionTypeEnum.BOOL ? 0 : 2,
+      },
+    }
+  }
+
+  const createInput = ({ identifier, functionName }: StructJSON): FormSchema => {
+    return {
+      field: identifier,
+      label: functionName,
+      component: ComponentEnum.INPUT,
+      rules: [
+        {
+          required,
+          message: `${functionName}是必填项`,
+        },
+        {
+          validator: validateTCPCustomCommand,
+        },
+      ],
+      componentProps: {
+        maxLength: length,
+      },
+    } as FormSchema
+  }
+
+  return type === DataTypeEnum.STRING ? createInput(structJson) : createInputNumber(structJson)
+}
+
+export const createFormSchemas = ({ operationPassword, operationPasswordEnable, dataSourceJson }: AttributeDeliverModalOpenParamsType): FormSchema[] => {
+  const schemas: FormSchema[] = []
+
+  const { deviceInfo } = dataSourceJson
+  if (deviceInfo?.transportType === TransportTypeEnum.TCP && deviceInfo.codeType === CodeTypeEnum.MODBUS_RTU && dataSourceJson.deviceInfo?.codeType) {
+    schemas.push(getTCPModbusSchemas({ required: true, structJson: getStructJsonFromDataSourceJson(dataSourceJson), actionType: dataSourceJson.deviceInfo?.codeType }))
+  }
+  else {
+    const isStructType = dataSourceJson.attrInfo?.detail?.dataType?.type === DataTypeEnum.STRUCT
+    schemas.push(
+      ...getFormSchemas({ structJSON: isStructType ? dataSourceJson?.attrInfo?.detail?.dataType?.specs as StructJSON[] || [] : [getStructJsonFromDataSourceJson(dataSourceJson)], required: !isStructType }),
+    )
+  }
+
+  if (operationPassword && operationPasswordEnable) {
+    schemas.unshift({
+      field: FormFieldsEnum.PASSWORD,
+      label: '操作密码',
+      component: ComponentEnum.INPUT_PAWSSWORD,
+      required: true,
+      rules: [
+        {
+          validator(_rule, value) {
+            if (value && value !== operationPassword) return Promise.reject(new Error('操作密码不正确'))
+            return Promise.resolve()
+          },
+        },
+      ],
+    })
+  }
+
+  return schemas
+}

 <script setup lang="ts">
 <script setup lang="ts">
 import { Modal } from 'ant-design-vue'
 import { Modal } from 'ant-design-vue'
 import { nextTick, ref, unref } from 'vue'
 import { nextTick, ref, unref } from 'vue'
-import type { FormSchema } from '@/components/Form'
+import type { AttributeDeliverModalOpenParamsType } from './AttributeDeliverModal.config'
+import { createFormSchemas } from './AttributeDeliverModal.config'
+import { useGetModbusCommand } from './useGetModbusCommand'
 import { BasicForm, useForm } from '@/components/Form'
 import { BasicForm, useForm } from '@/components/Form'
-import { ComponentEnum, FormLayoutEnum } from '@/components/Form/src/enum'
+import { FormLayoutEnum } from '@/components/Form/src/enum'
+import type { NodeDataDataSourceJsonType } from '@/api/node/model'
+import { CodeTypeEnum, DataTypeEnum, TransportTypeEnum } from '@/enums/datasource'
 
 
 const resolveFn = ref<Fn>()
 const resolveFn = ref<Fn>()
 
 
@@ -11,61 +15,50 @@ const visible = ref(false)
 
 
 const password = ref()
 const password = ref()
 
 
+const currentDataSourceJson = ref<NodeDataDataSourceJsonType>()
+
 const [register, { getFieldsValue, resetFields, validate, setProps, clearValidate }] = useForm({
 const [register, { getFieldsValue, resetFields, validate, setProps, clearValidate }] = useForm({
   layout: FormLayoutEnum.VERTICAL,
   layout: FormLayoutEnum.VERTICAL,
   showActionButtonGroup: false,
   showActionButtonGroup: false,
 })
 })
 
 
-enum FormFieldsEnum {
-  ATTR_VALUE = 'attrValue',
-  PASSWORD = 'password',
-}
-
-const createFormSchemas = (title?: string, password?: string, operationPasswordEnable?: boolean): FormSchema[] => {
-  const schemas: FormSchema[] = [
-    {
-      field: FormFieldsEnum.ATTR_VALUE,
-      label: title || '属性值',
-      component: ComponentEnum.INPUT,
-      required: true,
-    },
-  ]
-
-  if (password && operationPasswordEnable) {
-    schemas.unshift({
-      field: FormFieldsEnum.PASSWORD,
-      label: '操作密码',
-      component: ComponentEnum.INPUT_PAWSSWORD,
-      required: true,
-      rules: [
-        {
-          validator(_rule, value) {
-            if (value && value !== password) return Promise.reject(new Error('操作密码不正确'))
-            return Promise.resolve()
-          },
-        },
-      ],
-    })
-  }
-
-  return schemas
-}
-
-const open = async ({ title, operationPassword, operationPasswordEnable }: Partial<Record<'operationPassword' | 'title', string>> & { operationPasswordEnable: boolean }) => {
+const open = async ({ title, operationPassword, operationPasswordEnable, dataSourceJson }: AttributeDeliverModalOpenParamsType) => {
   visible.value = true
   visible.value = true
   password.value = operationPassword
   password.value = operationPassword
+  currentDataSourceJson.value = dataSourceJson
   return new Promise((resolve) => {
   return new Promise((resolve) => {
     resolveFn.value = resolve
     resolveFn.value = resolve
     nextTick(() => {
     nextTick(() => {
-      setProps({ schemas: createFormSchemas(title, operationPassword, operationPasswordEnable) })
+      setProps({ schemas: createFormSchemas({ title, operationPassword, operationPasswordEnable, dataSourceJson }) })
     })
     })
   })
   })
 }
 }
 
 
+async function getResult() {
+  const result = getFieldsValue()
+  const isTCPModbusDevice = unref(currentDataSourceJson)?.deviceInfo?.transportType === TransportTypeEnum.TCP && unref(currentDataSourceJson)?.deviceInfo?.codeType === CodeTypeEnum.MODBUS_RTU
+  const isStructJSON = unref(currentDataSourceJson)?.attrInfo?.detail?.dataType?.type === DataTypeEnum.STRUCT
+  const attrKey = unref(currentDataSourceJson)!.attr
+  if (!isTCPModbusDevice) { return isStructJSON ? result : result[attrKey] }
+  else {
+    const value = result[attrKey]
+    const isString = unref(currentDataSourceJson)?.attrInfo?.detail?.dataType?.type === DataTypeEnum.STRING
+
+    if (isString) return value
+
+    const { getModbusCommand, validateCanGetCommand } = useGetModbusCommand()
+    if (!validateCanGetCommand(unref(currentDataSourceJson)!.attrInfo.extensionDesc, unref(currentDataSourceJson)!.deviceInfo?.code).flag) return
+
+    const res = await getModbusCommand(value as unknown as number, unref(currentDataSourceJson)!.attrInfo.extensionDesc!, unref(currentDataSourceJson)!.deviceInfo!.code!)
+    return res
+  }
+}
+
 const handleOk = async () => {
 const handleOk = async () => {
   await validate()
   await validate()
-  const value = getFieldsValue()
-  unref(resolveFn)?.(value[FormFieldsEnum.ATTR_VALUE])
+  const result = await getResult()
+  if (!result) return
+  unref(resolveFn)?.(result)
   visible.value = false
   visible.value = false
   resetFields()
   resetFields()
 }
 }
@@ -80,17 +73,9 @@ defineExpose({ open })
 
 
 <template>
 <template>
   <Modal
   <Modal
-    v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel" @ok="handleOk"
+    v-model:open="visible" title="属性下发" ok-text="确认" :width="400" cancel-text="取消" @cancel="handleCancel"
+    @ok="handleOk"
   >
   >
-    <!-- <section>
-      <FormItem label="操作密码" :label-col="{ span: 24 }">
-        <Input v-model:value="value" placeholder="请输入下发值" />
-      </FormItem>
-      <FormItem :label="fieldTitle" :label-col="{ span: 24 }">
-        <Input v-model:value="value" placeholder="请输入下发值" />
-      </FormItem>
-    </section> -->
-
     <BasicForm @register="register" />
     <BasicForm @register="register" />
   </Modal>
   </Modal>
 </template>
 </template>

+import { SingleToHex, getArray } from './config'
+import { type GenModbusCommandType, genModbusCommand } from '@/api/device'
+import type { ExtensionDesc } from '@/api/device/model'
+import { TCPObjectModelActionTypeEnum } from '@/enums/objectModelEnum'
+import { useMessage } from '@/hooks/web/useMessage'
+
+const getFloatPart = (number: string | number) => {
+  const isLessZero = Number(number) < 0
+  number = number.toString()
+  const floatPartStartIndex = number.indexOf('.')
+  const value = ~floatPartStartIndex
+    ? `${isLessZero ? '-' : ''}0.${number.substring(floatPartStartIndex + 1)}`
+    : '0'
+  return Number(value)
+}
+
+const REGISTER_MAX_VALUE = Number(0xffff)
+
+export function useGetModbusCommand() {
+  const { createMessage } = useMessage()
+
+  const getModbusCommand = async (value: number, extensionDesc: ExtensionDesc, deviceAddressCode: string) => {
+    const { registerAddress, actionType, zoomFactor } = extensionDesc as Required<ExtensionDesc>
+    const params: GenModbusCommandType = {
+      crc: 'CRC_16_LOWER',
+      registerNumber: 1,
+      deviceCode: deviceAddressCode,
+      registerAddress,
+      method: actionType,
+      registerValues: [value],
+    }
+
+    if (actionType === TCPObjectModelActionTypeEnum.INT) {
+      const newValue
+        = Math.trunc(value) * zoomFactor
+        + getFloatPart(value) * zoomFactor
+
+      if (newValue % 1 !== 0) {
+        createMessage.warning(`属性下发类型必须是整数,缩放因子为${zoomFactor}`)
+        return
+      }
+
+      if (value * zoomFactor > REGISTER_MAX_VALUE) {
+        createMessage.warning(`属性下发值不能超过${REGISTER_MAX_VALUE},缩放因子是${zoomFactor}`)
+        return
+      }
+    }
+    else if (actionType === TCPObjectModelActionTypeEnum.DOUBLE) {
+      const regex = /^-?\d+(\.\d{0,2})?$/
+      const values
+        = Math.trunc(value) * zoomFactor
+        + getFloatPart(value) * zoomFactor
+
+      if (!regex.test(values.toString())) {
+        createMessage.warning(`属性下发值精确到两位小数,缩放因子是${zoomFactor}`)
+        return
+      }
+
+      const newValue
+        = values === 0 ? [0, 0] : getArray(SingleToHex(values))
+      params.registerValues = newValue
+      params.registerNumber = 2
+    }
+
+    return await genModbusCommand(params)
+  }
+
+  /**
+   *
+   * @param extensionDesc 物模型拓展描述符
+   * @param deviceAddressCode 设备地址码
+   */
+  const validateCanGetCommand = (extensionDesc?: ExtensionDesc, deviceAddressCode?: string, createValidateMessage = true) => {
+    const result = { flag: true, message: '' }
+    if (!extensionDesc) {
+      result.flag = false
+      result.message = '当前物模型扩展描述没有填写'
+    }
+
+    if (!deviceAddressCode) {
+      result.flag = false
+      result.message = '当前设备未绑定设备地址码'
+    }
+
+    if (result.message && createValidateMessage)
+      createMessage.warning(result.message)
+
+    return result
+  }
+
+  return {
+    getModbusCommand,
+    validateCanGetCommand,
+  }
+}

@@ -9,7 +9,7 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
     functionName,
     functionName,
     dataType,
     dataType,
   }: StructJSON): FormSchema => {
   }: StructJSON): FormSchema => {
-    const { specs } = dataType || {}
+    const { specs, type } = dataType || {}
     const { valueRange } = specs! as Specs
     const { valueRange } = specs! as Specs
     const { max = Number.MAX_SAFE_INTEGER, min = Number.MIN_SAFE_INTEGER } = valueRange || {}
     const { max = Number.MAX_SAFE_INTEGER, min = Number.MIN_SAFE_INTEGER } = valueRange || {}
     return {
     return {
@@ -21,22 +21,11 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
           required,
           required,
           message: `${functionName}是必填项`,
           message: `${functionName}是必填项`,
         },
         },
-        {
-          type: 'number',
-          trigger: 'change',
-          validator: (_rule, value) => {
-            const reg = /^[0-9]*$/
-            if (!reg.test(value)) return Promise.reject(new Error(`${functionName}不是一个有效的数字`))
-            if (value < min || value > max)
-              return Promise.reject(new Error(`${functionName}取值范围在${min}~${max}之间`))
-
-            return Promise.resolve(value)
-          },
-        },
       ],
       ],
       componentProps: {
       componentProps: {
         max,
         max,
         min,
         min,
+        precision: type === DataTypeEnum.NUMBER_INT ? 0 : 2,
       },
       },
     } as FormSchema
     } as FormSchema
   }
   }
@@ -142,7 +131,6 @@ export const getFormSchemas = ({ structJSON: structJson, required, transportType
   }
   }
 
 
   const schemas: FormSchema[] = []
   const schemas: FormSchema[] = []
-
   for (const item of structJson) {
   for (const item of structJson) {
     const { dataType } = item
     const { dataType } = item
     const { type } = dataType || {}
     const { type } = dataType || {}

+import type { ValidatorRule } from 'ant-design-vue/lib/form/interface'
+
 export { default as ThingsModelForm } from './index.vue'
 export { default as ThingsModelForm } from './index.vue'
+
+export const validateTCPCustomCommand: ValidatorRule['validator'] = (_rule, value) => {
+  const reg = /^[\s0-9a-fA-F]+$/
+  if (reg.test(value)) return Promise.resolve()
+  return Promise.reject(new Error('请输入ASCII或HEX服务命令(0~9/A~F)'))
+}

@@ -22,10 +22,6 @@ const props = withDefaults(defineProps<{
 
 
 const thingsModelFormListElMap = reactive<Record<string, { el: InstanceType<typeof ThingsModelForm>; structJSON: StructJSON }>>({})
 const thingsModelFormListElMap = reactive<Record<string, { el: InstanceType<typeof ThingsModelForm>; structJSON: StructJSON }>>({})
 
 
-// const getLabelWidth = () => {
-//   return Math.max(...((props.inputData || [])?.map(item => item?.functionName?.length))) * 12
-// }
-
 const [register, formActionType] = useForm({
 const [register, formActionType] = useForm({
   schemas: getFormSchemas({ structJSON: props.inputData || [], required: props.required, transportType: props.transportType }),
   schemas: getFormSchemas({ structJSON: props.inputData || [], required: props.required, transportType: props.transportType }),
   showActionButtonGroup: false,
   showActionButtonGroup: false,

@@ -118,9 +118,9 @@ export function useNodeEvent(eventJson: NodeDataEventJsonType, dataSourceJson: N
       else {
       else {
         const instance = h(AttributeDeliverModal)
         const instance = h(AttributeDeliverModal)
         render(instance, document.body)
         render(instance, document.body)
-        const value = await (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ title: `${alias || deviceName}-${attrInfo.name}`, operationPassword, operationPasswordEnable }) as string
-
+        const value = await (instance.component?.exposed as InstanceType<typeof AttributeDeliverModal>)?.open({ title: `${alias || deviceName}-${attrInfo.name}`, operationPassword, operationPasswordEnable, dataSourceJson }) as string
         command.params = transportType === TransportTypeEnum.TCP ? value : { [attr]: value }
         command.params = transportType === TransportTypeEnum.TCP ? value : { [attr]: value }
+        if (!command.params) return
         await doCommandDelivery({ way, command, deviceId })
         await doCommandDelivery({ way, command, deviceId })
         createMessage.success('命令下发成功')
         createMessage.success('命令下发成功')
       }
       }

+/**
+ * @description TCP物模型拓展描述符数据格式
+ */
+export enum TCPObjectModelActionTypeEnum {
+  BOOL = '05',
+  INT = '06',
+  DOUBLE = '16',
+}