fix: DEFECT-1118 看板管理指令下发修复tcp设备下发指令逻辑

@@ -86,6 +86,12 @@ export interface DataSource {
   deviceName: string;
   deviceProfileId: string;
   tbDeviceId: string;
+  customCommand: {
+    transportType?: string;
+    commandType?: string;
+    command?: string;
+    service?: string;
+  };
 
   // front usage
   uuid?: string;
@@ -93,6 +99,7 @@ export interface DataSource {
   height?: number;
   radio?: RadioRecord;
   deviceType?: DeviceTypeEnum;
+  [key: string]: any;
 }
 
 export interface DataComponentRecord {

@@ -127,4 +127,5 @@ export type ComponentType =
   | 'ProductPicker'
   | 'PollCommandInput'
   | 'RegisterAddressInput'
-  | 'ControlGroup';
+  | 'ControlGroup'
+  | 'JSONEditor';

@@ -17,6 +17,9 @@ export interface ControlComponentValue {
   deviceProfileId?: string;
   deviceType?: DeviceTypeEnum;
   organizationId?: string;
+
+  dataSource?: DataSource;
+  [key: string]: any;
 }
 
 export const ControlComponentDefaultConfig: ControlComponentValue = {
@@ -40,6 +43,7 @@ export const transformControlConfig = (
       deviceType: dataSourceRecord.deviceType,
       slaveDeviceId: dataSourceRecord.slaveDeviceId,
       organizationId: dataSourceRecord.organizationId,
+      dataSource: dataSourceRecord,
     } as ControlComponentValue,
   };
 };

 import { ControlComponentValue } from './control.config';
-import { getDeviceProfile } from '/@/api/alarm/position';
-import { getDeviceRelation, sendCommandOneway } from '/@/api/dataBoard';
-import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
-import { getModelServices } from '/@/api/device/modelOfMatter';
+import { sendCommandOneway } from '/@/api/dataBoard';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { isString } from '/@/utils/is';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 
 const { createMessage } = useMessage();
@@ -15,31 +11,20 @@ export function useSendCommand() {
   };
   const sendCommand = async (record: ControlComponentValue, value: any) => {
     if (!record) return error();
-    const { deviceProfileId, attribute, deviceType } = record;
-    let { deviceId } = record;
+    const { attribute } = record;
+    const { dataSource } = record;
+    const { customCommand } = dataSource || {};
+
+    const { deviceId } = record;
     if (!deviceId) return error();
     try {
-      const list = await getDeviceProfile();
-      const deviceProfile = list.find((item) => item.id === deviceProfileId);
-      if (!deviceProfile) return error();
-
       let params: string | Recordable = {
         [attribute!]: Number(value),
       };
 
       // 如果是TCP设备从物模型中获取下发命令(TCP网关子设备无物模型服务与事件)
-      if (deviceProfile!.transportType === TransportTypeEnum.TCP) {
-        const serviceList = (await getModelServices({ deviceProfileId: deviceProfileId! })) || [];
-        const record = serviceList.find((item) => item.identifier === attribute);
-        const sendCommand = record?.functionJson.inputData?.at(0)?.serviceCommand || '';
-        params = isString(sendCommand) ? sendCommand : JSON.stringify(sendCommand);
-      }
-
-      if (deviceType === DeviceTypeEnum.SENSOR) {
-        deviceId = await getDeviceRelation({
-          deviceId,
-          isSlave: deviceType === DeviceTypeEnum.SENSOR,
-        });
+      if (customCommand?.transportType === TransportTypeEnum.TCP) {
+        params = customCommand.command!;
       }
 
       // 控制按钮下发命令为0 或 1
@@ -57,7 +42,6 @@ export function useSendCommand() {
       createMessage.success('命令下发成功');
       return true;
     } catch (msg) {
-      console.log('enter');
       return error();
     }
   };

@@ -61,7 +61,13 @@
     const hasExistEl = Object.keys(dataSourceEl).filter((key) => dataSourceEl[key]);
     for (const id of hasExistEl) {
       const oldValues = dataSourceEl[id]?.getFieldsValue();
-      dataSourceEl[id]?.setFieldsValue({ ...oldValues, [DataSourceField.ATTRIBUTE]: null });
+      dataSourceEl[id]?.setFieldsValue({
+        ...oldValues,
+        [DataSourceField.ATTRIBUTE]: null,
+        [DataSourceField.COMMAND_TYPE]: null,
+        [DataSourceField.SERVICE]: null,
+      });
+      dataSourceEl[id]?.clearValidate();
     }
   };
 
@@ -125,6 +131,12 @@
       _dataSource[index] = {
         ...value,
         componentInfo: { ...(props.defaultConfig || {}), ...componentInfo },
+        customCommand: {
+          transportType: value.transportType,
+          service: value.service,
+          command: value.command,
+          commandType: value.commandType,
+        },
       };
     }
 
@@ -197,13 +209,26 @@
     dataSource.value = props.record.record.dataSource.map((item) => {
       const id = buildUUID();
 
+      const customCommand = item.customCommand || {};
+
       nextTick(() => {
-        (dataSourceEl[id] as FormActionType).setFieldsValue(item);
+        (dataSourceEl[id] as FormActionType).setFieldsValue({
+          ...item,
+          transportType: customCommand.transportType,
+          command: customCommand?.command,
+          commandType: customCommand.commandType,
+          service: customCommand.service,
+        });
         (dataSourceEl[id] as FormActionType).clearValidate();
       });
+
       return {
         id,
         ...item,
+        transportType: customCommand.transportType,
+        command: customCommand?.command,
+        commandType: customCommand.commandType,
+        service: customCommand.service,
       };
     });
   };

@@ -72,7 +72,6 @@
       const { getAllDataSourceFieldValue, validate } = unref(basicConfigurationEl)!;
       await validate();
       const value = getAllDataSourceFieldValue();
-
       unref(isEdit) ? handleUpdateComponent(value) : handleAddComponent(value);
       resetForm();
     } catch (error: unknown) {

@@ -4,11 +4,11 @@
   const props = defineProps({
     controlId: {
       type: String,
-      required: true,
+      // required: true,
     },
     checkedId: {
       type: String,
-      required: true,
+      // required: true,
     },
   });
   const emit = defineEmits(['change']);

 import { getDeviceAttributes, getMeetTheConditionsDevice } from '/@/api/dataBoard';
 import { getOrganizationList } from '/@/api/system/system';
-import { FormSchema } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { DeviceAttributeParams, MasterDeviceList } from '/@/api/dataBoard/model';
 import { FrontComponent } from '../../const/const';
@@ -10,6 +10,11 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DataTypeEnum } from '/@/components/Form/src/externalCompns/components/StructForm/config';
 import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { JSONEditor } from '/@/components/CodeEditor';
+import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+
+useComponentRegister('JSONEditor', JSONEditor);
 
 export enum BasicConfigField {
   NAME = 'name',
@@ -47,6 +52,10 @@ export enum DataSourceField {
   DEVICE_RENAME = 'deviceRename',
   LONGITUDE_ATTRIBUTE = 'longitudeAttribute',
   LATITUDE_ATTRIBUTE = 'latitudeAttribute',
+
+  COMMAND = 'command',
+  COMMAND_TYPE = 'commandType',
+  SERVICE = 'service',
 }
 
 export const isControlComponent = (frontId: FrontComponent) => {
@@ -139,6 +148,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
               [DataSourceField.TRANSPORT_TYPE]: null,
             });
           },
+          getPopupContainer: () => document.body,
         };
       },
     },
@@ -172,6 +182,7 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
               [DataSourceField.TRANSPORT_TYPE]: option[DataSourceField.TRANSPORT_TYPE],
             });
           },
+          getPopupContainer: () => document.body,
         };
       },
     },
@@ -252,31 +263,14 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
       component: 'ApiSelect',
       label: '属性',
       colProps: { span: 8 },
-      dynamicRules: ({ model }) => {
-        const transportType = model[DataSourceField.TRANSPORT_TYPE];
-        return [
-          {
-            required: true,
-            message: `${
-              isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)
-                ? '服务'
-                : '属性'
-            }为必填项`,
-          },
-        ];
-      },
+      rules: [{ required: true, message: '请选择属性' }],
+      ifShow: ({ model }) =>
+        !(isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]) && isControlComponent(frontId!)),
       componentProps({ formModel }) {
         const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
-        const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
-        if (isEdit && ![deviceProfileId, transportType].every(Boolean))
-          return { placeholder: '请选择属性', getPopupContainer: () => document.body };
         return {
           api: async () => {
             try {
-              if (isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)) {
-                return await getDeviceService(deviceProfileId);
-              }
-
               if (deviceProfileId) {
                 return await getDeviceAttribute({
                   deviceProfileId,
@@ -284,18 +278,87 @@ export const dataSourceSchema = (isEdit: boolean, frontId?: FrontComponent): For
                 });
               }
             } catch (error) {}
-
             return [];
           },
-          placeholder:
-            isControlComponent(frontId as FrontComponent) && isTcpProfile(transportType)
-              ? '请选择服务'
-              : '请选择属性',
+          placeholder: '请选择属性',
+          getPopupContainer: () => document.body,
+        };
+      },
+    },
+    {
+      field: DataSourceField.COMMAND_TYPE,
+      component: 'ApiSelect',
+      label: '命令类型',
+      defaultValue: CommandTypeEnum.CUSTOM.toString(),
+      colProps: { span: 8 },
+      ifShow: ({ model }) =>
+        isControlComponent(frontId!) && isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: findDictItemByCode,
+          params: {
+            dictCode: 'custom_define',
+          },
+          labelField: 'itemText',
+          valueField: 'itemValue',
+          placeholder: '请选择命令类型',
+          onChange() {
+            setFieldsValue({ [DataSourceField.COMMAND]: null, [DataSourceField.SERVICE]: null });
+          },
+        };
+      },
+    },
+    {
+      field: DataSourceField.SERVICE,
+      component: 'ApiSelect',
+      label: '服务',
+      colProps: { span: 8 },
+      rules: [{ required: true, message: '请选择服务' }],
+      ifShow: ({ model }) =>
+        isControlComponent(frontId as FrontComponent) &&
+        model[DataSourceField.COMMAND_TYPE] === CommandTypeEnum.SERVICE.toString() &&
+        isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps({ formModel, formActionType }) {
+        const { setFieldsValue } = formActionType;
+        const deviceProfileId = formModel[DataSourceField.DEVICE_PROFILE_ID];
+        const transportType = formModel[DataSourceField.TRANSPORT_TYPE];
+        if (isEdit && ![deviceProfileId, transportType].every(Boolean))
+          return { placeholder: '请选择服务', getPopupContainer: () => document.body };
+        return {
+          api: async () => {
+            try {
+              if (deviceProfileId) {
+                return await getDeviceService(deviceProfileId);
+              }
+            } catch (error) {}
+            return [];
+          },
+          placeholder: '请选择服务',
           getPopupContainer: () => document.body,
+          onChange(value: string, options: ModelOfMatterParams) {
+            const command = value ? (options.functionJson.inputData || [])[0].serviceCommand : null;
+            setFieldsValue({ [DataSourceField.COMMAND]: command });
+          },
         };
       },
     },
     {
+      field: DataSourceField.COMMAND,
+      component: 'Input',
+      label: '命令',
+      colProps: { span: 8 },
+      // 是控制组件  && 自定义命令  && 传输协议为TCP
+      ifShow: ({ model }) =>
+        isControlComponent(frontId!) &&
+        model[DataSourceField.COMMAND_TYPE] === CommandTypeEnum.CUSTOM.toString() &&
+        model[DataSourceField.TRANSPORT_TYPE] &&
+        isTcpProfile(model[DataSourceField.TRANSPORT_TYPE]),
+      componentProps: {
+        placeholder: '请输入下发命令',
+      },
+    },
+    {
       field: DataSourceField.DEVICE_RENAME,
       component: 'Input',
       label: '设备名',

@@ -127,13 +127,15 @@ export function useSocketConnect(dataSourceRef: Ref<DataBoardLayoutInfo[]>) {
         if (isNullAndUnDef(subscriptionId)) return;
         const mappingRecord = cmdIdMapping.get(subscriptionId);
         if (!mappingRecord || !data) return;
-        mappingRecord.forEach((item) => {
+
+        for (const item of mappingRecord) {
           const { attribute, recordIndex, dataSourceIndex } = item;
+          if (!attribute) continue;
           const [[timespan, value]] = data[attribute];
           const record = getNeedUpdateValueByIndex(recordIndex, dataSourceIndex);
           record.componentInfo.value = value;
           record.componentInfo.updateTime = timespan;
-        });
+        }
         return;
       } catch (error) {
         throw Error(error as string);