完善设备信息界面

apps/web-antd/src/api-client/schemas.gen.ts

@@ -996,6 +996,7 @@ export const CTWingPrivateProductInfoDtoSchema = {
         deviceThingModelFileId: {
             type: 'string',
             description: '设备物模型文件Id',
+            format: 'uuid',
             nullable: true
         },
         deviceThingModelFileName: {
@@ -1051,6 +1052,7 @@ export const CTWingPrivateProductInfoInsertInputSchema = {
         deviceThingModelFileId: {
             type: 'string',
             description: '设备物模型文件Id',
+            format: 'uuid',
             nullable: true
         },
         deviceThingModelFileName: {
@@ -1139,6 +1141,7 @@ export const CTWingPrivateProductInfoModifyInputSchema = {
         deviceThingModelFileId: {
             type: 'string',
             description: '设备物模型文件Id',
+            format: 'uuid',
             nullable: true
         },
         deviceThingModelFileName: {
@@ -1427,6 +1430,53 @@ export const CreateDeviceAggregationInputSchema = {
     description: '设备聚合新增设备'
 } as const;
 
+export const CreateDeviceFirmwareInfoInputSchema = {
+    required: ['firmwareFileId', 'firmwareFileName', 'firmwareHashCode', 'firmwareLength', 'firmwareVersion', 'ioTPlatform', 'ioTPlatformProductId', 'ioTPlatformProductName'],
+    type: 'object',
+    properties: {
+        ioTPlatform: {
+            '$ref': '#/components/schemas/IoTPlatformTypeEnum'
+        },
+        ioTPlatformProductId: {
+            minLength: 1,
+            type: 'string',
+            description: '物联网平台中对应的产品Id'
+        },
+        ioTPlatformProductName: {
+            minLength: 1,
+            type: 'string',
+            description: '物联网平台中对应的产品名称'
+        },
+        firmwareVersion: {
+            minLength: 1,
+            type: 'string',
+            description: '固件版本'
+        },
+        firmwareFileId: {
+            type: 'string',
+            description: '固件文件Id',
+            format: 'uuid'
+        },
+        firmwareFileName: {
+            minLength: 1,
+            type: 'string',
+            description: '固件文件名称'
+        },
+        firmwareHashCode: {
+            minLength: 1,
+            type: 'string',
+            description: '固件哈希值'
+        },
+        firmwareLength: {
+            type: 'integer',
+            description: '固件文件长度',
+            format: 'int64'
+        }
+    },
+    additionalProperties: false,
+    description: '创建设备固件信息'
+} as const;
+
 export const CreateLanguageInputSchema = {
     type: 'object',
     properties: {
@@ -1975,6 +2025,144 @@ export const DeviceCommandForApiInputSchema = {
     description: '设备命令'
 } as const;
 
+export const DeviceFirmwareInfoDtoSchema = {
+    type: 'object',
+    properties: {
+        id: {
+            type: 'string',
+            format: 'uuid'
+        },
+        creationTime: {
+            type: 'string',
+            format: 'date-time'
+        },
+        creatorId: {
+            type: 'string',
+            format: 'uuid',
+            nullable: true
+        },
+        lastModificationTime: {
+            type: 'string',
+            format: 'date-time',
+            nullable: true
+        },
+        lastModifierId: {
+            type: 'string',
+            format: 'uuid',
+            nullable: true
+        },
+        isDeleted: {
+            type: 'boolean'
+        },
+        deleterId: {
+            type: 'string',
+            format: 'uuid',
+            nullable: true
+        },
+        deletionTime: {
+            type: 'string',
+            format: 'date-time',
+            nullable: true
+        },
+        tenantId: {
+            type: 'string',
+            description: '租户Id',
+            format: 'uuid',
+            nullable: true
+        },
+        remark: {
+            type: 'string',
+            description: '备注',
+            nullable: true
+        },
+        osaCreatorId: {
+            type: 'integer',
+            description: '旧系统授权创建者Id',
+            format: 'int32',
+            nullable: true
+        },
+        osaLastModifierId: {
+            type: 'integer',
+            description: '旧系统授权最后修改者Id',
+            format: 'int32',
+            nullable: true
+        },
+        osaDeleterId: {
+            type: 'integer',
+            description: '旧系统授权最后删除者Id',
+            format: 'int32',
+            nullable: true
+        },
+        extraProperties: {
+            type: 'object',
+            additionalProperties: {},
+            description: '扩展属性,用于存储自定义字段,JSON格式',
+            nullable: true
+        },
+        ioTPlatform: {
+            '$ref': '#/components/schemas/IoTPlatformTypeEnum'
+        },
+        ioTPlatformProductId: {
+            type: 'string',
+            description: '物联网平台中对应的产品Id',
+            nullable: true
+        },
+        ioTPlatformProductName: {
+            type: 'string',
+            description: '物联网平台中对应的产品名称',
+            nullable: true
+        },
+        firmwareVersion: {
+            type: 'string',
+            description: '固件版本',
+            nullable: true
+        },
+        firmwareFileId: {
+            type: 'string',
+            description: '固件文件Id',
+            format: 'uuid'
+        },
+        firmwareFileName: {
+            type: 'string',
+            description: '固件文件名称',
+            nullable: true
+        },
+        firmwareHashCode: {
+            type: 'string',
+            description: '固件哈希值',
+            nullable: true
+        },
+        firmwareLength: {
+            type: 'integer',
+            description: '固件文件长度',
+            format: 'int64'
+        },
+        isEnable: {
+            type: 'boolean',
+            description: '是否启用'
+        }
+    },
+    additionalProperties: false
+} as const;
+
+export const DeviceFirmwareInfoDtoPagedResultDtoSchema = {
+    type: 'object',
+    properties: {
+        items: {
+            type: 'array',
+            items: {
+                '$ref': '#/components/schemas/DeviceFirmwareInfoDto'
+            },
+            nullable: true
+        },
+        totalCount: {
+            type: 'integer',
+            format: 'int64'
+        }
+    },
+    additionalProperties: false
+} as const;
+
 export const DeviceManagementInfoDtoSchema = {
     type: 'object',
     properties: {
@@ -2160,6 +2348,22 @@ export const DeviceManagementInfoDtoSchema = {
             type: 'string',
             description: '设备物模型名称',
             nullable: true
+        },
+        firmwareVersion: {
+            type: 'string',
+            description: '固件版本',
+            nullable: true
+        },
+        upgradeDate: {
+            type: 'string',
+            description: '升级日期',
+            format: 'date-time',
+            nullable: true
+        },
+        securityKey: {
+            type: 'string',
+            description: '设备接入鉴权key',
+            nullable: true
         }
     },
     additionalProperties: false
@@ -3295,6 +3499,219 @@ export const DeviceTypeEnumSchema = {
     '说明：': '未知=0,网关设备=1,直连设备=2,子设备=3'
 } as const;
 
+export const DeviceUpgradeForApiInputSchema = {
+    required: ['id', 'ioTPlatform', 'ioTPlatformProductId', 'nowFirmwareVersionDataId'],
+    type: 'object',
+    properties: {
+        id: {
+            type: 'string',
+            format: 'uuid'
+        },
+        ioTPlatform: {
+            '$ref': '#/components/schemas/IoTPlatformTypeEnum'
+        },
+        ioTPlatformProductId: {
+            minLength: 1,
+            type: 'string',
+            description: '物联网平台中对应的产品Id'
+        },
+        nowFirmwareVersionDataId: {
+            type: 'string',
+            description: '固件版本信息',
+            format: 'uuid'
+        }
+    },
+    additionalProperties: false,
+    description: '设备升级'
+} as const;
+
+export const DeviceUpgradeRecordDtoSchema = {
+    type: 'object',
+    properties: {
+        id: {
+            type: 'string',
+            format: 'uuid'
+        },
+        creationTime: {
+            type: 'string',
+            format: 'date-time'
+        },
+        creatorId: {
+            type: 'string',
+            format: 'uuid',
+            nullable: true
+        },
+        lastModificationTime: {
+            type: 'string',
+            format: 'date-time',
+            nullable: true
+        },
+        lastModifierId: {
+            type: 'string',
+            format: 'uuid',
+            nullable: true
+        },
+        isDeleted: {
+            type: 'boolean'
+        },
+        deleterId: {
+            type: 'string',
+            format: 'uuid',
+            nullable: true
+        },
+        deletionTime: {
+            type: 'string',
+            format: 'date-time',
+            nullable: true
+        },
+        tenantId: {
+            type: 'string',
+            description: '租户Id',
+            format: 'uuid',
+            nullable: true
+        },
+        remark: {
+            type: 'string',
+            description: '备注',
+            nullable: true
+        },
+        osaCreatorId: {
+            type: 'integer',
+            description: '旧系统授权创建者Id',
+            format: 'int32',
+            nullable: true
+        },
+        osaLastModifierId: {
+            type: 'integer',
+            description: '旧系统授权最后修改者Id',
+            format: 'int32',
+            nullable: true
+        },
+        osaDeleterId: {
+            type: 'integer',
+            description: '旧系统授权最后删除者Id',
+            format: 'int32',
+            nullable: true
+        },
+        extraProperties: {
+            type: 'object',
+            additionalProperties: {},
+            description: '扩展属性,用于存储自定义字段,JSON格式',
+            nullable: true
+        },
+        deviceName: {
+            type: 'string',
+            description: '设备名称',
+            nullable: true
+        },
+        deviceAddress: {
+            type: 'string',
+            description: '设备地址',
+            nullable: true
+        },
+        oldFirmwareVersion: {
+            type: 'string',
+            description: '旧的固件版本',
+            nullable: true
+        },
+        nowFirmwareVersion: {
+            type: 'string',
+            description: '固件版本',
+            nullable: true
+        },
+        upgradeDate: {
+            type: 'string',
+            description: '升级日期',
+            format: 'date-time'
+        },
+        upgradeSource: {
+            '$ref': '#/components/schemas/DeviceUpgradeSourceTypeEnum'
+        },
+        upgradeSourceTypeName: {
+            type: 'string',
+            description: '升级来源',
+            nullable: true,
+            readOnly: true
+        },
+        upgradeMessage: {
+            type: 'string',
+            description: '升级信息',
+            nullable: true
+        },
+        upgradeStatus: {
+            '$ref': '#/components/schemas/DeviceUpgradeStatusTypeEnum'
+        },
+        upgradeStatusName: {
+            type: 'string',
+            description: '升级状态',
+            nullable: true,
+            readOnly: true
+        },
+        upgradeIdentifier: {
+            type: 'integer',
+            description: '升级标识符号',
+            format: 'int64'
+        },
+        firmwareSignature: {
+            type: 'string',
+            description: '签名校验值',
+            nullable: true
+        },
+        upgradeResult: {
+            '$ref': '#/components/schemas/DeviceUpgradeResultTypeEnum'
+        },
+        upgradeResultName: {
+            type: 'string',
+            description: '升级结果',
+            nullable: true,
+            readOnly: true
+        }
+    },
+    additionalProperties: false
+} as const;
+
+export const DeviceUpgradeRecordDtoPagedResultDtoSchema = {
+    type: 'object',
+    properties: {
+        items: {
+            type: 'array',
+            items: {
+                '$ref': '#/components/schemas/DeviceUpgradeRecordDto'
+            },
+            nullable: true
+        },
+        totalCount: {
+            type: 'integer',
+            format: 'int64'
+        }
+    },
+    additionalProperties: false
+} as const;
+
+export const DeviceUpgradeResultTypeEnumSchema = {
+    enum: [0, 1001, 1002, 1003, 1004, 1005, 2001, 2002, 2003, 2004, 2005, 2006, 3001, 3002, 3003, 4001, 5001, 6001, 6002, 6003, 6004, 6005, 6006, 6007, 6008, 9999],
+    type: 'integer',
+    description: '设备升级结果枚举',
+    format: 'int32',
+    '说明：': 'Success=0,InvalidUrl=1001,UrlFileNameMismatch=1002,InvalidFileLength=1003,NvmWriteFailed=1004,ModuleUrlFetchFailed=1005,DownloadTimeout=2001,ParseHttpDlFileFailed=2002,DownloadIncomplete=2003,DownloadSizeMismatch=2004,ModuleReadTimeout=2005,FilePointerException=2006,ExternalFlashWriteFailed=3001,ExternalFlashReadCrcMismatch=3002,ExternalFlashWriteCrcMismatch=3003,SecurityVerificationFailed=4001,Crc32Mismatch=5001,DiffDecompressFailed=6001,DiffPatchFailed=6002,DiffDictionaryExceeded=6003,DiffCompressionTypeUnsupported=6004,RestoredFirmwareSizeExceeded=6005,TargetAddressInBootArea=6006,IapPowerAbnormal=6007,IapSerialPowerAbnormal=6008,UnknownError=9999'
+} as const;
+
+export const DeviceUpgradeSourceTypeEnumSchema = {
+    enum: [1, 2],
+    type: 'integer',
+    description: '设备升级来源类型枚举',
+    format: 'int32',
+    '说明：': '管理后台=1,业务系统=2'
+} as const;
+
+export const DeviceUpgradeStatusTypeEnumSchema = {
+    enum: [1, 2, 3, 4],
+    type: 'integer',
+    description: '设备升级状态枚举',
+    format: 'int32',
+    '说明：': '未升级=1,升级中=2,升级成功=3,升级失败=4'
+} as const;
+
 export const DisabledTwoFactorInputSchema = {
     required: ['code'],
     type: 'object',
@@ -3959,6 +4376,11 @@ export const FileObjectDtoSchema = {
             type: 'string',
             description: '文件名称',
             nullable: true
+        },
+        mD5Hash: {
+            type: 'string',
+            description: '文件MD5',
+            nullable: true
         }
     },
     additionalProperties: false,
@@ -6574,6 +6996,7 @@ export const OneNETProductInfoDtoSchema = {
         deviceThingModelFileId: {
             type: 'string',
             description: '设备物模型文件Id',
+            format: 'uuid',
             nullable: true
         },
         deviceThingModelFileName: {
@@ -6823,6 +7246,7 @@ export const OneNetProductInfoInsertInputSchema = {
         deviceThingModelFileId: {
             type: 'string',
             description: '设备物模型文件Id',
+            format: 'uuid',
             nullable: true
         },
         deviceThingModelFileName: {
@@ -6921,6 +7345,7 @@ export const OneNetProductInfoModifyInputSchema = {
         deviceThingModelFileId: {
             type: 'string',
             description: '设备物模型文件Id',
+            format: 'uuid',
             nullable: true
         },
         deviceThingModelFileName: {
@@ -6969,6 +7394,60 @@ export const OpenTypeSchema = {
     '说明：': '无=10,组件=20,内链=30,外链=40'
 } as const;
 
+export const PageDeviceFirmwareInfoInputSchema = {
+    type: 'object',
+    properties: {
+        pageIndex: {
+            type: 'integer',
+            description: '当前页面.默认从1开始',
+            format: 'int32'
+        },
+        pageSize: {
+            type: 'integer',
+            description: '每页多少条.每页显示多少记录',
+            format: 'int32'
+        },
+        skipCount: {
+            type: 'integer',
+            description: '跳过多少条',
+            format: 'int32',
+            readOnly: true
+        },
+        sorting: {
+            type: 'string',
+            description: `排序
+<example>
+ name desc
+</example>`,
+            nullable: true
+        },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
+        ioTPlatform: {
+            '$ref': '#/components/schemas/IoTPlatformTypeEnum'
+        },
+        firmwareVersion: {
+            type: 'string',
+            description: '固件版本',
+            nullable: true
+        },
+        ioTPlatformProductId: {
+            type: 'string',
+            description: '物联网平台中对应的产品Id',
+            nullable: true
+        },
+        searchKeyword: {
+            type: 'string',
+            description: '搜索关键字',
+            nullable: true
+        }
+    },
+    additionalProperties: false,
+    description: '创建设备固件信息'
+} as const;
+
 export const PageDeviceInputSchema = {
     type: 'object',
     properties: {
@@ -7027,6 +7506,84 @@ export const PageDeviceInputSchema = {
     additionalProperties: false
 } as const;
 
+export const PageDeviceUpgradeRecordInputSchema = {
+    type: 'object',
+    properties: {
+        pageIndex: {
+            type: 'integer',
+            description: '当前页面.默认从1开始',
+            format: 'int32'
+        },
+        pageSize: {
+            type: 'integer',
+            description: '每页多少条.每页显示多少记录',
+            format: 'int32'
+        },
+        skipCount: {
+            type: 'integer',
+            description: '跳过多少条',
+            format: 'int32',
+            readOnly: true
+        },
+        sorting: {
+            type: 'string',
+            description: `排序
+<example>
+ name desc
+</example>`,
+            nullable: true
+        },
+        isPage: {
+            type: 'boolean',
+            description: '是否分页'
+        },
+        deviceName: {
+            type: 'string',
+            description: '设备名称',
+            nullable: true
+        },
+        deviceAddress: {
+            type: 'string',
+            description: '设备地址',
+            nullable: true
+        },
+        oldFirmwareVersion: {
+            type: 'string',
+            description: '旧的固件版本',
+            nullable: true
+        },
+        nowFirmwareVersion: {
+            type: 'string',
+            description: '当前固件版本',
+            nullable: true
+        },
+        upgradeDate: {
+            type: 'string',
+            description: '升级日期',
+            format: 'date-time'
+        },
+        upgradeSource: {
+            '$ref': '#/components/schemas/DeviceUpgradeSourceTypeEnum'
+        },
+        searchKeyword: {
+            type: 'string',
+            description: '搜索关键字',
+            nullable: true
+        },
+        upgradeIdentifier: {
+            type: 'integer',
+            description: '升级标识符号',
+            format: 'int64',
+            nullable: true
+        },
+        upgradeResult: {
+            '$ref': '#/components/schemas/DeviceUpgradeResultTypeEnum'
+        }
+    },
+    additionalProperties: false,
+    description: '设备升级记录分页查询输入'
+} as const;
+
 export const PageFileObjectInputSchema = {
     type: 'object',
     properties: {
@@ -10286,6 +10843,58 @@ export const UpdateDetailInputSchema = {
     additionalProperties: false
 } as const;
 
+export const UpdateDeviceFirmwareInfoInputSchema = {
+    required: ['firmwareFileId', 'firmwareFileName', 'firmwareHashCode', 'firmwareLength', 'firmwareVersion', 'id', 'ioTPlatform', 'ioTPlatformProductId', 'ioTPlatformProductName'],
+    type: 'object',
+    properties: {
+        ioTPlatform: {
+            '$ref': '#/components/schemas/IoTPlatformTypeEnum'
+        },
+        ioTPlatformProductId: {
+            minLength: 1,
+            type: 'string',
+            description: '物联网平台中对应的产品Id'
+        },
+        ioTPlatformProductName: {
+            minLength: 1,
+            type: 'string',
+            description: '物联网平台中对应的产品名称'
+        },
+        firmwareVersion: {
+            minLength: 1,
+            type: 'string',
+            description: '固件版本'
+        },
+        firmwareFileId: {
+            type: 'string',
+            description: '固件文件Id',
+            format: 'uuid'
+        },
+        firmwareFileName: {
+            minLength: 1,
+            type: 'string',
+            description: '固件文件名称'
+        },
+        firmwareHashCode: {
+            minLength: 1,
+            type: 'string',
+            description: '固件哈希值'
+        },
+        firmwareLength: {
+            type: 'integer',
+            description: '固件文件长度',
+            format: 'int64'
+        },
+        id: {
+            type: 'string',
+            description: '数据Id',
+            format: 'uuid'
+        }
+    },
+    additionalProperties: false,
+    description: '更新固件信息'
+} as const;
+
 export const UpdateFeatureDtoSchema = {
     type: 'object',
     properties: {

apps/web-antd/src/api-client/types.gen.ts

@@ -348,6 +348,41 @@ export type CreateDeviceAggregationInput = {
     deviceSourceTypeEnum?: DeviceSourceTypeEnum;
 };
 
+/**
+ * 创建设备固件信息
+ */
+export type CreateDeviceFirmwareInfoInput = {
+    ioTPlatform: IoTPlatformTypeEnum;
+    /**
+     * 物联网平台中对应的产品Id
+     */
+    ioTPlatformProductId: string;
+    /**
+     * 物联网平台中对应的产品名称
+     */
+    ioTPlatformProductName: string;
+    /**
+     * 固件版本
+     */
+    firmwareVersion: string;
+    /**
+     * 固件文件Id
+     */
+    firmwareFileId: string;
+    /**
+     * 固件文件名称
+     */
+    firmwareFileName: string;
+    /**
+     * 固件哈希值
+     */
+    firmwareHashCode: string;
+    /**
+     * 固件文件长度
+     */
+    firmwareLength: number;
+};
+
 /**
  * 创建语言
  */
@@ -1080,6 +1115,81 @@ export type DeviceCommandForApiInput = {
     };
 };
 
+export type DeviceFirmwareInfoDto = {
+    id?: string;
+    creationTime?: string;
+    creatorId?: (string) | null;
+    lastModificationTime?: (string) | null;
+    lastModifierId?: (string) | null;
+    isDeleted?: boolean;
+    deleterId?: (string) | null;
+    deletionTime?: (string) | null;
+    /**
+     * 租户Id
+     */
+    tenantId?: (string) | null;
+    /**
+     * 备注
+     */
+    remark?: (string) | null;
+    /**
+     * 旧系统授权创建者Id
+     */
+    osaCreatorId?: (number) | null;
+    /**
+     * 旧系统授权最后修改者Id
+     */
+    osaLastModifierId?: (number) | null;
+    /**
+     * 旧系统授权最后删除者Id
+     */
+    osaDeleterId?: (number) | null;
+    /**
+     * 扩展属性,用于存储自定义字段,JSON格式
+     */
+    extraProperties?: {
+        [key: string]: unknown;
+    } | null;
+    ioTPlatform?: IoTPlatformTypeEnum;
+    /**
+     * 物联网平台中对应的产品Id
+     */
+    ioTPlatformProductId?: (string) | null;
+    /**
+     * 物联网平台中对应的产品名称
+     */
+    ioTPlatformProductName?: (string) | null;
+    /**
+     * 固件版本
+     */
+    firmwareVersion?: (string) | null;
+    /**
+     * 固件文件Id
+     */
+    firmwareFileId?: string;
+    /**
+     * 固件文件名称
+     */
+    firmwareFileName?: (string) | null;
+    /**
+     * 固件哈希值
+     */
+    firmwareHashCode?: (string) | null;
+    /**
+     * 固件文件长度
+     */
+    firmwareLength?: number;
+    /**
+     * 是否启用
+     */
+    isEnable?: boolean;
+};
+
+export type DeviceFirmwareInfoDtoPagedResultDto = {
+    items?: Array<DeviceFirmwareInfoDto> | null;
+    totalCount?: number;
+};
+
 export type DeviceManagementInfoDto = {
     id?: string;
     creationTime?: string;
@@ -1195,6 +1305,18 @@ export type DeviceManagementInfoDto = {
      * 设备物模型名称
      */
     deviceThingModelName?: (string) | null;
+    /**
+     * 固件版本
+     */
+    firmwareVersion?: (string) | null;
+    /**
+     * 升级日期
+     */
+    upgradeDate?: (string) | null;
+    /**
+     * 设备接入鉴权key
+     */
+    securityKey?: (string) | null;
 };
 
 export type DeviceManagementInfoDtoPagedResultDto = {
@@ -1921,6 +2043,126 @@ export type DeviceTreeModelDataInfoInput = {
  */
 export type DeviceTypeEnum = 0 | 1 | 2 | 3;
 
+/**
+ * 设备升级
+ */
+export type DeviceUpgradeForApiInput = {
+    id: string;
+    ioTPlatform: IoTPlatformTypeEnum;
+    /**
+     * 物联网平台中对应的产品Id
+     */
+    ioTPlatformProductId: string;
+    /**
+     * 固件版本信息
+     */
+    nowFirmwareVersionDataId: string;
+};
+
+export type DeviceUpgradeRecordDto = {
+    id?: string;
+    creationTime?: string;
+    creatorId?: (string) | null;
+    lastModificationTime?: (string) | null;
+    lastModifierId?: (string) | null;
+    isDeleted?: boolean;
+    deleterId?: (string) | null;
+    deletionTime?: (string) | null;
+    /**
+     * 租户Id
+     */
+    tenantId?: (string) | null;
+    /**
+     * 备注
+     */
+    remark?: (string) | null;
+    /**
+     * 旧系统授权创建者Id
+     */
+    osaCreatorId?: (number) | null;
+    /**
+     * 旧系统授权最后修改者Id
+     */
+    osaLastModifierId?: (number) | null;
+    /**
+     * 旧系统授权最后删除者Id
+     */
+    osaDeleterId?: (number) | null;
+    /**
+     * 扩展属性,用于存储自定义字段,JSON格式
+     */
+    extraProperties?: {
+        [key: string]: unknown;
+    } | null;
+    /**
+     * 设备名称
+     */
+    deviceName?: (string) | null;
+    /**
+     * 设备地址
+     */
+    deviceAddress?: (string) | null;
+    /**
+     * 旧的固件版本
+     */
+    oldFirmwareVersion?: (string) | null;
+    /**
+     * 固件版本
+     */
+    nowFirmwareVersion?: (string) | null;
+    /**
+     * 升级日期
+     */
+    upgradeDate?: string;
+    upgradeSource?: DeviceUpgradeSourceTypeEnum;
+    /**
+     * 升级来源
+     */
+    readonly upgradeSourceTypeName?: (string) | null;
+    /**
+     * 升级信息
+     */
+    upgradeMessage?: (string) | null;
+    upgradeStatus?: DeviceUpgradeStatusTypeEnum;
+    /**
+     * 升级状态
+     */
+    readonly upgradeStatusName?: (string) | null;
+    /**
+     * 升级标识符号
+     */
+    upgradeIdentifier?: number;
+    /**
+     * 签名校验值
+     */
+    firmwareSignature?: (string) | null;
+    upgradeResult?: DeviceUpgradeResultTypeEnum;
+    /**
+     * 升级结果
+     */
+    readonly upgradeResultName?: (string) | null;
+};
+
+export type DeviceUpgradeRecordDtoPagedResultDto = {
+    items?: Array<DeviceUpgradeRecordDto> | null;
+    totalCount?: number;
+};
+
+/**
+ * 设备升级结果枚举
+ */
+export type DeviceUpgradeResultTypeEnum = 0 | 1001 | 1002 | 1003 | 1004 | 1005 | 2001 | 2002 | 2003 | 2004 | 2005 | 2006 | 3001 | 3002 | 3003 | 4001 | 5001 | 6001 | 6002 | 6003 | 6004 | 6005 | 6006 | 6007 | 6008 | 9999;
+
+/**
+ * 设备升级来源类型枚举
+ */
+export type DeviceUpgradeSourceTypeEnum = 1 | 2;
+
+/**
+ * 设备升级状态枚举
+ */
+export type DeviceUpgradeStatusTypeEnum = 1 | 2 | 3 | 4;
+
 export type DisabledTwoFactorInput = {
     /**
      * 验证码
@@ -2161,6 +2403,10 @@ export type FileObjectDto = {
      * 文件名称
      */
     fileName?: (string) | null;
+    /**
+     * 文件MD5
+     */
+    mD5Hash?: (string) | null;
 };
 
 export type FileQoSOptions = {
@@ -3716,6 +3962,48 @@ export type OpenApiRequest = {
  */
 export type OpenType = 10 | 20 | 30 | 40;
 
+/**
+ * 创建设备固件信息
+ */
+export type PageDeviceFirmwareInfoInput = {
+    /**
+     * 当前页面.默认从1开始
+     */
+    pageIndex?: number;
+    /**
+     * 每页多少条.每页显示多少记录
+     */
+    pageSize?: number;
+    /**
+     * 跳过多少条
+     */
+    readonly skipCount?: number;
+    /**
+     * 排序
+     * <example>
+     * name desc
+     * </example>
+     */
+    sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
+    ioTPlatform?: IoTPlatformTypeEnum;
+    /**
+     * 固件版本
+     */
+    firmwareVersion?: (string) | null;
+    /**
+     * 物联网平台中对应的产品Id
+     */
+    ioTPlatformProductId?: (string) | null;
+    /**
+     * 搜索关键字
+     */
+    searchKeyword?: (string) | null;
+};
+
 export type PageDeviceInput = {
     /**
      * 当前页面.默认从1开始
@@ -3759,6 +4047,65 @@ export type PageDeviceInput = {
     searchKeyword?: (string) | null;
 };
 
+/**
+ * 设备升级记录分页查询输入
+ */
+export type PageDeviceUpgradeRecordInput = {
+    /**
+     * 当前页面.默认从1开始
+     */
+    pageIndex?: number;
+    /**
+     * 每页多少条.每页显示多少记录
+     */
+    pageSize?: number;
+    /**
+     * 跳过多少条
+     */
+    readonly skipCount?: number;
+    /**
+     * 排序
+     * <example>
+     * name desc
+     * </example>
+     */
+    sorting?: (string) | null;
+    /**
+     * 是否分页
+     */
+    isPage?: boolean;
+    /**
+     * 设备名称
+     */
+    deviceName?: (string) | null;
+    /**
+     * 设备地址
+     */
+    deviceAddress?: (string) | null;
+    /**
+     * 旧的固件版本
+     */
+    oldFirmwareVersion?: (string) | null;
+    /**
+     * 当前固件版本
+     */
+    nowFirmwareVersion?: (string) | null;
+    /**
+     * 升级日期
+     */
+    upgradeDate?: string;
+    upgradeSource?: DeviceUpgradeSourceTypeEnum;
+    /**
+     * 搜索关键字
+     */
+    searchKeyword?: (string) | null;
+    /**
+     * 升级标识符号
+     */
+    upgradeIdentifier?: (number) | null;
+    upgradeResult?: DeviceUpgradeResultTypeEnum;
+};
+
 /**
  * 分页查询文件
  */
@@ -5538,6 +5885,45 @@ export type UpdateDetailInput = {
     extendedAttribute?: (string) | null;
 };
 
+/**
+ * 更新固件信息
+ */
+export type UpdateDeviceFirmwareInfoInput = {
+    ioTPlatform: IoTPlatformTypeEnum;
+    /**
+     * 物联网平台中对应的产品Id
+     */
+    ioTPlatformProductId: string;
+    /**
+     * 物联网平台中对应的产品名称
+     */
+    ioTPlatformProductName: string;
+    /**
+     * 固件版本
+     */
+    firmwareVersion: string;
+    /**
+     * 固件文件Id
+     */
+    firmwareFileId: string;
+    /**
+     * 固件文件名称
+     */
+    firmwareFileName: string;
+    /**
+     * 固件哈希值
+     */
+    firmwareHashCode: string;
+    /**
+     * 固件文件长度
+     */
+    firmwareLength: number;
+    /**
+     * 数据Id
+     */
+    id: string;
+};
+
 export type UpdateFeatureDto = {
     name?: (string) | null;
     value?: (string) | null;
@@ -6141,6 +6527,96 @@ export type PostAggregationDeviceGetDevicePropertyValueForApiAsyncResponse = ({
 
 export type PostAggregationDeviceGetDevicePropertyValueForApiAsyncError = unknown;
 
+export type PostAggregationDeviceDeviceUpgradeForApiAsyncData = {
+    query?: {
+        input?: DeviceUpgradeForApiInput;
+    };
+};
+
+export type PostAggregationDeviceDeviceUpgradeForApiAsyncResponse = (boolean);
+
+export type PostAggregationDeviceDeviceUpgradeForApiAsyncError = unknown;
+
+export type PostAggregationDeviceDownloadFirmwareData = {
+    query?: {
+        input?: IdInput;
+    };
+};
+
+export type PostAggregationDeviceDownloadFirmwareResponse = (RemoteStreamContent);
+
+export type PostAggregationDeviceDownloadFirmwareError = unknown;
+
+export type GetAggregationDeviceDownloadFirmwareData = {
+    query?: {
+        input?: IdInput;
+    };
+};
+
+export type GetAggregationDeviceDownloadFirmwareResponse = (RemoteStreamContent);
+
+export type GetAggregationDeviceDownloadFirmwareError = unknown;
+
+export type PostFirmwareInfoCreateAsyncData = {
+    query?: {
+        input?: CreateDeviceFirmwareInfoInput;
+    };
+};
+
+export type PostFirmwareInfoCreateAsyncResponse = (DeviceFirmwareInfoDto);
+
+export type PostFirmwareInfoCreateAsyncError = unknown;
+
+export type PostFirmwareInfoUpdateAsyncData = {
+    query?: {
+        input?: UpdateDeviceFirmwareInfoInput;
+    };
+};
+
+export type PostFirmwareInfoUpdateAsyncResponse = (DeviceFirmwareInfoDto);
+
+export type PostFirmwareInfoUpdateAsyncError = unknown;
+
+export type PostFirmwareInfoDeleteAsyncData = {
+    query?: {
+        input?: IdInput;
+    };
+};
+
+export type PostFirmwareInfoDeleteAsyncResponse = (boolean);
+
+export type PostFirmwareInfoDeleteAsyncError = unknown;
+
+export type PostFirmwareInfoFindByIdAsyncData = {
+    query?: {
+        input?: IdInput;
+    };
+};
+
+export type PostFirmwareInfoFindByIdAsyncResponse = (DeviceFirmwareInfoDto);
+
+export type PostFirmwareInfoFindByIdAsyncError = unknown;
+
+export type PostFirmwareInfoFindByDeviceProductIdAsyncData = {
+    query?: {
+        input?: StringIdInput;
+    };
+};
+
+export type PostFirmwareInfoFindByDeviceProductIdAsyncResponse = (Array<DeviceFirmwareInfoDto>);
+
+export type PostFirmwareInfoFindByDeviceProductIdAsyncError = unknown;
+
+export type PostFirmwareInfoPageData = {
+    query?: {
+        input?: PageDeviceFirmwareInfoInput;
+    };
+};
+
+export type PostFirmwareInfoPageResponse = (DeviceFirmwareInfoDtoPagedResultDto);
+
+export type PostFirmwareInfoPageError = unknown;
+
 export type PostDeviceInfoFindByDeviceAddressData = {
     query?: {
         deviceAddress?: string;
@@ -6421,6 +6897,26 @@ export type PostDeviceThingModelManagementCacheAllDeviceThingModelToRedisAsyncRe
 
 export type PostDeviceThingModelManagementCacheAllDeviceThingModelToRedisAsyncError = unknown;
 
+export type PostUpgradeRecordDeleteAsyncData = {
+    query?: {
+        input?: IdInput;
+    };
+};
+
+export type PostUpgradeRecordDeleteAsyncResponse = (boolean);
+
+export type PostUpgradeRecordDeleteAsyncError = unknown;
+
+export type PostUpgradeRecordPageData = {
+    query?: {
+        input?: PageDeviceUpgradeRecordInput;
+    };
+};
+
+export type PostUpgradeRecordPageResponse = (DeviceUpgradeRecordDtoPagedResultDto);
+
+export type PostUpgradeRecordPageError = unknown;
+
 export type PostFeaturesListData = {
     body?: GetFeatureListResultInput;
 };
@@ -6446,12 +6942,17 @@ export type PostFeaturesDeleteResponse = (unknown);
 export type PostFeaturesDeleteError = (RemoteServiceErrorResponse);
 
 export type PostFilesPageData = {
-    body?: PageFileObjectInput;
+    query?: {
+        /**
+         * 分页查询文件
+         */
+        input?: PageFileObjectInput;
+    };
 };
 
 export type PostFilesPageResponse = (PageFileObjectOutputPagedResultDto);
 
-export type PostFilesPageError = (RemoteServiceErrorResponse);
+export type PostFilesPageError = unknown;
 
 export type PostFilesUploadData = {
     body?: {
@@ -6461,23 +6962,30 @@ export type PostFilesUploadData = {
 
 export type PostFilesUploadResponse = (Array<FileObjectDto>);
 
-export type PostFilesUploadError = (RemoteServiceErrorResponse);
+export type PostFilesUploadError = unknown;
 
 export type PostFilesDeleteData = {
-    body?: DeleteFileObjectInput;
+    query?: {
+        /**
+         * 删除文件
+         */
+        input?: DeleteFileObjectInput;
+    };
 };
 
 export type PostFilesDeleteResponse = (unknown);
 
-export type PostFilesDeleteError = (RemoteServiceErrorResponse);
+export type PostFilesDeleteError = unknown;
 
 export type PostFilesDownloadData = {
-    body?: DownloadFileObjectInput;
+    query?: {
+        input?: DownloadFileObjectInput;
+    };
 };
 
 export type PostFilesDownloadResponse = (RemoteStreamContent);
 
-export type PostFilesDownloadError = (RemoteServiceErrorResponse);
+export type PostFilesDownloadError = unknown;
 
 export type PostIdentitySecurityLogsPageData = {
     body?: PagingIdentitySecurityLogInput;

apps/web-antd/src/views/devicemanagement/deviceinfo/index.vue

@@ -54,10 +54,26 @@ defineOptions({
 
 const router = useRouter();
 const route = useRoute();
+
+// 标志：是否正在从路由参数设置表单值（用于防止重复触发搜索）
+const isSettingFromRoute = ref(false);
+
 const formOptions: VbenFormProps = {
   schema: querySchema.value,
   submitOnChange: false,
   handleValuesChange: async (values, changedFields) => {
+    // 如果正在从路由参数设置值，则不触发搜索（避免重复请求）
+    if (isSettingFromRoute.value) {
+      return;
+    }
+
+    // 当平台类型变化时，清除产品ID（因为不同平台的产品列表不同）
+    if (changedFields.includes('ioTPlatform')) {
+      if (gridApi?.formApi) {
+        await gridApi.formApi.setFieldValue('ioTPlatformProductId', undefined);
+      }
+    }
+
     // 当产品切换时，触发搜索
     if (changedFields.includes('ioTPlatformProductId')) {
       // 延迟一下，确保表单值已更新
@@ -203,66 +219,89 @@ const editRow: Record<string, any> = ref({});
 watch(
   () => route.query,
   async (newQuery) => {
-    if (newQuery.ioTPlatform || newQuery.ioTPlatformDeviceOpenInfo) {
+    if (newQuery.ioTPlatform || newQuery.ioTPlatformProductId) {
+      // 等待组件初始化的辅助函数
+      const waitForFormApi = async (maxRetries = 10, delay = 100) => {
+        for (let i = 0; i < maxRetries; i++) {
+          if (gridApi?.formApi) {
+            return true;
+          }
+          await new Promise((resolve) => setTimeout(resolve, delay));
+        }
+        return false;
+      };
+
       // 延迟执行，确保组件完全初始化
       setTimeout(async () => {
         try {
+          // 设置标志，防止 handleValuesChange 触发搜索
+          isSettingFromRoute.value = true;
+
+          // 等待表单API初始化
+          const formApiReady = await waitForFormApi();
+          if (!formApiReady) {
+            console.warn('表单API初始化超时，无法设置筛选条件');
+            isSettingFromRoute.value = false;
+            return;
+          }
+
           // 设置表单筛选条件
           const filterValues: any = {};
 
           if (newQuery.ioTPlatform) {
-            filterValues.ioTPlatform = newQuery.ioTPlatform;
+            filterValues.ioTPlatform = String(newQuery.ioTPlatform);
           }
 
-          if (newQuery.ioTPlatformDeviceOpenInfo) {
+          if (newQuery.ioTPlatformProductId) {
             // 设置产品ID字段
-            filterValues.ioTPlatformProductId =
+            filterValues.ioTPlatformProductId = String(
-              newQuery.ioTPlatformDeviceOpenInfo;
+              newQuery.ioTPlatformProductId,
-            // 同时设置通用字段用于查询
+            );
-            filterValues.ioTPlatformDeviceOpenInfo =
-              newQuery.ioTPlatformDeviceOpenInfo;
           }
 
-          // 设置表单值并重新加载数据
+          // 先设置平台类型，等待其选项加载完成
-          if (gridApi?.formApi) {
+          if (filterValues.ioTPlatform) {
-            await gridApi.formApi.setValues(filterValues);
+            await gridApi.formApi.setFieldValue(
-            // 等待表单值更新完成后再重新加载数据
+              'ioTPlatform',
+              filterValues.ioTPlatform,
+            );
             await nextTick();
+            // 等待平台选择器的选项加载完成（ApiSelect组件需要时间加载选项）
+            await new Promise((resolve) => setTimeout(resolve, 600));
+          }
+
+          // 再设置产品ID（如果有），需要等待产品选择器的选项加载完成
+          if (filterValues.ioTPlatformProductId) {
+            await gridApi.formApi.setFieldValue(
+              'ioTPlatformProductId',
+              filterValues.ioTPlatformProductId,
+            );
+            await nextTick();
+            // 等待产品选择器的选项加载完成
+            await new Promise((resolve) => setTimeout(resolve, 600));
+          }
+
+          // 等待所有表单值更新完成后再重新加载数据
+          await nextTick();
+          await new Promise((resolve) => setTimeout(resolve, 200));
+
+          // 重置标志
+          isSettingFromRoute.value = false;
+
+          // 触发搜索（只触发一次）
+          if (gridApi?.reload) {
             gridApi.reload();
           }
         } catch (error) {
           console.error('设置表单筛选条件时出错:', error);
+          isSettingFromRoute.value = false;
         }
-      }, 200); // 增加延迟时间，确保ApiSelect组件完全初始化
+      }, 500); // 初始延迟，确保组件开始初始化
     }
   },
   { immediate: true },
 );
 
-// 监听产品选择器变化，自动设置ioTPlatformDeviceOpenInfo
-watch(
-  () => gridApi?.formApi?.getValues,
-  (formValues) => {
-    if (formValues) {
-      const { ioTPlatformProductId } = formValues;
-
-      // 如果选择了产品，设置ioTPlatformDeviceOpenInfo
-      if (ioTPlatformProductId) {
-        console.log('检测到产品选择变化:', ioTPlatformProductId);
-        gridApi?.formApi?.setFieldValue(
-          'ioTPlatformDeviceOpenInfo',
-          ioTPlatformProductId,
-        );
-        console.log('已设置ioTPlatformDeviceOpenInfo为:', ioTPlatformProductId);
-      } else {
-        console.log('清空产品选择');
-        gridApi?.formApi?.setFieldValue('ioTPlatformDeviceOpenInfo', '');
-      }
-    }
-  },
-  { deep: true },
-);
-
 const cacheRefreshLoading = ref(false);
 const pageLoading = ref(false);
 const loadingTip = ref('缓存刷新中...');
@@ -1687,25 +1726,15 @@ const toolbarActions = computed(() => [
       </div>
       <div v-else>
         <div style="margin-bottom: 16px">
-          <Input
+          <Input v-model:value="filterKeyword" placeholder="请输入标准物模型属性名称或平台物模型属性标识符进行筛选" allow-clear
-            v-model:value="filterKeyword"
+            style="width: 100%">
-            placeholder="请输入标准物模型属性名称或平台物模型属性标识符进行筛选"
-            allow-clear
-            style="width: 100%"
-          >
             <template #prefix>
               <Icon icon="ant-design:search-outlined" />
             </template>
           </Input>
         </div>
-        <Table
+        <Table :columns="commandTableColumns" :data-source="filteredThingModelProperties" :pagination="false"
-          :columns="commandTableColumns"
+          :scroll="{ x: 1000, y: 500 }" row-key="id" size="small" />
-          :data-source="filteredThingModelProperties"
-          :pagination="false"
-          :scroll="{ x: 1000, y: 500 }"
-          row-key="id"
-          size="small"
-        />
       </div>
     </CommandModal>
     <UpgradeModal title="设备升级" class="w-[600px]">

apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue

@@ -316,7 +316,7 @@ function onDeviceManagement(record: any) {
     path: '/devicemanagement/deviceinfo',
     query: {
       ioTPlatform: '2', // OneNET平台类型为2
-      ioTPlatformDeviceOpenInfo: record.ioTPlatformProductId, // 平台产品ID
+      ioTPlatformProductId: record.ioTPlatformProductId, // 平台产品ID
       productName: record.productName,
     },
   });
@@ -339,12 +339,15 @@ function onThingModelManagement(record: any) {
 // 物模型更新函数
 async function onThingModelUpdate(record: any) {
   try {
-    const resp = await postAggregationIoTplatformUpdateIoTplatformProductPropertyInfoAsync({
+    const resp =
+      await postAggregationIoTplatformUpdateIoTplatformProductPropertyInfoAsync(
+        {
           body: {
             ioTPlatformType: 2, // OneNET 平台类型为 2
             ioTPlatformProductId: record.ioTPlatformProductId,
           },
-    });
+        },
+      );
     if (resp.data) {
       Message.success('物模型更新成功');
       gridApi.reload();
@@ -414,10 +417,12 @@ async function onThingModelUpdate(record: any) {
             type: 'link',
             size: 'small',
             onClick: onThingModelUpdate.bind(null, row),
-          }
+          },
         ]" :drop-down-actions="[
             {
-            label: row.isEnabled ? $t('common.disabled') : $t('common.enabled'),
+              label: row.isEnabled
+                ? $t('common.disabled')
+                : $t('common.enabled'),
               icon: 'ant-design:edit-filled',
               type: 'primary',
               danger: row.isEnabled,