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

fix: 修复设备详情命令下发枚举类型无法下发&&优化命令下发逻辑

See merge request yunteng/thingskit-front!1174

 import { DeviceProfileModel } from '../../device/model/deviceModel';
 import { DeviceProfileModel } from '../../device/model/deviceModel';
-import { HistoryData } from './model';
+import { DeviceAttributeItemType, HistoryData } from './model';
 import { defHttp } from '/@/utils/http/axios';
 import { defHttp } from '/@/utils/http/axios';
 import { isString } from '/@/utils/is';
 import { isString } from '/@/utils/is';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
 import { OrderByEnum } from '/@/views/device/localtion/cpns/TimePeriodForm/config';
@@ -38,7 +38,7 @@ export const getDeviceDataKeys = (id: string) => {
 };
 };
 // 获取设备状态，在线 or 离线时间
 // 获取设备状态，在线 or 离线时间
 export const getDeviceActiveTime = (entityId: string) => {
 export const getDeviceActiveTime = (entityId: string) => {
-  return defHttp.get(
+  return defHttp.get<DeviceAttributeItemType[]>(
     {
     {
       url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`,
       url: `/plugins/telemetry/DEVICE/${entityId}/values/attributes?keys=active`,
     },
     },

 export interface HistoryData {
 export interface HistoryData {
   [key: string]: { ts: number; value: string }[];
   [key: string]: { ts: number; value: string }[];
 }
 }
+
+export interface DeviceAttributeItemType {
+  key: string;
+  value: boolean;
+  lastUpdateTs: number;
+}

@@ -13,7 +13,7 @@ import { ChildDeviceParams } from './model/deviceModel';
 import { PaginationResult } from '/#/axios';
 import { PaginationResult } from '/#/axios';
 import { AlarmLogItem } from './model/deviceConfigModel';
 import { AlarmLogItem } from './model/deviceConfigModel';
 import { omit } from 'lodash-es';
 import { omit } from 'lodash-es';
-import { CommandDeliveryWayEnum } from '/@/enums/toolEnum';
+import { CommandDeliveryWayEnum } from '/@/enums/deviceEnum';
 enum DeviceManagerApi {
 enum DeviceManagerApi {
   /**
   /**
    * 设备URL
    * 设备URL

 import { BasicPageParams } from '/@/api/model/baseModel';
 import { BasicPageParams } from '/@/api/model/baseModel';
+import { CommandTypeEnum, RPCCommandMethodEnum } from '/@/enums/deviceEnum';
 
 
 export type TDeviceConfigPageQueryParam = BasicPageParams & TDeviceConfigParams;
 export type TDeviceConfigPageQueryParam = BasicPageParams & TDeviceConfigParams;
 
 
@@ -184,3 +185,10 @@ export interface Configuration {
 export interface TransportConfiguration {
 export interface TransportConfiguration {
   type: string;
   type: string;
 }
 }
+
+export interface RpcCommandType {
+  additionalInfo: { cmdType: CommandTypeEnum };
+  method: RPCCommandMethodEnum;
+  params: Recordable | string | number;
+  persistent: boolean;
+}

@@ -2,7 +2,7 @@ import { withInstall } from '/@/utils';
 // @ts-ignore
 // @ts-ignore
 import codeEditor from './src/CodeEditor.vue';
 import codeEditor from './src/CodeEditor.vue';
 import jsonPreview from './src/json-preview/JsonPreview.vue';
 import jsonPreview from './src/json-preview/JsonPreview.vue';
-export { JSONEditor } from './src/JSONEditor';
+export { JSONEditor, JSONEditorValidator, parseStringToJSON } from './src/JSONEditor';
 
 
 export const CodeEditor = withInstall(codeEditor);
 export const CodeEditor = withInstall(codeEditor);
 export const JsonPreview = withInstall(jsonPreview);
 export const JsonPreview = withInstall(jsonPreview);

@@ -12,17 +12,17 @@ export { default as ApiTreeSelect } from './src/components/ApiTreeSelect.vue';
 export { default as ApiRadioGroup } from './src/components/ApiRadioGroup.vue';
 export { default as ApiRadioGroup } from './src/components/ApiRadioGroup.vue';
 export { default as ApiUpload } from './src/components/ApiUpload.vue';
 export { default as ApiUpload } from './src/components/ApiUpload.vue';
 
 
-export { default as StructForm } from './src/externalCompns/components/StructForm/StructForm.vue';
+export { default as StructForm } from './src/components/StructForm/StructForm.vue';
 export { default as JavaScriptFunctionEditor } from './src/components/JavaScriptFunctionEditor.vue';
 export { default as JavaScriptFunctionEditor } from './src/components/JavaScriptFunctionEditor.vue';
 
 
-export { ThingsModelForm } from './src/externalCompns/components/ThingsModelForm';
+export { ThingsModelForm } from './src/components/ThingsModelForm';
 
 
 //注册自定义组件
 //注册自定义组件
 export {
 export {
   JEasyCron,
   JEasyCron,
   JEasyCronInner,
   JEasyCronInner,
   JEasyCronModal,
   JEasyCronModal,
-} from '/@/components/Form/src/externalCompns/components/JEasyCron';
+} from '/@/components/Form/src/components/JEasyCron';
 // Jeecg自定义校验
 // Jeecg自定义校验
-export { JCronValidator } from '/@/components/Form/src/externalCompns/components/JEasyCron';
+export { JCronValidator } from '/@/components/Form/src/components/JEasyCron';
 // export { BasicForm };
 // export { BasicForm };

@@ -29,20 +29,20 @@ import { IconPicker } from '/@/components/Icon';
 import { CountdownInput } from '/@/components/CountDown';
 import { CountdownInput } from '/@/components/CountDown';
 import ApiRadioGroup from './components/ApiRadioGroup.vue';
 import ApiRadioGroup from './components/ApiRadioGroup.vue';
 //自定义组件
 //自定义组件
-import JAddInput from './externalCompns/components/JAddInput.vue';
-import { JEasyCron } from './externalCompns/components/JEasyCron';
+import JAddInput from './components/JAddInput.vue';
+import { JEasyCron } from './components/JEasyCron';
 import ColorPicker from './components/ColorPicker.vue';
 import ColorPicker from './components/ColorPicker.vue';
 import IconDrawer from './components/IconDrawer.vue';
 import IconDrawer from './components/IconDrawer.vue';
 import ApiUpload from './components/ApiUpload.vue';
 import ApiUpload from './components/ApiUpload.vue';
 import ApiSearchSelect from './components/ApiSearchSelect.vue';
 import ApiSearchSelect from './components/ApiSearchSelect.vue';
-import CustomMinMaxInput from './externalCompns/components/CustomMinMaxInput.vue';
-import StructForm from './externalCompns/components/StructForm/StructForm.vue';
+import CustomMinMaxInput from './components/CustomMinMaxInput.vue';
+import StructForm from './components/StructForm/StructForm.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import ApiSelectScrollLoad from './components/ApiSelectScrollLoad.vue';
 import InputGroup from './components/InputGroup.vue';
 import InputGroup from './components/InputGroup.vue';
 import RegisterAddressInput from '/@/views/task/center/components/PollCommandInput/RegisterAddressInput.vue';
 import RegisterAddressInput from '/@/views/task/center/components/PollCommandInput/RegisterAddressInput.vue';
-import ExtendDesc from '/@/components/Form/src/externalCompns/components/ExtendDesc/index.vue';
-import DeviceProfileForm from '/@/components/Form/src/externalCompns/components/DeviceProfileForm/index.vue';
-import EnumList from './externalCompns/components/StructForm/EnumList.vue';
+import ExtendDesc from '/@/components/Form/src/components/ExtendDesc/index.vue';
+import DeviceProfileForm from '/@/components/Form/src/components/DeviceProfileForm/index.vue';
+import EnumList from './components/StructForm/EnumList.vue';
 
 
 const componentMap = new Map<ComponentType, Component>();
 const componentMap = new Map<ComponentType, Component>();
 
 

-import { FormSchema } from '../../../types/form';
+import { FormSchema } from '/@/components/Form';
 import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { validateTCPCustomCommand } from '.';
 
 
 export const getFormSchemas = ({
 export const getFormSchemas = ({
   structJSON: structJson,
   structJSON: structJson,
@@ -143,6 +144,7 @@ export const getFormSchemas = ({
       component: 'Input',
       component: 'Input',
       required,
       required,
       defaultValue: serviceCommand,
       defaultValue: serviceCommand,
+      rules: [{ validator: validateTCPCustomCommand }],
       componentProps: {
       componentProps: {
         placeholder: `请输入服务命令`,
         placeholder: `请输入服务命令`,
       },
       },

@@ -5,7 +5,7 @@
   import { ThingsModelForm } from '.';
   import { ThingsModelForm } from '.';
   import { DefineComponentsBasicExpose } from '/#/utils';
   import { DefineComponentsBasicExpose } from '/#/utils';
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
-  import { useForm } from '../../../hooks/useForm';
+  import { useForm } from '../../hooks/useForm';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { BasicForm } from '/@/components/Form';
   import { BasicForm } from '/@/components/Form';
 
 

-<script lang="ts" setup>
-  import { Card } from 'ant-design-vue';
-  import { computed, nextTick, onMounted, onUpdated, unref, watch } from 'vue';
-  import { BasicCreateFormParams } from './type';
-  import { DynamicProps } from '/#/utils';
-  import { Specs, StructJSON } from '/@/api/device/model/modelOfMatterModel';
-  import { BasicForm, FormProps, FormSchema, useForm } from '/@/components/Form';
-  import { DataTypeEnum } from '/@/enums/objectModelEnum';
-  import { ReadAndWriteEnum } from '/@/enums/toolEnum';
-
-  const props = withDefaults(
-    defineProps<{
-      inputData?: StructJSON[];
-      formProps?: FormProps;
-      value?: Recordable;
-      required?: boolean;
-    }>(),
-    {
-      inputData: () => [] as StructJSON[],
-      formProps: () => ({}),
-      value: () => ({}),
-    }
-  );
-
-  const emit = defineEmits(['update:value']);
-
-  const getCurrentKeys = computed(() => {
-    const { inputData } = props;
-    return (inputData || []).map((item) => item.identifier);
-  });
-
-  const [register, { setProps, getFieldsValue, setFieldsValue }] = useForm({
-    schemas: [],
-    showActionButtonGroup: false,
-    layout: 'inline',
-    labelWidth: 80,
-    wrapperCol: { span: 12 },
-    ...(props.formProps || ({} as unknown as Partial<DynamicProps<FormProps>>)),
-  });
-
-  const syncValue = (key: string, value: any) => {
-    let record = getFieldsValue();
-    record = { ...record, [key]: value };
-    const setValues = {};
-    Object.keys(record).forEach((key) => {
-      const hasKey = unref(getCurrentKeys).includes(key);
-      if (hasKey) {
-        setValues[key] = record[key];
-      }
-    });
-    emit('update:value', setValues);
-  };
-
-  const createInputNumber = ({
-    identifier,
-    functionName,
-    specs,
-  }: BasicCreateFormParams): FormSchema => {
-    const { valueRange } = specs! as Partial<Specs>;
-    const { max = 2147483647, min = -2147483648 } = valueRange || {};
-    return {
-      field: identifier,
-      label: functionName,
-      component: 'InputNumber',
-      rules: [
-        {
-          required: props.required,
-          message: `${functionName}是必填项`,
-        },
-        {
-          type: 'number',
-          trigger: 'change',
-          validator: (_rule, value) => {
-            const reg = /^[0-9]*$/;
-            if (!reg.test(value)) return Promise.reject(`${functionName}不是一个有效的数字`);
-            if (value < min || value > max) {
-              return Promise.reject(`${functionName}取值范围在${min}~${max}之间`);
-            }
-            return Promise.resolve(value);
-          },
-        },
-      ],
-      componentProps: {
-        max,
-        min,
-        // step: step,
-        // formatter: (value: string) => value,
-        // parser: (string: string) => {
-        // if (dataType === DataTypeEnum.NUMBER_INT) {
-        //     return Number(Number(string).toFixed());
-        //   }
-        //   return Number(string);
-        // },
-        onChange: (value: string) => {
-          syncValue(identifier, value);
-        },
-      },
-    } as FormSchema;
-  };
-
-  const createInput = ({ identifier, functionName, specs }: BasicCreateFormParams): FormSchema => {
-    const { length = 10240 } = specs! as Partial<Specs>;
-    return {
-      field: identifier,
-      label: functionName,
-      component: 'Input',
-      rules: [
-        {
-          required: props.required,
-          message: `${functionName}是必填项`,
-        },
-        {
-          type: 'string',
-          trigger: 'change',
-          validator: (_rule, value) => {
-            if (value.length > length) {
-              return Promise.reject(`${functionName}数据长度应该小于${length}`);
-            }
-            return Promise.resolve(value);
-          },
-        },
-      ],
-      componentProps: {
-        maxLength: length,
-        onChange: (value: InputEvent) => {
-          syncValue(identifier, (value.target as HTMLInputElement).value);
-        },
-      },
-    } as FormSchema;
-  };
-
-  const createSelect = ({ identifier, functionName, specs }: BasicCreateFormParams): FormSchema => {
-    const { boolClose, boolOpen } = specs! as Partial<Specs>;
-    return {
-      field: identifier,
-      label: functionName,
-      component: 'Select',
-      rules: [
-        {
-          required: props.required,
-          message: `${functionName}是必填项`,
-          type: 'number',
-        },
-      ],
-      componentProps: {
-        options: [
-          { label: `${boolClose}-0`, value: 0 },
-          { label: `${boolOpen}-1`, value: 1 },
-        ],
-        onChange: (value: string) => {
-          syncValue(identifier, value);
-        },
-      },
-    };
-  };
-
-  const createInputJson = ({ identifier, functionName }: BasicCreateFormParams): FormSchema => {
-    return {
-      field: identifier,
-      label: functionName,
-      component: 'InputTextArea',
-      rules: [
-        {
-          required: props.required,
-          message: `${functionName}是必填项`,
-        },
-      ],
-      componentProps: {
-        onChange: (value: InputEvent) => {
-          syncValue(identifier, (value.target as HTMLInputElement).value);
-        },
-      },
-    };
-  };
-
-  const transformToFormSchema = (inputData: StructJSON[]) => {
-    const schemas: FormSchema[] = [];
-    for (const item of inputData) {
-      const { dataType, identifier, functionName, accessMode } = item;
-      if (accessMode === ReadAndWriteEnum.READ) {
-        continue;
-      }
-      const { type, specs } = dataType! || {};
-
-      const params: BasicCreateFormParams = {
-        identifier: identifier!,
-        functionName: functionName!,
-        dataType: dataType! as unknown as DataTypeEnum,
-        specs: specs as Partial<Specs>,
-      };
-      if (type === DataTypeEnum.NUMBER_INT || type === DataTypeEnum.NUMBER_DOUBLE) {
-        schemas.push(createInputNumber(params));
-      }
-
-      if (type === DataTypeEnum.BOOL) {
-        schemas.push(createSelect(params));
-      }
-
-      if (type === DataTypeEnum.STRING) {
-        schemas.push(createInput(params));
-      }
-
-      if (type === DataTypeEnum.STRUCT) {
-        schemas.push(createInputJson(params));
-      }
-    }
-
-    return schemas;
-  };
-
-  const generateSchemas = (value: StructJSON[]) => {
-    if (value && value.length) {
-      const schemas = transformToFormSchema(value);
-      setProps({ schemas });
-    }
-  };
-
-  onMounted(() => {
-    generateSchemas(props.inputData);
-  });
-
-  onUpdated(async () => {
-    if (props.inputData && props.inputData.length) {
-      await nextTick();
-      setFieldsValue(props.value || {});
-    }
-  });
-
-  watch(
-    () => props.inputData,
-    (value) => {
-      generateSchemas(value);
-    }
-  );
-
-  watch(
-    () => props.formProps,
-    (value) => {
-      setProps(value);
-    }
-  );
-</script>
-
-<template>
-  <Card bordered class="!border-dashed !rounded-lg !border-2px">
-    <!-- <Alert class="!mb-4 w-32" message="服务参数配置" type="info" /> -->
-    <BasicForm class="object-model-validate-form" @register="register" />
-  </Card>
-</template>
-
-<style lang="less">
-  .object-model-validate-form {
-    .ant-input-number {
-      width: 100% !important;
-    }
-  }
-</style>

-import { Specs } from '/@/api/device/model/modelOfMatterModel';
-import { DataTypeEnum } from '/@/enums/objectModelEnum';
-
-export interface BasicCreateFormParams {
-  identifier: string;
-  functionName: string;
-  dataType: DataTypeEnum;
-  specs: Partial<Specs>;
-}

@@ -122,7 +122,6 @@ export type ComponentType =
   | 'ApiSelectScrollLoad'
   | 'ApiSelectScrollLoad'
   | 'TransferModal'
   | 'TransferModal'
   | 'TransferTableModal'
   | 'TransferTableModal'
-  | 'ObjectModelValidateForm'
   | 'ThingsModelForm'
   | 'ThingsModelForm'
   | 'DevicePicker'
   | 'DevicePicker'
   | 'ProductPicker'
   | 'ProductPicker'

+export enum TransportTypeEnum {
+  DEFAULT = 'DEFAULT',
+  MQTT = 'MQTT',
+  COAP = 'COAP',
+  LWM2M = 'LWM2M',
+  SNMP = 'SNMP',
+  TCP = 'TCP',
+}
+
+export enum ReadAndWriteEnum {
+  READ = 'r',
+  READ_AND_WRITE = 'rw',
+}
+
+export enum ServiceCallTypeEnum {
+  ASYNC = 'ASYNC',
+  SYNC = 'SYNC',
+}
+
+export enum ServiceCallTypeNameEnum {
+  ASYNC = '异步',
+  SYNC = '同步',
+}
+
+export enum CommandDeliveryWayEnum {
+  ONE_WAY = 'oneway',
+  TWO_WAY = 'twoway',
+}
+
+export enum CommandDeliveryWayNameEnum {
+  ONE_WAY = '单向',
+  TWO_WAY = '双向',
+}
+
+export enum CommandTypeEnum {
+  CUSTOM = 0,
+  SERVICE = 1,
+  ATTRIBUTE = 2,
+  API = 'api',
+}
+
+export enum CommandTypeNameEnum {
+  CUSTOM = '自定义',
+  SERVICE = '服务',
+  ATTRIBUTE = '属性',
+}
+
+export enum RPCCommandMethodEnum {
+  THINGSKIT = 'methodThingskit',
+}

@@ -154,16 +154,3 @@ export enum ExecutionActionNameEnum {
   DEVICE_OUT = '设备输出',
   DEVICE_OUT = '设备输出',
   MSG_NOTIFY = '告警输出',
   MSG_NOTIFY = '告警输出',
 }
 }
-
-export enum CommandTypeEnum {
-  CUSTOM = 0,
-  SERVICE = 1,
-  ATTRIBUTE = 2,
-  API = 'api',
-}
-
-export enum CommandTypeNameEnum {
-  CUSTOM = '自定义',
-  SERVICE = '服务',
-  ATTRIBUTE = '属性',
-}

@@ -29,23 +29,3 @@ export enum BooleanStringEnum {
   TRUE = 'true',
   TRUE = 'true',
   FALSE = 'false',
   FALSE = 'false',
 }
 }
-
-export enum ReadAndWriteEnum {
-  READ = 'r',
-  READ_AND_WRITE = 'rw',
-}
-
-export enum ServiceCallTypeEnum {
-  ASYNC = 'ASYNC',
-  SYNC = 'SYNC',
-}
-
-export enum ServiceCallTypeNameEnum {
-  ASYNC = '异步',
-  SYNC = '同步',
-}
-
-export enum CommandDeliveryWayEnum {
-  ONE_WAY = 'oneway',
-  TWO_WAY = 'twoway',
-}

-import { FormProps, FormSchema, useComponentRegister } from '/@/components/Form';
+import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { getGatewayDevice, queryDeviceProfileBy } from '/@/api/device/deviceManager';
 import { getGatewayDevice, queryDeviceProfileBy } from '/@/api/device/deviceManager';
-import { TransportTypeEnum } from '../../profiles/components/TransportDescript/const';
-import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
-import { getModelServices } from '/@/api/device/modelOfMatter';
-import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-import { h, toRaw, unref } from 'vue';
-import ObjectModelValidateForm from '/@/components/Form/src/externalCompns/components/ObjectModelValidateForm/ObjectModelValidateForm.vue';
-import { CommandDeliveryWayEnum, ServiceCallTypeEnum } from '/@/enums/toolEnum';
+import { h } from 'vue';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { AddressTypeEnum } from '/@/views/task/center/components/PollCommandInput';
 import { AddressTypeEnum } from '/@/views/task/center/components/PollCommandInput';
 import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
 import { FileItem } from '/@/components/Form/src/components/ApiUpload.vue';
@@ -17,9 +11,9 @@ import { createImgPreview } from '/@/components/Preview';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 import { uploadThumbnail } from '/@/api/configuration/center/configurationCenter';
 import LockControlGroup from '/@/components/Form/src/components/LockControlGroup.vue';
 import LockControlGroup from '/@/components/Form/src/components/LockControlGroup.vue';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 useComponentRegister('JSONEditor', JSONEditor);
 useComponentRegister('JSONEditor', JSONEditor);
-useComponentRegister('ObjectModelValidateForm', ObjectModelValidateForm);
 useComponentRegister('LockControlGroup', LockControlGroup);
 useComponentRegister('LockControlGroup', LockControlGroup);
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 
@@ -910,214 +904,3 @@ export const TokenSchemas: FormSchema[] = [
     },
     },
   },
   },
 ];
 ];
-
-export enum ValueType {
-  JSON = 'json',
-  STRING = 'string',
-}
-
-export enum CommandFieldsEnum {
-  COMMAND_TYPE = 'commandType',
-  VALUE_TYPE = 'valueType',
-  COMMAND_TEXT = 'commandText',
-  COMAND_VALUE = 'commandValue',
-  SERVICE = 'service',
-  SERVICE_TYPE = 'service_type',
-  TCP_SERVICE = 'tcpService',
-  MODEL_INPUT = 'modelInput',
-  CUSTOM_TYPE = 'customType',
-}
-
-export enum CommandType {
-  CUSTOM = 'custom',
-  SERVICE = 'service',
-}
-
-export const CommandSchemas = (
-  transportType: TransportTypeEnum,
-  deviceProfileId: string
-): FormSchema[] => {
-  return [
-    {
-      field: CommandFieldsEnum.COMMAND_TYPE,
-      component: 'RadioGroup',
-      label: '下发类型',
-      defaultValue: CommandType.CUSTOM,
-      componentProps: ({ formActionType }) => {
-        const { setFieldsValue } = formActionType;
-        return {
-          options: [
-            { label: '自定义', value: CommandType.CUSTOM },
-            { label: '服务', value: CommandType.SERVICE },
-          ],
-          onChange() {
-            setFieldsValue({
-              [CommandFieldsEnum.SERVICE]: null,
-              [CommandFieldsEnum.MODEL_INPUT]: null,
-              [CommandFieldsEnum.COMAND_VALUE]: null,
-              [CommandFieldsEnum.COMMAND_TEXT]: null,
-            });
-          },
-        };
-      },
-    },
-    {
-      field: CommandFieldsEnum.CUSTOM_TYPE,
-      component: 'RadioGroup',
-      label: '单向/双向',
-      defaultValue: CommandDeliveryWayEnum.ONE_WAY,
-      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
-      componentProps: {
-        options: [
-          {
-            label: '单向',
-            value: CommandDeliveryWayEnum.ONE_WAY,
-          },
-          {
-            label: '双向',
-            value: CommandDeliveryWayEnum.TWO_WAY,
-          },
-        ],
-      },
-    },
-    {
-      field: CommandFieldsEnum.VALUE_TYPE,
-      label: '命令类型',
-      component: 'RadioGroup',
-      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
-      defaultValue: transportType === TransportTypeEnum.TCP ? ValueType.STRING : ValueType.JSON,
-      componentProps: () => {
-        const options: Record<'label' | 'value', string>[] = [];
-        if (transportType === TransportTypeEnum.TCP) {
-          options.push({ label: '字符串', value: ValueType.STRING });
-        } else {
-          options.push({ label: 'JSON', value: ValueType.JSON });
-        }
-        return {
-          options,
-        };
-      },
-    },
-    {
-      field: CommandFieldsEnum.COMMAND_TEXT,
-      label: '命令',
-      ifShow: ({ model }) =>
-        model[CommandFieldsEnum.VALUE_TYPE] === ValueType.STRING &&
-        model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
-      component: 'InputTextArea',
-      componentProps: {
-        autoSize: {
-          minRows: 3,
-        },
-        placeholder: '请输入命令内容',
-      },
-      dynamicRules: () => {
-        return [
-          {
-            required: false,
-            validator: (_, value) => {
-              const zg = /^[0-9a-zA-Z]*$/;
-              if (!zg.test(value)) {
-                return Promise.reject('输入的内容只能是字母和数字的组合');
-              } else {
-                return Promise.resolve();
-              }
-            },
-          },
-        ];
-      },
-    },
-    {
-      field: CommandFieldsEnum.COMAND_VALUE,
-      label: '命令',
-      component: 'JSONEditor',
-      colProps: { span: 20 },
-      changeEvent: 'update:value',
-      valueField: 'value',
-      rules: [...JSONEditorValidator()],
-      ifShow: ({ model }) =>
-        model[CommandFieldsEnum.VALUE_TYPE] === ValueType.JSON &&
-        model[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM,
-
-      componentProps: {
-        height: 250,
-      },
-    },
-    {
-      field: CommandFieldsEnum.SERVICE,
-      label: '服务',
-      component: 'ApiSelect',
-      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] !== CommandType.CUSTOM,
-      rules: [{ required: true, message: '请选择服务' }],
-      componentProps: ({ formActionType }) => {
-        const { setFieldsValue, updateSchema } = formActionType;
-        return {
-          api: async () => {
-            try {
-              const result = await getModelServices({ deviceProfileId });
-              return result || [];
-            } catch (error) {
-              return [];
-            }
-          },
-          valueField: 'identifier',
-          labelField: 'functionName',
-          getPopupContainer: () => document.body,
-          onChange(value: string, options: ModelOfMatterParams) {
-            if (!value) return;
-
-            const setValues = {
-              [CommandFieldsEnum.CUSTOM_TYPE]:
-                options.callType === ServiceCallTypeEnum.ASYNC
-                  ? CommandDeliveryWayEnum.ONE_WAY
-                  : CommandDeliveryWayEnum.TWO_WAY,
-              [CommandFieldsEnum.MODEL_INPUT]: null,
-            };
-
-            if (transportType !== TransportTypeEnum.TCP) {
-              updateSchema({
-                field: CommandFieldsEnum.MODEL_INPUT,
-                componentProps: {
-                  inputData: toRaw(unref(options.functionJson.inputData)),
-                },
-              });
-            } else {
-              Object.assign(setValues, {
-                [CommandFieldsEnum.TCP_SERVICE]:
-                  options.functionJson?.inputData?.[0]?.serviceCommand,
-              });
-            }
-
-            setFieldsValue(setValues);
-          },
-        };
-      },
-    },
-    {
-      field: CommandFieldsEnum.TCP_SERVICE,
-      component: 'Input',
-      label: '命令',
-      dynamicDisabled: true,
-      ifShow: ({ model }) =>
-        model[CommandFieldsEnum.SERVICE] &&
-        transportType === TransportTypeEnum.TCP &&
-        model[CommandFieldsEnum.COMMAND_TYPE] !== CommandType.CUSTOM,
-    },
-    {
-      field: CommandFieldsEnum.MODEL_INPUT,
-      component: 'ObjectModelValidateForm',
-      label: '输入参数',
-      changeEvent: 'update:value',
-      valueField: 'value',
-      ifShow: ({ model }) =>
-        model[CommandFieldsEnum.SERVICE] &&
-        transportType !== TransportTypeEnum.TCP &&
-        model[CommandFieldsEnum.COMMAND_TYPE] !== CommandType.CUSTOM,
-      componentProps: {
-        formProps: {
-          wrapperCol: { span: 24 },
-        } as FormProps,
-      },
-    },
-  ];
-};

@@ -5,8 +5,8 @@ import { DeviceRecord, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { BasicColumn } from '/@/components/Table';
 import { BasicColumn } from '/@/components/Table';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import XLSX, { CellObject } from 'xlsx';
 import XLSX, { CellObject } from 'xlsx';
 
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);

+import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
+import { getModelServices } from '/@/api/device/modelOfMatter';
+import { FormProps, FormSchema, useComponentRegister } from '/@/components/Form';
+import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
+import { JSONEditor, JSONEditorValidator } from '/@/components/CodeEditor';
+import {
+  TransportTypeEnum,
+  CommandTypeNameEnum,
+  CommandTypeEnum,
+  ServiceCallTypeEnum,
+  CommandDeliveryWayEnum,
+  CommandDeliveryWayNameEnum,
+} from '/@/enums/deviceEnum';
+
+export interface CommandDeliveryFormFieldType {
+  [CommandFieldsEnum.COMMAND_TYPE]: CommandTypeEnum;
+  [CommandFieldsEnum.TCP_COMMAND_VALUE]?: string;
+  [CommandFieldsEnum.COMAND_VALUE]?: string;
+  [CommandFieldsEnum.SERVICE]?: string;
+  [CommandFieldsEnum.MODEL_INPUT]?: ModelOfMatterParams;
+  [CommandFieldsEnum.CALL_TYPE]: CommandDeliveryWayEnum;
+}
+
+export enum CommandFieldsEnum {
+  COMMAND_TYPE = 'commandType',
+  TCP_COMMAND_VALUE = 'tcpCommandValue',
+  COMAND_VALUE = 'commandValue',
+  SERVICE = 'service',
+  MODEL_INPUT = 'modelInput',
+  CALL_TYPE = 'callType',
+
+  SERVICE_COMMAND = 'serviceCommand',
+
+  SERVICE_OBJECT_MODEL = 'serviceObjectModel',
+}
+
+useComponentRegister('JSONEditor', JSONEditor);
+
+export const CommandSchemas = (
+  transportType: TransportTypeEnum,
+  deviceProfileId: string
+): FormSchema[] => {
+  return [
+    {
+      field: CommandFieldsEnum.COMMAND_TYPE,
+      component: 'RadioGroup',
+      label: '下发类型',
+      defaultValue: CommandTypeEnum.CUSTOM,
+      required: true,
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          options: [
+            { label: CommandTypeNameEnum.CUSTOM, value: CommandTypeEnum.CUSTOM },
+            { label: CommandTypeNameEnum.SERVICE, value: CommandTypeEnum.SERVICE },
+          ],
+          onChange() {
+            setFieldsValue({
+              [CommandFieldsEnum.SERVICE]: null,
+              [CommandFieldsEnum.MODEL_INPUT]: null,
+              [CommandFieldsEnum.COMAND_VALUE]: null,
+              [CommandFieldsEnum.TCP_COMMAND_VALUE]: null,
+            });
+          },
+        };
+      },
+    },
+    {
+      field: CommandFieldsEnum.CALL_TYPE,
+      component: 'RadioGroup',
+      label: '单向/双向',
+      required: true,
+      defaultValue: CommandDeliveryWayEnum.ONE_WAY,
+      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.CUSTOM,
+      componentProps: {
+        options: Object.keys(CommandDeliveryWayEnum).map((key) => ({
+          label: CommandDeliveryWayNameEnum[key],
+          value: CommandDeliveryWayEnum[key],
+        })),
+      },
+    },
+    {
+      field: CommandFieldsEnum.TCP_COMMAND_VALUE,
+      label: '命令',
+      required: true,
+      ifShow: ({ model }) =>
+        transportType === TransportTypeEnum.TCP &&
+        model[CommandFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.CUSTOM,
+      component: 'Input',
+      rules: [{ validator: validateTCPCustomCommand }],
+      componentProps: {
+        placeholder: '请输入命令',
+      },
+    },
+    {
+      field: CommandFieldsEnum.COMAND_VALUE,
+      label: '命令',
+      component: 'JSONEditor',
+      colProps: { span: 20 },
+      changeEvent: 'update:value',
+      valueField: 'value',
+      required: true,
+      rules: JSONEditorValidator(),
+      ifShow: ({ model }) =>
+        transportType !== TransportTypeEnum.TCP &&
+        model[CommandFieldsEnum.COMMAND_TYPE] === CommandTypeEnum.CUSTOM,
+      componentProps: {
+        height: 250,
+      },
+    },
+    {
+      field: CommandFieldsEnum.SERVICE,
+      label: '服务',
+      component: 'ApiSelect',
+      required: true,
+      ifShow: ({ model }) => model[CommandFieldsEnum.COMMAND_TYPE] !== CommandTypeEnum.CUSTOM,
+      rules: [{ required: true, message: '请选择服务' }],
+      componentProps: ({ formActionType }) => {
+        const { setFieldsValue } = formActionType;
+        return {
+          api: getModelServices,
+          params: {
+            deviceProfileId,
+          },
+          valueField: 'identifier',
+          labelField: 'functionName',
+          getPopupContainer: () => document.body,
+          placeholder: '请选择服务',
+          onChange(
+            value: string,
+            options: ModelOfMatterParams & Record<'label' | 'value', string>
+          ) {
+            if (!value) return;
+            setFieldsValue({
+              [CommandFieldsEnum.CALL_TYPE]:
+                options.callType === ServiceCallTypeEnum.ASYNC
+                  ? CommandDeliveryWayEnum.ONE_WAY
+                  : CommandDeliveryWayEnum.TWO_WAY,
+              [CommandFieldsEnum.MODEL_INPUT]: null,
+              [CommandFieldsEnum.SERVICE_OBJECT_MODEL]: Object.assign(options, {
+                functionName: options.label,
+                identifier: options.value,
+              }),
+            });
+          },
+        };
+      },
+    },
+    {
+      field: CommandFieldsEnum.SERVICE_OBJECT_MODEL,
+      label: '服务物模型',
+      component: 'Input',
+      ifShow: false,
+    },
+    {
+      field: CommandFieldsEnum.MODEL_INPUT,
+      component: 'Input',
+      label: '输入参数',
+      changeEvent: 'update:value',
+      valueField: 'value',
+      ifShow: ({ model }) =>
+        model[CommandFieldsEnum.SERVICE] &&
+        model[CommandFieldsEnum.SERVICE_OBJECT_MODEL] &&
+        model[CommandFieldsEnum.COMMAND_TYPE] !== CommandTypeEnum.CUSTOM,
+      componentProps: {
+        formProps: {
+          wrapperCol: { span: 24 },
+        } as FormProps,
+      },
+      slot: 'serviceCommand',
+    },
+  ];
+};

+export { default as CommandDeliveryModal } from './index.vue';

+<template>
+  <BasicModal
+    title="命令下发"
+    :width="650"
+    @register="registerModal"
+    @ok="handleOk"
+    @cancel="handleCancel"
+  >
+    <BasicForm @register="registerForm">
+      <template #serviceCommand="{ field, model }">
+        <ThingsModelForm
+          :disabled="deviceDetail?.transportType === TransportTypeEnum.TCP"
+          ref="thingsModelFormRef"
+          v-model:value="model[field]"
+          :key="model[CommandFieldsEnum.SERVICE_OBJECT_MODEL]?.identifier"
+          :inputData="model[CommandFieldsEnum.SERVICE_OBJECT_MODEL]?.functionJson?.inputData"
+          :transportType="deviceDetail?.transportType"
+        />
+      </template>
+    </BasicForm>
+  </BasicModal>
+</template>
+<script lang="ts" setup>
+  import { nextTick, ref, unref } from 'vue';
+  import { BasicForm, ThingsModelForm, useForm } from '/@/components/Form';
+  import { CommandDeliveryFormFieldType, CommandFieldsEnum, CommandSchemas } from './config';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { CommandDeliveryWayEnum } from '/@/enums/deviceEnum';
+  import { CommandTypeEnum, RPCCommandMethodEnum, TransportTypeEnum } from '/@/enums/deviceEnum';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { getDeviceActiveTime } from '/@/api/alarm/position';
+  import { RpcCommandType } from '/@/api/device/model/deviceConfigModel';
+  import { parseStringToJSON } from '/@/components/CodeEditor';
+  import { commandIssuanceApi } from '/@/api/device/deviceManager';
+
+  defineEmits(['register']);
+
+  const thingsModelFormRef = ref<InstanceType<typeof ThingsModelForm>>();
+  const deviceDetail = ref<DeviceRecord>();
+
+  const [registerModal, { setModalProps }] = useModalInner(
+    (params: ModalParamsType<DeviceRecord>) => {
+      const { record } = params;
+      deviceDetail.value = record;
+      setProps({
+        schemas: CommandSchemas(record.transportType as TransportTypeEnum, record.deviceProfileId),
+      });
+    }
+  );
+
+  const { createMessage } = useMessage();
+
+  const [registerForm, { setProps, getFieldsValue, validate, resetFields, clearValidate }] =
+    useForm({
+      labelWidth: 120,
+      baseColProps: { span: 20 },
+      labelAlign: 'right',
+      showSubmitButton: false,
+      showResetButton: false,
+    });
+
+  const handleCancel = async () => {
+    await resetFields();
+    await nextTick();
+    await clearValidate();
+  };
+
+  const handleValidate = async () => {
+    await validate();
+    await unref(thingsModelFormRef)?.validate?.();
+  };
+
+  const handleValidateDeviceActive = async (): Promise<boolean> => {
+    const result = await getDeviceActiveTime(unref(deviceDetail)!.tbDeviceId);
+    const [firstItem] = result;
+    return !!firstItem.value;
+  };
+
+  const handleCommandParams = (
+    values: CommandDeliveryFormFieldType,
+    serviceCommand: Recordable
+  ) => {
+    const { commandType } = values;
+
+    const isTcpDevice = unref(deviceDetail)?.transportType === TransportTypeEnum.TCP;
+    if (commandType === CommandTypeEnum.CUSTOM) {
+      if (isTcpDevice) {
+        return values.tcpCommandValue;
+      }
+      return parseStringToJSON(values.commandValue!).json;
+    } else {
+      if (isTcpDevice) return Reflect.get(serviceCommand, CommandFieldsEnum.SERVICE_COMMAND);
+      return serviceCommand;
+    }
+  };
+
+  const handleOk = async () => {
+    await handleValidate();
+
+    try {
+      setModalProps({ loading: true, confirmLoading: true });
+
+      const values = getFieldsValue() as CommandDeliveryFormFieldType;
+      const { callType, commandType } = values;
+      const serviceCommand = unref(thingsModelFormRef)?.getFieldsValue() || {};
+
+      if (callType === CommandDeliveryWayEnum.TWO_WAY && !(await handleValidateDeviceActive())) {
+        createMessage.warn('当前设备不在线');
+        return;
+      }
+
+      const rpcCommands: RpcCommandType = {
+        additionalInfo: {
+          cmdType:
+            commandType === CommandTypeEnum.CUSTOM
+              ? CommandTypeEnum.CUSTOM
+              : CommandTypeEnum.SERVICE,
+        },
+        method: RPCCommandMethodEnum.THINGSKIT,
+        persistent: true,
+        params: handleCommandParams(values, serviceCommand),
+      };
+
+      await commandIssuanceApi(callType, unref(deviceDetail)!.tbDeviceId, rpcCommands);
+
+      createMessage.success('命令下发成功');
+    } finally {
+      setModalProps({ loading: false, confirmLoading: false });
+    }
+  };
+</script>
+<style scoped lang="less"></style>

-<template>
-  <div class="tabs-detail">
-    <div>
-      <BasicForm @register="registerForm" />
-      <Space class="w-full justify-end py-2" justify="end">
-        <Button :loading="loading" type="primary" @click="handleOk" class="mr-2">确定</Button>
-        <Button type="default" @click="handleCancel" class="mr-2">重置</Button>
-      </Space>
-    </div>
-  </div>
-</template>
-<script lang="ts">
-  import { defineComponent, nextTick, ref } from 'vue';
-  import { BasicForm, useForm } from '/@/components/Form';
-  import { CommandFieldsEnum, CommandSchemas, CommandType, ValueType } from '../../config/data';
-  import { commandIssuanceApi } from '/@/api/device/deviceManager';
-  import { useMessage } from '/@/hooks/web/useMessage';
-  import { Button } from '/@/components/Button';
-  import { Space } from 'ant-design-vue';
-  import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { TransportTypeEnum } from '../../../profiles/components/TransportDescript/const';
-  import { parseStringToJSON } from '/@/components/CodeEditor/src/JSONEditor';
-  import { CommandDeliveryWayEnum } from '/@/enums/toolEnum';
-
-  export default defineComponent({
-    components: { BasicForm, Button, Space },
-    props: {
-      deviceDetail: {
-        type: Object as PropType<DeviceRecord>,
-        required: true,
-      },
-    },
-    emits: ['register'],
-    setup(props) {
-      const { createMessage } = useMessage();
-      const loading = ref(false);
-
-      const [registerForm, { getFieldsValue, validate, resetFields, clearValidate }] = useForm({
-        labelWidth: 120,
-        schemas: CommandSchemas(
-          props.deviceDetail.deviceProfile.transportType as TransportTypeEnum,
-          props.deviceDetail.deviceProfileId
-        ),
-        baseColProps: { span: 20 },
-        labelAlign: 'right',
-        showSubmitButton: false,
-        showResetButton: false,
-      });
-
-      const handleCancel = async () => {
-        await resetFields();
-        await nextTick();
-        await clearValidate();
-      };
-
-      const handleOk = async () => {
-        loading.value = true;
-        try {
-          // 验证
-          const valid = await validate();
-          if (!valid) return;
-          // 收集表单数据
-          const field = getFieldsValue();
-          let command: Recordable = {
-            persistent: true,
-            method: 'methodThingskit',
-            params: field[CommandFieldsEnum.COMMAND_TEXT],
-          };
-
-          if (field[CommandFieldsEnum.COMMAND_TYPE] === CommandType.CUSTOM) {
-            if (field[CommandFieldsEnum.VALUE_TYPE] === ValueType.JSON) {
-              const { json } = parseStringToJSON(field.commandValue);
-              command.params = json;
-            }
-          } else {
-            const { transportType } = props.deviceDetail.deviceProfile;
-            command.params =
-              transportType === TransportTypeEnum.TCP
-                ? field[CommandFieldsEnum.TCP_SERVICE]
-                : {
-                    [field[CommandFieldsEnum.SERVICE]]: field[CommandFieldsEnum.MODEL_INPUT],
-                  };
-            command.additionalInfo = { cmdType: 1 };
-          }
-          commandIssuanceApi(
-            field[CommandFieldsEnum.CUSTOM_TYPE] as CommandDeliveryWayEnum,
-            props.deviceDetail.tbDeviceId,
-            command
-          )
-            .then((res) => {
-              if (!res) return;
-              createMessage.success('命令下发成功');
-              loading.value = true;
-              // 请求
-              handleCancel();
-            })
-            .catch((e) => {
-              if (e?.message) {
-                createMessage.error(e?.message);
-              }
-              handleCancel();
-            })
-            .finally(() => {
-              setTimeout(() => {
-                loading.value = false;
-              }, 300);
-            });
-        } catch (e) {
-          throw e;
-        } finally {
-          loading.value = false;
-        }
-      };
-      return {
-        registerForm,
-        handleCancel,
-        handleOk,
-        loading,
-      };
-    },
-  });
-</script>
-<style scoped lang="less">
-  .jsoneditor-transform {
-    background-position: -144px -96px;
-    display: none !important;
-  }
-
-  .tabs-detail:deep(.object-model-validate-form) {
-    > .ant-row {
-      @apply w-full;
-    }
-  }
-</style>

@@ -18,7 +18,8 @@
   import { useGlobSetting } from '/@/hooks/setting';
   import { useGlobSetting } from '/@/hooks/setting';
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
   import { ModeSwitchButton, EnumTableCardMode } from '/@/components/Widget';
   import { toRaw } from 'vue';
   import { toRaw } from 'vue';
-  import { DataActionModeEnum, ReadAndWriteEnum } from '/@/enums/toolEnum';
+  import { DataActionModeEnum } from '/@/enums/toolEnum';
+  import { ReadAndWriteEnum } from '/@/enums/deviceEnum';
   import { ObjectModelCommandDeliveryModal } from './ObjectModelCommandDeliveryModal';
   import { ObjectModelCommandDeliveryModal } from './ObjectModelCommandDeliveryModal';
   import { ModalParamsType } from '/#/utils';
   import { ModalParamsType } from '/#/utils';
   import { AreaChartOutlined } from '@ant-design/icons-vue';
   import { AreaChartOutlined } from '@ant-design/icons-vue';

 import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { FormSchema } from '/@/components/Form';
 import { FormSchema } from '/@/components/Form';
-import { validateTCPCustomCommand } from '/@/components/Form/src/externalCompns/components/ThingsModelForm';
+import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
 
 
 const InsertString = (t, c, n) => {
 const InsertString = (t, c, n) => {

@@ -12,8 +12,8 @@
   import { genModbusCommand } from '/@/api/task';
   import { genModbusCommand } from '/@/api/task';
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { TaskTypeEnum } from '/@/views/task/center/config';
   import { SingleToHex, formSchemasConfig } from './config';
   import { SingleToHex, formSchemasConfig } from './config';
-  import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
+  import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
   defineEmits(['register']);
   defineEmits(['register']);
   const props = defineProps<{ deviceId: string; deviceName: string }>();
   const props = defineProps<{ deviceId: string; deviceName: string }>();

@@ -6,7 +6,7 @@
     <template #toolbar>
     <template #toolbar>
       <Space>
       <Space>
         <Authority value="api:yt:device:rpc">
         <Authority value="api:yt:device:rpc">
-          <Button type="primary" @click="openModal(true)">命令下发</Button>
+          <Button type="primary" @click="handleOpenModal">命令下发</Button>
         </Authority>
         </Authority>
       </Space>
       </Space>
     </template>
     </template>
@@ -24,16 +24,7 @@
     </template>
     </template>
   </BasicTable>
   </BasicTable>
 
 
-  <BasicModal
-    @register="registerCommandIssuanceModal"
-    width="700px"
-    title="命令下发"
-    :showOkBtn="false"
-    cancelText="关闭"
-    :footer="null"
-  >
-    <CommandIssuance :deviceDetail="deviceDetail" />
-  </BasicModal>
+  <CommandDeliveryModal @register="registerCommandDeliverModal" :deviceDetail="deviceDetail" />
 </template>
 </template>
 <script lang="ts" setup>
 <script lang="ts" setup>
   import { h } from 'vue';
   import { h } from 'vue';
@@ -43,9 +34,10 @@
   import { Button, Modal, Space } from 'ant-design-vue';
   import { Button, Modal, Space } from 'ant-design-vue';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { BasicModal, useModal } from '/@/components/Modal';
-  import CommandIssuance from '../CommandIssuance.vue';
+  import { useModal } from '/@/components/Modal';
+  import { CommandDeliveryModal } from '../CommandDeliveryModal';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
+  import { DataActionModeEnum } from '/@/enums/toolEnum';
 
 
   const props = defineProps({
   const props = defineProps({
     fromId: {
     fromId: {
@@ -58,7 +50,7 @@
     },
     },
   });
   });
 
 
-  const [registerCommandIssuanceModal, { openModal }] = useModal();
+  const [registerCommandDeliverModal, { openModal }] = useModal();
 
 
   const [registerTable] = useTable({
   const [registerTable] = useTable({
     api: deviceCommandRecordGetQuery,
     api: deviceCommandRecordGetQuery,
@@ -79,6 +71,7 @@
     },
     },
     useSearchForm: true,
     useSearchForm: true,
   });
   });
+
   const commonModalInfo = (title, value) => {
   const commonModalInfo = (title, value) => {
     Modal.info({
     Modal.info({
       title,
       title,
@@ -86,14 +79,23 @@
       content: h(JsonPreview, { data: value }),
       content: h(JsonPreview, { data: value }),
     });
     });
   };
   };
+
   const handleRecordContent = (record) => {
   const handleRecordContent = (record) => {
     if (!record?.request?.body) return;
     if (!record?.request?.body) return;
     if (Object.prototype.toString.call(record?.request?.body) !== '[object Object]') return;
     if (Object.prototype.toString.call(record?.request?.body) !== '[object Object]') return;
     const jsonParams = record?.request?.body?.params;
     const jsonParams = record?.request?.body?.params;
     commonModalInfo('命令下发内容', jsonParams);
     commonModalInfo('命令下发内容', jsonParams);
   };
   };
+
   const handleRecordResponseContent = (record) => {
   const handleRecordResponseContent = (record) => {
     const jsonParams = record?.response;
     const jsonParams = record?.response;
     commonModalInfo('响应内容', jsonParams);
     commonModalInfo('响应内容', jsonParams);
   };
   };
+
+  function handleOpenModal() {
+    openModal(true, {
+      mode: DataActionModeEnum.READ,
+      record: props.deviceDetail,
+    } as ModalParamsType<DeviceRecord>);
+  }
 </script>
 </script>

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { computed } from 'vue';
   import { computed } from 'vue';
   import COAPDescription from './COAPDescription.vue';
   import COAPDescription from './COAPDescription.vue';
-  import { TransportTypeEnum } from './const';
   import DefaultConfiguration from './DefaultConfiguration.vue';
   import DefaultConfiguration from './DefaultConfiguration.vue';
   import LWM2MDescription from './LWM2MDescription.vue';
   import LWM2MDescription from './LWM2MDescription.vue';
   import MQTTConfiguration from './MQTTConfiguration.vue';
   import MQTTConfiguration from './MQTTConfiguration.vue';
   import SNMPDescription from './SNMPDescription.vue';
   import SNMPDescription from './SNMPDescription.vue';
   import TCPDescription from './TCPDescription.vue';
   import TCPDescription from './TCPDescription.vue';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
+  import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
   const props = defineProps<{
   const props = defineProps<{
     record: DeviceRecord;
     record: DeviceRecord;

-export enum TransportTypeEnum {
-  DEFAULT = 'DEFAULT',
-  MQTT = 'MQTT',
-  COAP = 'COAP',
-  LWM2M = 'LWM2M',
-  SNMP = 'SNMP',
-  TCP = 'TCP',
-}
-
 export enum TransportPayloadTypeEnum {
 export enum TransportPayloadTypeEnum {
   PROTOBUF = 'PROTOBUF',
   PROTOBUF = 'PROTOBUF',
   JSON = 'JSON',
   JSON = 'JSON',

 <script lang="ts" setup>
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { DataType, ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
   import { DataType, ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-  import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
+  import { StructFormValue } from '/@/components/Form/src/components/StructForm/type';
   import {
   import {
     transfromToStructJSON,
     transfromToStructJSON,
     excludeIdInStructJSON,
     excludeIdInStructJSON,
-  } from '/@/components/Form/src/externalCompns/components/StructForm/util';
+  } from '/@/components/Form/src/components/StructForm/util';
   import { FunctionType } from './config';
   import { FunctionType } from './config';
   import { isArray } from 'lodash';
   import { isArray } from 'lodash';
   import { OpenModelMode } from '../types';
   import { OpenModelMode } from '../types';
-  import { formSchemas } from '/@/components/Form/src/externalCompns/components/StructForm/config';
-  import { TransportTypeEnum } from '../../../../components/TransportDescript/const';
+  import { formSchemas } from '/@/components/Form/src/components/StructForm/config';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { ref, unref } from 'vue';
   import { ref, unref } from 'vue';
-  import EnumList from '/@/components/Form/src/externalCompns/components/StructForm/EnumList.vue';
+  import EnumList from '/@/components/Form/src/components/StructForm/EnumList.vue';
+  import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
   const props = defineProps<{ openModalMode: OpenModelMode; transportType?: string | undefined }>();
   const props = defineProps<{ openModalMode: OpenModelMode; transportType?: string | undefined }>();
 
 

@@ -5,8 +5,8 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { eventSchemas, FunctionType } from './config';
   import { eventSchemas, FunctionType } from './config';
   import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
-  import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
-  import { excludeIdInStructJSON } from '/@/components/Form/src/externalCompns/components/StructForm/util';
+  import { StructFormValue } from '/@/components/Form/src/components/StructForm/type';
+  import { excludeIdInStructJSON } from '/@/components/Form/src/components/StructForm/util';
   import { OpenModelMode } from '../types';
   import { OpenModelMode } from '../types';
 
 
   defineProps<{ openModalMode: OpenModelMode }>();
   defineProps<{ openModalMode: OpenModelMode }>();

@@ -5,10 +5,10 @@
   import { BasicForm, useForm } from '/@/components/Form';
   import { BasicForm, useForm } from '/@/components/Form';
   import { FormField, serviceSchemas } from './config';
   import { FormField, serviceSchemas } from './config';
   import { FunctionType } from './config';
   import { FunctionType } from './config';
-  import { StructFormValue } from '/@/components/Form/src/externalCompns/components/StructForm/type';
+  import { StructFormValue } from '/@/components/Form/src/components/StructForm/type';
   import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
   import { DeviceRecord } from '/@/api/device/model/deviceModel';
-  import { excludeIdInStructJSON } from '/@/components/Form/src/externalCompns/components/StructForm/util';
+  import { excludeIdInStructJSON } from '/@/components/Form/src/components/StructForm/util';
   import { OpenModelMode } from '../types';
   import { OpenModelMode } from '../types';
   import { isArray } from '/@/utils/is';
   import { isArray } from '/@/utils/is';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';
   import { DataTypeEnum } from '/@/enums/objectModelEnum';

 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import {
 import {
-  CommandTypeEnum,
-  CommandTypeNameEnum,
   ExecutionActionEnum,
   ExecutionActionEnum,
   ExecutionActionNameEnum,
   ExecutionActionNameEnum,
   TriggerEntityTypeEnum,
   TriggerEntityTypeEnum,
   TriggerEntityTypeNameEnum,
   TriggerEntityTypeNameEnum,
 } from '/@/enums/linkedgeEnum';
 } from '/@/enums/linkedgeEnum';
+import { CommandTypeEnum, CommandTypeNameEnum } from '/@/enums/deviceEnum';
 import AlarmProfileSelect from './AlarmProfileSelect.vue';
 import AlarmProfileSelect from './AlarmProfileSelect.vue';
 import {
 import {
   byOrganizationIdGetMasterDevice,
   byOrganizationIdGetMasterDevice,
@@ -21,15 +20,15 @@ import { findDictItemByCode } from '/@/api/system/dict';
 import { DictEnum } from '/@/enums/dictEnum';
 import { DictEnum } from '/@/enums/dictEnum';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { getDeviceProfile } from '/@/api/alarm/position';
 import { createPickerSearch } from '/@/utils/pickerSearch';
 import { createPickerSearch } from '/@/utils/pickerSearch';
-import { ServiceCallTypeEnum, ServiceCallTypeNameEnum } from '/@/enums/toolEnum';
+import { ServiceCallTypeEnum, ServiceCallTypeNameEnum } from '/@/enums/deviceEnum';
 import { DeviceTypeEnum } from '../../../dataFlow/cpns/config';
 import { DeviceTypeEnum } from '../../../dataFlow/cpns/config';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { getModelServices } from '/@/api/device/modelOfMatter';
 import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { ModelOfMatterParams, StructJSON } from '/@/api/device/model/modelOfMatterModel';
 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { JSONEditor } from '/@/components/CodeEditor';
 import { useJsonParse } from '/@/hooks/business/useJsonParse';
 import { useJsonParse } from '/@/hooks/business/useJsonParse';
-import { validateTCPCustomCommand } from '/@/components/Form/src/externalCompns/components/ThingsModelForm';
+import { validateTCPCustomCommand } from '/@/components/Form/src/components/ThingsModelForm';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 export enum FormFieldsEnum {
 export enum FormFieldsEnum {
   OUT_TARGET = 'outTarget',
   OUT_TARGET = 'outTarget',

@@ -5,9 +5,9 @@ import { FlipFlopConditionType } from '../FlipFlop/types';
 import { DeviceModelOfMatterAttrs, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { DeviceModelOfMatterAttrs, DeviceTypeEnum } from '/@/api/device/model/deviceModel';
 import { FormActionType, ThingsModelForm } from '/@/components/Form';
 import { FormActionType, ThingsModelForm } from '/@/components/Form';
 import { AlarmLevelEnum } from '/@/enums/alarmEnum';
 import { AlarmLevelEnum } from '/@/enums/alarmEnum';
-import { CommandTypeEnum, ExecutionActionEnum, TriggerEntityTypeEnum } from '/@/enums/linkedgeEnum';
-import { ServiceCallTypeEnum } from '/@/enums/toolEnum';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { ExecutionActionEnum, TriggerEntityTypeEnum } from '/@/enums/linkedgeEnum';
+import { CommandTypeEnum, ServiceCallTypeEnum } from '/@/enums/deviceEnum';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 export interface ExecutionActionListRefItemType {
 export interface ExecutionActionListRefItemType {
   key: string;
   key: string;

@@ -7,12 +7,13 @@ import {
   ExecutionActionFormItemRecordType,
   ExecutionActionFormItemRecordType,
   ExecutionActionListRefItemType,
   ExecutionActionListRefItemType,
 } from './type';
 } from './type';
-import { CommandTypeEnum, ExecutionActionEnum } from '/@/enums/linkedgeEnum';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
+import { ExecutionActionEnum } from '/@/enums/linkedgeEnum';
+import { CommandTypeEnum } from '/@/enums/deviceEnum';
 import { useJsonParse } from '/@/hooks/business/useJsonParse';
 import { useJsonParse } from '/@/hooks/business/useJsonParse';
 import { createNewExecutionActionItem } from '.';
 import { createNewExecutionActionItem } from '.';
 import { FormFieldsEnum } from './config';
 import { FormFieldsEnum } from './config';
 import { isObject, isString } from '/@/utils/is';
 import { isObject, isString } from '/@/utils/is';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 export function useExecutionActionData(
 export function useExecutionActionData(
   executionActionListRef: Ref<ExecutionActionListRefItemType[]>,
   executionActionListRef: Ref<ExecutionActionListRefItemType[]>,

@@ -29,9 +29,9 @@ import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { getModelTsl } from '/@/api/device/modelOfMatter';
 import { getModelTsl } from '/@/api/device/modelOfMatter';
 import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 import { FunctionType } from '/@/views/device/profiles/step/cpns/physical/cpns/config';
 import { GetModelTslParams } from '/@/api/device/model/modelOfMatterModel';
 import { GetModelTslParams } from '/@/api/device/model/modelOfMatterModel';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { FlipFlopComponentTypeEnum } from './types';
 import { FlipFlopComponentTypeEnum } from './types';
 import { OptionsType } from 'ant-design-vue/es/vc-select/interface';
 import { OptionsType } from 'ant-design-vue/es/vc-select/interface';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 export enum FormFieldEnum {
 export enum FormFieldEnum {
   FLIP_FLOP_TYPE = 'flipFlopType',
   FLIP_FLOP_TYPE = 'flipFlopType',

-import { ref, unref } from 'vue';
+import { ref } from 'vue';
 import { BasicColumn, FormSchema } from '/@/components/Table';
 import { BasicColumn, FormSchema } from '/@/components/Table';
-import {
-  byOrganizationIdGetMasterDevice,
-  screenLinkOrganizationGetApi,
-  getAttribute,
-} from '/@/api/ruleengine/ruleengineApi';
-import { scheduleOptions } from './formatData';
+import { screenLinkOrganizationGetApi } from '/@/api/ruleengine/ruleengineApi';
 import { copyTransFun } from '/@/utils/fnUtils';
 import { copyTransFun } from '/@/utils/fnUtils';
-import { numberAndNonegativeRule } from '/@/utils/rules';
-import { findDictItemByCode } from '/@/api/system/dict';
-import { queryDeviceProfileBy } from '/@/api/device/deviceManager';
-import { getModelServices } from '/@/api/device/modelOfMatter';
-import { ModelOfMatterParams } from '/@/api/device/model/modelOfMatterModel';
-import useCommonFun from '../hooks/useCommonFun';
-import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { useComponentRegister } from '/@/components/Form';
 import { useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
-import { isArray } from '/@/utils/is';
-import { ReadAndWriteEnum } from '/@/enums/toolEnum';
 
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 
-const { useByProductGetAttribute } = useCommonFun();
 export type TOption = {
 export type TOption = {
   label: string;
   label: string;
   value: string;
   value: string;
 };
 };
 
 
-export enum CommandTypeEnum {
-  CUSTOM = 0,
-  SERVICE = 1,
-  ATTRIBUTE = 2,
-}
-
 /**
 /**
  * 所使用的枚举值
  * 所使用的枚举值
  */
  */
@@ -174,733 +152,3 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 6 },
     colProps: { span: 6 },
   },
   },
 ];
 ];
-// 持续时间
-const isTimeDuration = (type) => {
-  return type === 'DURATION';
-};
-const isReplace = (type) => {
-  return type === 'REPEATING';
-};
-// 部分
-const isPart = (type: string) => {
-  return type === 'PART';
-};
-//新增代码2022-11-23
-const isPartOrAll = (type: string) => {
-  return type === 'ALL' || type === 'PART';
-};
-const isService = (type: string) => {
-  return Number(type) === 1;
-};
-const isDefine = (type: string) => {
-  return Number(type) === 0;
-};
-//新增代码2022-11-23
-
-export const trigger_condition_schema: FormSchema[] = [
-  {
-    field: 'triggered',
-    label: '',
-    component: 'Select',
-    defaultValue: 'SIMPLE',
-    componentProps: {
-      placeholder: '请选择触发类型',
-      options: [
-        { label: '简单', value: 'SIMPLE' },
-        { label: '持续时长', value: 'DURATION' },
-        { label: '重复次数', value: 'REPEATING' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-  {
-    field: 'deviceType',
-    label: '',
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    defaultValue: 'SENSOR',
-    componentProps: ({ formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        api: findDictItemByCode,
-        params: {
-          dictCode: 'device_type',
-        },
-        placeholder: '请选择类型',
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        onChange(e) {
-          if (e) {
-            setFieldsValue({ deviceProfileId: '' });
-          }
-        },
-      };
-    },
-  },
-  {
-    field: 'deviceProfileId',
-    label: '',
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    componentProps: ({ formActionType, formModel }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      const deviceType = formModel['deviceType'];
-
-      return {
-        api: queryDeviceProfileBy,
-        params: {
-          deviceType,
-        },
-        showSearch: true,
-        placeholder: '请选择产品',
-        labelField: 'name',
-        valueField: 'id',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        onChange: async (e) => {
-          if (e) {
-            setFieldsValue({ type2: '', entityId: [] });
-            const res = await getAttribute(e);
-            const options = ref<TOption[]>([]);
-            useByProductGetAttribute(res, updateSchema, options);
-          }
-        },
-        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
-          let { label, value } = option;
-          label = label.toLowerCase();
-          value = value.toLowerCase();
-          inputValue = inputValue.toLowerCase();
-          return label.includes(inputValue) || value.includes(inputValue);
-        },
-      };
-    },
-  },
-  {
-    field: 'device',
-    label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择设备',
-      options: [
-        { label: '全部', value: 'ALL' },
-        { label: '部分', value: 'PART' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-
-  {
-    field: 'entityId',
-    label: '',
-    component: 'ApiSelect',
-    componentProps: ({ formModel }) => {
-      const deviceProfileId = formModel['deviceProfileId'];
-      return {
-        mode: 'multiple',
-        api: async () => {
-          if (unref(organizationId)) {
-            try {
-              const data = await byOrganizationIdGetMasterDevice({
-                organizationId: unref(organizationId),
-                deviceProfileId,
-              });
-              if (data)
-                return data.map((item) => ({
-                  ...item,
-                  label: item.alias || item.name,
-                  value: item.tbDeviceId,
-                }));
-            } catch (error) {}
-          }
-          return [];
-        },
-        placeholder: '请选择设备',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        filterOption: (inputValue: string, option: Record<'label' | 'value', string>) => {
-          let { label, value } = option;
-          label = label.toLowerCase();
-          value = value.toLowerCase();
-          inputValue = inputValue.toLowerCase();
-          return label.includes(inputValue) || value.includes(inputValue);
-        },
-      };
-    },
-    ifShow: ({ values }) => isPart(values.device),
-    colProps: { span: 6 },
-  },
-
-  {
-    field: 'time',
-    label: '',
-    component: 'Input',
-    ifShow: ({ values }) => isTimeDuration(values.triggered),
-    colProps: { span: 6 },
-    slot: 'time',
-    rules: numberAndNonegativeRule,
-  },
-  {
-    field: 'timeUnit',
-    label: '',
-    component: 'Select',
-    defaultValue: 'SECONDS',
-    ifShow: ({ values }) => isTimeDuration(values.triggered),
-    show: false,
-  },
-  {
-    field: 'replaceValue',
-    label: '',
-    component: 'Input',
-    componentProps: {
-      placeholder: '事件计数值',
-    },
-    ifShow: ({ values }) => isReplace(values.triggered),
-    colProps: { span: 6 },
-    rules: numberAndNonegativeRule,
-  },
-  {
-    field: 'triggerType',
-    label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '设备触发',
-      options: [
-        { label: '设备触发', value: 'DEVICE_TRIGGER' },
-        // { label: '定时触发', value: 'SCHEDULE_TRIGGER' },
-        // { label: '场景触发', value: 'SCENE_TRIGGER' },
-        // { label: '手动触发', value: 'HAND_ACT' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
-
-  {
-    field: 'type1',
-    label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '属性触发方式',
-      options: [{ label: '属性触发', value: 'TIME_SERIES' }],
-    },
-    ifShow: ({ values }) => isDevice(values.triggerType),
-    colProps: { span: 6 },
-  },
-  {
-    field: 'type2',
-    label: '',
-    component: 'Select',
-    componentProps: {
-      placeholder: '请选择属性',
-    },
-    ifShow: ({ values }) => isDevice(values.triggerType),
-    colProps: { span: 6 },
-    // rules: numberAndEngLishRule,
-  },
-  {
-    field: 'operationType',
-    label: '',
-    component: 'Select',
-    slot: 'operationType',
-    colProps: { span: 6 },
-  },
-  // {
-  //   field: 'detail',
-  //   label: '',
-  //   component: 'InputTextArea',
-  //   componentProps: {
-  //     placeholder: '请输入详情',
-  //   },
-  //   colProps: {
-  //     span: 13,
-  //   },
-  // },
-];
-// !!!----------------------------------------------------^_^------------------------------------------------------------!!!
-enum ActionEnum {
-  DEVICE_OUT = 'DEVICE_OUT',
-  ALARM_OUT = 'MSG_NOTIFY',
-}
-const isDeviceOut = (type: string) => type === ActionEnum.DEVICE_OUT;
-const isAlarmOut = (type: string) => type === ActionEnum.ALARM_OUT;
-
-export const actionSchema: FormSchema[] = [
-  {
-    field: 'outTarget',
-    label: '',
-    component: 'Select',
-    required: true,
-    componentProps: {
-      placeholder: '请选择执行动作',
-    },
-    slot: 'outTarget',
-    colProps: { span: 6 },
-  },
-  {
-    field: 'deviceType',
-    label: '',
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    defaultValue: 'SENSOR',
-    componentProps: ({ formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        api: findDictItemByCode,
-        params: {
-          dictCode: 'device_type',
-        },
-        placeholder: '请选择类型',
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        onChange(e) {
-          if (e) {
-            setFieldsValue({ deviceProfileId: '' });
-          }
-        },
-      };
-    },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget),
-  },
-  {
-    field: 'transportType',
-    label: '',
-    component: 'Input',
-    show: false,
-  },
-  {
-    field: 'deviceProfileId',
-    label: '',
-    component: 'ApiSelect',
-    colProps: { span: 6 },
-    componentProps: ({ formActionType, formModel }) => {
-      const { setFieldsValue } = formActionType;
-      const deviceType = formModel['deviceType'];
-      return {
-        api: queryDeviceProfileBy,
-        params: {
-          deviceType,
-        },
-        placeholder: '请选择产品',
-        labelField: 'name',
-        valueField: 'id',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        onChange: (_value: string, options = {} as DeviceProfileModel) => {
-          const oldType = formModel['transportType'];
-
-          const updateFlag =
-            oldType === TransportTypeEnum.TCP || options.transportType === TransportTypeEnum.TCP;
-
-          setFieldsValue({
-            thingsModelId: '',
-            deviceId: [],
-            transportType: options.transportType,
-            ...(updateFlag ? { doContext: null } : {}),
-          });
-        },
-        onOptionsChange(options: DeviceProfileModel[]) {
-          const deviceProfileId = formModel['deviceProfileId'];
-          if (deviceProfileId) {
-            const index = options.findIndex(
-              (item) => (item as Recordable).value === deviceProfileId
-            );
-
-            ~index && setFieldsValue({ transportType: options[index].transportType });
-          }
-        },
-      };
-    },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget),
-  },
-  {
-    field: 'device',
-    label: '',
-    component: 'Select',
-    componentProps: ({ formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        placeholder: '请选择设备',
-        options: [
-          { label: '全部', value: 'ALL' },
-          { label: '部分', value: 'PART' },
-        ],
-        onChange: () => {
-          setFieldsValue({ deviceId: [], thingsModelId: null });
-        },
-      };
-    },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget) && values['deviceProfileId'],
-    colProps: { span: 6 },
-  },
-  {
-    field: 'deviceId',
-    label: '',
-    component: 'ApiSelect',
-    componentProps: ({ formModel }) => {
-      const deviceProfileId = formModel['deviceProfileId'];
-      return {
-        mode: 'multiple',
-        api: async () => {
-          if (unref(organizationId)) {
-            try {
-              const data = await byOrganizationIdGetMasterDevice({
-                organizationId: unref(organizationId),
-                deviceProfileId,
-              });
-              if (data)
-                return data.map((item) => ({
-                  ...item,
-                  label: item.alias || item.name,
-                  value: item.tbDeviceId,
-                }));
-            } catch (error) {}
-          }
-          return [];
-        },
-        placeholder: '请选择设备',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-      };
-    },
-    ifShow: ({ values }) => isPart(values.device) && isDeviceOut(values.outTarget),
-    colProps: { span: 6 },
-  },
-  //新增代码2022-11-23
-  {
-    field: 'commandType',
-    label: '',
-    required: true,
-    component: 'ApiSelect',
-    colProps: {
-      span: 6,
-    },
-    defaultValue: '0',
-    componentProps: ({ formActionType }) => {
-      const { setFieldsValue } = formActionType;
-      return {
-        placeholder: '请选择类型',
-        api: async (parmas: Recordable) => {
-          try {
-            const record = await findDictItemByCode(parmas);
-            return record.filter(
-              (item) =>
-                item.itemValue !== CommandTypeEnum.ATTRIBUTE.toString() || item.itemText != '属性'
-            );
-          } catch (error) {
-            return [];
-          }
-        },
-        labelField: 'itemText',
-        valueField: 'itemValue',
-        params: {
-          dictCode: 'custom_define',
-        },
-        numberToString: true,
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        onChange: () => {
-          setFieldsValue({ doContext: null, thingsModelId: null });
-        },
-      };
-    },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget) && isPartOrAll(values.device),
-  },
-  //新增代码2022-11-23
-  {
-    field: 'callType',
-    label: '',
-    required: true,
-    component: 'ApiSelect',
-    colProps: {
-      span: 6,
-    },
-    defaultValue: 'SYNC',
-    componentProps: {
-      placeholder: '请选择类型',
-      api: findDictItemByCode,
-      params: {
-        dictCode: 'call_mode',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-      getPopupContainer: (triggerNode) => triggerNode.parentNode,
-    },
-    ifShow: ({ values }) =>
-      isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.commandType),
-  },
-  {
-    field: 'serviceIdentifier',
-    label: '',
-    component: 'Input',
-    show: false,
-  },
-  {
-    field: 'thingsModelKeys',
-    label: '',
-    show: false,
-    component: 'Select',
-    componentProps: {
-      mode: 'multiple',
-    },
-  },
-  {
-    field: 'thingsModelId',
-    label: '',
-    required: true,
-    component: 'ApiSelect',
-    colProps: {
-      span: 6,
-    },
-    componentProps: ({ formModel, formActionType }) => {
-      const { updateSchema, setFieldsValue } = formActionType;
-      const deviceProfileId = Reflect.get(formModel, 'deviceProfileId');
-      const thingsModelId = Reflect.get(formModel, 'thingsModelId');
-      const transportType = Reflect.get(formModel, 'transportType');
-      return {
-        placeholder: '请选择服务',
-        api: async (params: Recordable) => {
-          try {
-            if (!Reflect.get(params, 'deviceProfileId')) return [];
-            const record =
-              (await getModelServices(params as Record<'deviceProfileId', string>)) || [];
-            const selected = record.find((item) => item.id === thingsModelId);
-            selected &&
-              updateSchema({
-                field: 'serviceInputValue',
-                componentProps: {
-                  inputData: selected?.functionJson.inputData,
-                },
-              });
-            selected &&
-              setFieldsValue({
-                callType: selected.callType,
-                serviceIdentifier: selected?.identifier,
-                thingsModelKeys: isArray(selected?.functionJson?.inputData)
-                  ? selected?.functionJson?.inputData
-                      .filter((item) => item.accessMode === ReadAndWriteEnum.READ_AND_WRITE)
-                      .map((item) => item.identifier)
-                  : [],
-              });
-            return record;
-          } catch (error) {
-            console.error(error);
-            return [];
-          }
-        },
-        params: {
-          deviceProfileId,
-        },
-        labelField: 'functionName',
-        valueField: 'id',
-        getPopupContainer: (triggerNode) => triggerNode.parentNode,
-        onChange: (_, options: ModelOfMatterParams) => {
-          if (options) {
-            // setFieldsValue({ doContext: { ...options.functionJson, callType: options.callType } });
-            // if ( )
-            const record = {
-              callType: options.callType,
-              serviceIdentifier: options.identifier,
-              thingsModelKeys: isArray(options?.functionJson?.inputData)
-                ? options?.functionJson?.inputData
-                    .filter((item) => item.accessMode === ReadAndWriteEnum.READ_AND_WRITE)
-                    .map((item) => item.identifier)
-                : [],
-            };
-            transportType === TransportTypeEnum.TCP
-              ? Object.assign(record, {
-                  tcpServiceCommand: options.functionJson?.inputData?.[0]?.serviceCommand,
-                })
-              : updateSchema({
-                  field: 'serviceInputValue',
-                  componentProps: {
-                    inputData: options.functionJson.inputData,
-                  },
-                });
-
-            setFieldsValue(record);
-          } else {
-            setFieldsValue({ serviceIdentifier: null });
-          }
-        },
-      };
-    },
-    ifShow: ({ values }) => isDeviceOut(values.outTarget) && isService(values.commandType),
-  },
-  //新增代码2022-11-23
-  {
-    field: 'alarm_config',
-    label: '',
-    component: 'Input',
-    componentProps: {
-      placeholder: '请选择告警配置',
-    },
-    slot: 'alarmConfigSlot',
-    ifShow: ({ values }) => values.outTarget === 'MSG_NOTIFY',
-    colProps: { span: 6 },
-  },
-  //新增代码2022-11-23
-  {
-    field: 'doContext',
-    component: 'Input',
-    label: '',
-    slot: 'doContext',
-    show: ({ values }) => {
-      return (
-        isDeviceOut(values.outTarget) && isPartOrAll(values.device) && isDefine(values.commandType)
-      );
-    },
-    colProps: {
-      span: 24,
-    },
-  },
-  //新增代码2022-11-23
-  {
-    field: 'alarm_level',
-    component: 'Select',
-    label: '',
-    show: ({ values }) => isAlarmOut(values.outTarget),
-    // dynamicRules: (params) => {
-    //   const { outTarget } = params.values;
-    //   return [
-    //     {
-    //       required: outTarget == 'MSG_NOTIFY' ? true : false,
-    //       validator: (_, value) => {
-    //         if (!value) return Promise.reject('请选择告警配置');
-    //         Promise.resolve();
-    //       },
-    //     },
-    //   ];
-    // },
-    componentProps: {
-      placeholder: '请选择告警等级',
-      options: [
-        {
-          label: '紧急',
-          value: 'CRITICAL',
-        },
-        {
-          label: '重要',
-          value: 'MAJOR',
-        },
-        {
-          label: '次要',
-          value: 'MINOR',
-        },
-        {
-          label: '警告',
-          value: 'WARNING',
-        },
-        {
-          label: '不确定',
-          value: 'INDETERMINATE',
-        },
-      ],
-    },
-    colProps: {
-      span: 6,
-    },
-  },
-  {
-    field: 'clear_alarm',
-    component: 'Checkbox',
-    label: '',
-    show: ({ values }) => isAlarmOut(values.outTarget),
-    colProps: {
-      span: 8,
-    },
-    slot: 'clearAlarm',
-  },
-  {
-    field: 'tcpServiceCommand',
-    component: 'Input',
-    label: '服务命令',
-    colProps: { span: 24 },
-    dynamicDisabled: true,
-    show: ({ values }) =>
-      values['thingsModelId'] && values['transportType'] === TransportTypeEnum.TCP,
-  },
-  {
-    field: 'serviceInputValue',
-    component: 'ObjectModelValidateForm',
-    label: '',
-    changeEvent: 'update:value',
-    valueField: 'value',
-    show: ({ values }) =>
-      values['thingsModelId'] && values['transportType'] !== TransportTypeEnum.TCP,
-    colProps: {
-      span: 24,
-    },
-    componentProps: {},
-  },
-];
-
-export const alarmScheduleSchemas: FormSchema[] = [
-  {
-    field: 'schedule',
-    label: '',
-    component: 'Select',
-    componentProps({ formActionType }) {
-      const { resetFields } = formActionType;
-      return {
-        options: scheduleOptions,
-        allowClear: false,
-        onChange() {
-          resetFields();
-        },
-      };
-    },
-  },
-  {
-    field: 'timezone',
-    label: '时区',
-    component: 'Select',
-    defaultValue: 'Asia/Shanghai',
-    componentProps: {
-      options: [
-        {
-          label: 'Asia/Shanghai',
-          value: 'Asia/Shanghai',
-        },
-      ],
-      allowClear: false,
-    },
-    ifShow: ({ values }) => values.schedule !== 'ANY_TIME',
-  },
-  {
-    field: 'daysOfWeek',
-    label: '天',
-    component: 'CheckboxGroup',
-    rules: [
-      {
-        message: '请至少选择一天',
-        required: true,
-      },
-    ],
-    componentProps: {
-      options: [
-        { label: '星期一', value: 1 },
-        { label: '星期二', value: 2 },
-        { label: '星期三', value: 3 },
-        { label: '星期四', value: 4 },
-        { label: '星期五', value: 5 },
-        { label: '星期六', value: 6 },
-        { label: '星期日', value: 7 },
-      ],
-    },
-    colProps: {
-      span: 24,
-    },
-    ifShow: ({ values }) => values.schedule === 'SPECIFIC_TIME',
-  },
-  {
-    field: 'time',
-    label: '时间',
-    labelWidth: 40,
-    component: 'RangePicker',
-    ifShow: ({ values }) => values.schedule === 'SPECIFIC_TIME',
-    slot: 'timing',
-  },
-  {
-    field: 'day',
-    label: '天',
-    component: 'CheckboxGroup',
-    slot: 'customEnable',
-    ifShow: ({ values }) => values.schedule === 'CUSTOM',
-  },
-];

@@ -8,12 +8,12 @@ import {
 } from '../DevicePicker';
 } from '../DevicePicker';
 import { PollCommandInput, ModeEnum } from '../PollCommandInput';
 import { PollCommandInput, ModeEnum } from '../PollCommandInput';
 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
 import { DeviceProfileModel } from '/@/api/device/model/deviceModel';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { JSONEditorValidator } from '/@/components/CodeEditor/src/JSONEditor';
 import { BooleanStringEnum, TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
 import { BooleanStringEnum, TimeUnitEnum, TimeUnitNameEnum } from '/@/enums/toolEnum';
 import { dateUtil } from '/@/utils/dateUtil';
 import { dateUtil } from '/@/utils/dateUtil';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { ProductPicker, validateProductPicker } from '../ProductPicker';
 import { useGlobSetting } from '/@/hooks/setting';
 import { useGlobSetting } from '/@/hooks/setting';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('DevicePicker', DevicePicker);
 useComponentRegister('ProductPicker', ProductPicker);
 useComponentRegister('ProductPicker', ProductPicker);

 import { ref, unref } from 'vue';
 import { ref, unref } from 'vue';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
-import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { genModbusCommand } from '/@/api/task';
 import { genModbusCommand } from '/@/api/task';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { SingleToHex } from '/@/views/device/list/cpns/tabs/ObjectModelCommandDeliveryModal/config';
 import { SingleToHex } from '/@/views/device/list/cpns/tabs/ObjectModelCommandDeliveryModal/config';
+import { CommandTypeEnum } from '/@/enums/deviceEnum';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 const getArray = (values) => {
 const getArray = (values) => {
   const str = values.replace(/\s+/g, '');
   const str = values.replace(/\s+/g, '');

@@ -10,12 +10,12 @@ import { getModelServices } from '/@/api/device/modelOfMatter';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { FormSchema, useComponentRegister } from '/@/components/Form';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
 import { OrgTreeSelect } from '/@/views/common/OrgTreeSelect';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
-import { CommandTypeEnum } from '/@/views/rule/linkedge/config/config.data';
 import { DataActionModeEnum } from '/@/enums/toolEnum';
 import { DataActionModeEnum } from '/@/enums/toolEnum';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { TaskTypeEnum } from '/@/views/task/center/config';
 import { createPickerSearch } from '/@/utils/pickerSearch';
 import { createPickerSearch } from '/@/utils/pickerSearch';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
 import { DataTypeEnum } from '/@/enums/objectModelEnum';
+import { CommandTypeEnum } from '/@/enums/deviceEnum';
+import { TransportTypeEnum } from '/@/enums/deviceEnum';
 
 
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 useComponentRegister('OrgTreeSelect', OrgTreeSelect);
 
 

@@ -2,8 +2,7 @@ import { ref } from 'vue';
 import { DataSource } from '../../palette/types';
 import { DataSource } from '../../palette/types';
 import { sendCommandOneway, sendCommandTwoway } from '/@/api/dataBoard';
 import { sendCommandOneway, sendCommandTwoway } from '/@/api/dataBoard';
 import { useMessage } from '/@/hooks/web/useMessage';
 import { useMessage } from '/@/hooks/web/useMessage';
-import { TransportTypeEnum } from '/@/views/device/profiles/components/TransportDescript/const';
-import { ServiceCallTypeEnum } from '/@/enums/toolEnum';
+import { TransportTypeEnum, ServiceCallTypeEnum } from '/@/enums/deviceEnum';
 
 
 const { createMessage } = useMessage();
 const { createMessage } = useMessage();
 export function useSendCommand() {
 export function useSendCommand() {