Merge remote-tracking branch 'origin/perf/main_dev' into perf/main_dev

@@ -4,6 +4,8 @@ export interface ProductAndDevice {
   name: string
   profileName?: string
   profileId: string
+  transportType?: string
+  deviceType?: string
   deviceList: {
     deviceId: string
     name: string

@@ -12,6 +12,15 @@ import { ThingsModelForm } from '@/core/Library/components/ThingsModelForm'
 import { useMessage } from '@/hooks/web/useMessage'
 import type { StructJSON } from '@/api/device/model'
 
+interface ServiceInfo {
+  title?: string
+  serviceCommand?: Object
+  inputData?: []
+  transportType?: string
+  callType?: string
+  code?: string
+}
+
 const visible = ref<boolean>(false)
 
 const { createMessage } = useMessage()
@@ -33,12 +42,13 @@ const deviceTitle = ref<string | undefined>()// 设备名称
 
 const isPasswordInfo = ref<{ checked?: boolean; value?: string | number; label?: string }>({})// 是否需要操作密码才进行命令下发
 
-const serviceInfo = reactive<any>({
+const serviceInfo = reactive<ServiceInfo>({
   title: '',
   serviceCommand: {},
   inputData: [],
   transportType: '',
   callType: '',
+  code: '',
 })
 
 const [register, { getFieldsValue, validate, setFieldsValue, updateSchema, setProps }] = useForm({ // 自定义下发值
@@ -64,13 +74,12 @@ const [registerPassword, { getFieldsValue: getPasswordValue, validate: validateP
   labelWidth: 110,
 })
 
-const getServiceInfo = async (deviceProfileId: string, transportType: string, service?: string, serviceCommand?: Recordable) => {
+const getServiceInfo = async (deviceProfileId: string, service?: string, serviceCommand?: Recordable) => {
   isInputData.value = true
   const functionJson: any = await getThingsModelServices(deviceProfileId)
   serviceInfo.inputData = functionJson.filter((item: any) => item.identifier === service)?.[0].functionJson.inputData
   serviceInfo.title = functionJson[0].functionName
   serviceInfo.serviceCommand = serviceCommand
-  serviceInfo.transportType = transportType
 }
 
 // 获取设备信息
@@ -102,11 +111,14 @@ const open = async (_data: SingleClickEventDataType) => {
   isShowActionType.value = !!actionType // 判断modBUS类型时 物模型是否填写扩展描述
   serviceInfo.callType = callType // 服务命令调用方式 是同步还是异步
 
+  serviceInfo.transportType = transportType
+  serviceInfo.code = code
+
   visible.value = true
 
   if (transportType === TransportTypeEnum.TCP) {
     if (commandWay === CommandDeliveryWayEnum.SERVICE) { // 命令下发方式是服务或则自定义调用
-      getServiceInfo(deviceProfileId, transportType, service, serviceCommand)
+      getServiceInfo(deviceProfileId, service, serviceCommand)
     }
     else if (commandWay === CommandDeliveryWayEnum.CUSTOM) { // 自定义
       await nextTick()
@@ -138,7 +150,7 @@ const open = async (_data: SingleClickEventDataType) => {
     isShowModBUS.value = false
 
     // 命令下发方式是服务或则自定义调用
-    if (commandWay === CommandDeliveryWayEnum.SERVICE) { getServiceInfo(deviceProfileId, transportType, service, serviceCommand) }
+    if (commandWay === CommandDeliveryWayEnum.SERVICE) { getServiceInfo(deviceProfileId, service, serviceCommand) }
 
     else if (commandWay === CommandDeliveryWayEnum.CUSTOM) {
       await nextTick()
@@ -173,7 +185,6 @@ const handleSubmit = async () => {
       return
     }
   }
-
   if (serviceInfo.callType === 'SYNC') { // 服务命令调用方式 是同步 需要调用设备是否在线才能下发
     const res = await getDeviceActiveTime(dataSourceJson.value.deviceId)
     const { value } = res
@@ -191,6 +202,11 @@ const handleSubmit = async () => {
         createMessage.warning('当前物模型扩展描述没有填写')
         return
       }
+
+      if (!serviceInfo.code) {
+        createMessage.error('当前缺少设备地址码')
+        return
+      }
       const oldValue = getFieldsValue()[unref(formField)]
       modBUSForm.value.registerNumber = 1
       modBUSForm.value.registerValues = [oldValue]
@@ -237,7 +253,7 @@ const handleSubmit = async () => {
         sendValue.value = values
       }
       else {
-        const values = typeof JSON.parse(getFieldsValue().sendValue) ? JSON.parse(getFieldsValue().sendValue) : getFieldsValue().sendValue || {}
+        const values = serviceInfo.transportType === TransportTypeEnum.TCP ? getFieldsValue().sendValue : JSON.parse(getFieldsValue().sendValue) || {}
         sendValue.value = values
       }
     }

@@ -37,8 +37,6 @@ export const getFormSchemas = (event: EventTypeEnum): FormSchema[] => {
   const { deviceProfileId, deviceInfo } = dataSourceJson || {}
   // transportType:判断是什么类型的设备 code:设备地址码  deviceType:设备类型
   const { transportType, deviceType } = deviceInfo || {}
-  // if (!deviceProfileId)
-  //   createMessage.warn('请先绑定数据源')
 
   return [
     {