diff --git a/apps/web-antd/src/api-client/schemas.gen.ts b/apps/web-antd/src/api-client/schemas.gen.ts index e4b7037..272c843 100644 --- a/apps/web-antd/src/api-client/schemas.gen.ts +++ b/apps/web-antd/src/api-client/schemas.gen.ts @@ -1183,14 +1183,12 @@ export const ControllerInterfaceApiDescriptionModelSchema = { export const CopyAnotherProductInputSchema = { type: 'object', properties: { - pendingCopyDataId: { - type: 'string', - description: '待复制设备物模型数据ID', - format: 'uuid' + ioTPlatform: { + '$ref': '#/components/schemas/IoTPlatformTypeEnum' }, ioTPlatformProductId: { type: 'string', - description: '产品ID', + description: '平台产品ID', nullable: true } }, @@ -1198,6 +1196,35 @@ export const CopyAnotherProductInputSchema = { description: '根据数据ID复制已存在物模型信息' } as const; +export const CopyStandardThingModelInputSchema = { + type: 'object', + properties: { + filedType: { + type: 'string', + description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst', + nullable: true + }, + ioTPlatform: { + '$ref': '#/components/schemas/IoTPlatformTypeEnum' + }, + ioTPlatformProductId: { + type: 'string', + description: '平台产品ID', + nullable: true + }, + dataDictionaries: { + type: 'array', + items: { + '$ref': '#/components/schemas/DataDictionaryDetailInfoDto' + }, + description: '标准物模型集合', + nullable: true + } + }, + additionalProperties: false, + description: '复制标准物模型' +} as const; + export const CreateDataDictinaryDetailInputSchema = { type: 'object', properties: { @@ -1472,7 +1499,7 @@ export const CreateThingModelInputSchema = { description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst', nullable: true }, - rawFieldName: { + ioTPlatformRawFieldName: { type: 'string', description: '物联网平台中对应的产品物模型属性或者事件名称', nullable: true @@ -1482,6 +1509,16 @@ export const CreateThingModelInputSchema = { description: '管理后台产品标准的物模型属性或者事件名称', nullable: true }, + standardFieldValueType: { + type: 'string', + description: '标准物模型字段值类型', + nullable: true + }, + standardFieldDisplayName: { + type: 'string', + description: '标准物模型字段显示名称', + nullable: true + }, isValueNeedConvert: { type: 'boolean', description: '是否需要值类型转换' @@ -1625,6 +1662,58 @@ export const CurrentUserDtoSchema = { additionalProperties: false } as const; +export const DataDictionaryDetailInfoDtoSchema = { + type: 'object', + properties: { + dataDictionaryId: { + type: 'string', + description: '所属字典Id', + format: 'uuid' + }, + dataDictionaryName: { + type: 'string', + description: '所属字典名称', + nullable: true + }, + dataDictionaryCode: { + type: 'string', + description: '字典编码', + nullable: true + }, + code: { + type: 'string', + description: '字典明细编码', + nullable: true + }, + order: { + type: 'integer', + description: '展现列表时排序用', + format: 'int32' + }, + displayText: { + type: 'string', + description: '显示名', + nullable: true + }, + description: { + type: 'string', + description: '描述', + nullable: true + }, + isEnabled: { + type: 'boolean', + description: '启/停用(默认启用)' + }, + extendedAttribute: { + type: 'string', + description: '扩展属性', + nullable: true + } + }, + additionalProperties: false, + description: '数据字典详情信息' +} as const; + export const DataEncryptionEnumSchema = { enum: [1, 2, 3, 4, 5, 6], type: 'integer', @@ -2226,7 +2315,7 @@ export const DeviceThingModelInfoDtoSchema = { description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst', nullable: true }, - rawFieldName: { + ioTPlatformRawFieldName: { type: 'string', description: '物联网平台中对应的产品物模型属性或者事件名称', nullable: true @@ -2236,6 +2325,16 @@ export const DeviceThingModelInfoDtoSchema = { description: '管理后台产品标准的物模型属性或者事件名称', nullable: true }, + standardFieldValueType: { + type: 'string', + description: '标准物模型字段值类型', + nullable: true + }, + standardFieldDisplayName: { + type: 'string', + description: '标准物模型字段显示名称', + nullable: true + }, isValueNeedConvert: { type: 'boolean', description: '是否需要值类型转换' @@ -5561,6 +5660,11 @@ export const PageDeviceInputSchema = { ioTPlatform: { '$ref': '#/components/schemas/IoTPlatformTypeEnum' }, + ioTPlatformDeviceOpenInfo: { + type: 'string', + description: '物联网平台中对应的设备Id或者名称', + nullable: true + }, searchKeyword: { type: 'string', description: '搜索关键字', @@ -6378,9 +6482,9 @@ export const PageThingModelInputSchema = { description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst', nullable: true }, - rawFieldName: { + searchKeyWords: { type: 'string', - description: '物联网平台中对应的产品物模型属性或者事件名称', + description: '搜索关键词', nullable: true } }, @@ -6719,6 +6823,11 @@ export const PagingDataDictionaryDetailOutputSchema = { description: '描述', nullable: true }, + extendedAttribute: { + type: 'string', + description: '扩展属性', + nullable: true + }, isEnabled: { type: 'boolean', description: '启/停用(默认启用)' @@ -9077,7 +9186,7 @@ export const UpdateThingModelInputSchema = { description: '物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst', nullable: true }, - rawFieldName: { + ioTPlatformRawFieldName: { type: 'string', description: '物联网平台中对应的产品物模型属性或者事件名称', nullable: true @@ -9087,6 +9196,16 @@ export const UpdateThingModelInputSchema = { description: '管理后台产品标准的物模型属性或者事件名称', nullable: true }, + standardFieldValueType: { + type: 'string', + description: '标准物模型字段值类型', + nullable: true + }, + standardFieldDisplayName: { + type: 'string', + description: '标准物模型字段显示名称', + nullable: true + }, isValueNeedConvert: { type: 'boolean', description: '是否需要值类型转换' diff --git a/apps/web-antd/src/api-client/services.gen.ts b/apps/web-antd/src/api-client/services.gen.ts index 5bef199..b9f3987 100644 --- a/apps/web-antd/src/api-client/services.gen.ts +++ b/apps/web-antd/src/api-client/services.gen.ts @@ -1,7 +1,7 @@ // This file is auto-generated by @hey-api/openapi-ts import { createClient, createConfig, type Options, formDataBodySerializer } from '@hey-api/client-axios'; -import type { GetApiAbpApiDefinitionData, GetApiAbpApiDefinitionError, GetApiAbpApiDefinitionResponse, GetApiAbpApplicationConfigurationData, GetApiAbpApplicationConfigurationError, GetApiAbpApplicationConfigurationResponse, GetApiAbpApplicationLocalizationData, GetApiAbpApplicationLocalizationError, GetApiAbpApplicationLocalizationResponse, PostApiAppAccountLoginData, PostApiAppAccountLoginError, PostApiAppAccountLoginResponse, PostApiAppAccountLogin2FaData, PostApiAppAccountLogin2FaError, PostApiAppAccountLogin2FaResponse, PostApiAppAccountLoginOidcData, PostApiAppAccountLoginOidcError, PostApiAppAccountLoginOidcResponse, PostApiAppAccountRefreshTokenData, PostApiAppAccountRefreshTokenError, PostApiAppAccountRefreshTokenResponse, PostApiAppAccountLogoutError, PostApiAppAccountLogoutResponse, PostAuditLogsPageData, PostAuditLogsPageError, PostAuditLogsPageResponse, PostAggregationBusinessReceiveCommandInfoAsyncData, PostAggregationBusinessReceiveCommandInfoAsyncError, PostAggregationBusinessReceiveCommandInfoAsyncResponse, PostAggregationBusinessBatchQueryDeviceDataInfoAsyncData, PostAggregationBusinessBatchQueryDeviceDataInfoAsyncError, PostAggregationBusinessBatchQueryDeviceDataInfoAsyncResponse, PostAggregationBusinessBatchCreateDeviceInfoAsyncData, PostAggregationBusinessBatchCreateDeviceInfoAsyncError, PostAggregationBusinessBatchCreateDeviceInfoAsyncResponse, GetCommonGetSelectListData, GetCommonGetSelectListError, GetCommonGetSelectListResponse, PostCtWingAccountInsertAsyncData, PostCtWingAccountInsertAsyncError, PostCtWingAccountInsertAsyncResponse, PostCtWingAccountModifyAsyncData, PostCtWingAccountModifyAsyncError, PostCtWingAccountModifyAsyncResponse, PostCtWingAccountDeleteAsyncData, PostCtWingAccountDeleteAsyncError, PostCtWingAccountDeleteAsyncResponse, PostCtWingAccountListAsyncData, PostCtWingAccountListAsyncError, PostCtWingAccountListAsyncResponse, PostCtWingProductInsertAsyncData, PostCtWingProductInsertAsyncError, PostCtWingProductInsertAsyncResponse, PostCtWingProductModifyAsyncData, PostCtWingProductModifyAsyncError, PostCtWingProductModifyAsyncResponse, PostCtWingProductDeleteAsyncData, PostCtWingProductDeleteAsyncError, PostCtWingProductDeleteAsyncResponse, PostCtWingProductGetAsyncData, PostCtWingProductGetAsyncError, PostCtWingProductGetAsyncResponse, PostCtWingProductProductStatusChangeAsyncData, PostCtWingProductProductStatusChangeAsyncError, PostCtWingProductProductStatusChangeAsyncResponse, PostCtWingProductListAsyncData, PostCtWingProductListAsyncError, PostCtWingProductListAsyncResponse, PostCtWingServiceReceiveStatusChangeError, PostCtWingServiceReceiveStatusChangeResponse, PostCtWingServiceReceiveDataChangeError, PostCtWingServiceReceiveDataChangeResponse, PostCtWingServiceReceiveCommandChangeError, PostCtWingServiceReceiveCommandChangeResponse, PostCtWingServiceReceiveEventChangeError, PostCtWingServiceReceiveEventChangeResponse, PostCtWingServiceReceiveDeviceChangeError, PostCtWingServiceReceiveDeviceChangeResponse, PostDataDictionaryPageData, PostDataDictionaryPageError, PostDataDictionaryPageResponse, PostDataDictionaryPageDetailData, PostDataDictionaryPageDetailError, PostDataDictionaryPageDetailResponse, PostDataDictionaryCreateData, PostDataDictionaryCreateError, PostDataDictionaryCreateResponse, PostDataDictionaryCreateDetailData, PostDataDictionaryCreateDetailError, PostDataDictionaryCreateDetailResponse, PostDataDictionaryStatusData, PostDataDictionaryStatusError, PostDataDictionaryStatusResponse, PostDataDictionaryUpdateDetailData, PostDataDictionaryUpdateDetailError, PostDataDictionaryUpdateDetailResponse, PostDataDictionaryDeleteData, PostDataDictionaryDeleteError, PostDataDictionaryDeleteResponse, PostDataDictionaryDeleteDataDictionaryTypeData, PostDataDictionaryDeleteDataDictionaryTypeError, PostDataDictionaryDeleteDataDictionaryTypeResponse, PostDataDictionaryUpdateData, PostDataDictionaryUpdateError, PostDataDictionaryUpdateResponse, PostAggregationDeviceCreateAsyncData, PostAggregationDeviceCreateAsyncError, PostAggregationDeviceCreateAsyncResponse, PostAggregationDeviceBatchCreateAsyncData, PostAggregationDeviceBatchCreateAsyncError, PostAggregationDeviceBatchCreateAsyncResponse, PostAggregationDeviceDeleteAsyncData, PostAggregationDeviceDeleteAsyncError, PostAggregationDeviceDeleteAsyncResponse, PostAggregationDeviceFindByIdAsyncData, PostAggregationDeviceFindByIdAsyncError, PostAggregationDeviceFindByIdAsyncResponse, PostAggregationDeviceRepushDeviceInfoToIoTplatformData, PostAggregationDeviceRepushDeviceInfoToIoTplatformError, PostAggregationDeviceRepushDeviceInfoToIoTplatformResponse, PostAggregationDeviceDeviceCommandForApiAsyncData, PostAggregationDeviceDeviceCommandForApiAsyncError, PostAggregationDeviceDeviceCommandForApiAsyncResponse, PostDeviceInfoFindByDeviceAddressData, PostDeviceInfoFindByDeviceAddressError, PostDeviceInfoFindByDeviceAddressResponse, PostDeviceInfoPageData, PostDeviceInfoPageError, PostDeviceInfoPageResponse, PostDeviceInfoCacheDeviceDataToRedisError, PostDeviceInfoCacheDeviceDataToRedisResponse, PostThingModelInfoCreateAsyncData, PostThingModelInfoCreateAsyncError, PostThingModelInfoCreateAsyncResponse, PostThingModelInfoUpdateAsyncData, PostThingModelInfoUpdateAsyncError, PostThingModelInfoUpdateAsyncResponse, PostThingModelInfoDeleteAsyncData, PostThingModelInfoDeleteAsyncError, PostThingModelInfoDeleteAsyncResponse, PostThingModelInfoFindByIdAsyncData, PostThingModelInfoFindByIdAsyncError, PostThingModelInfoFindByIdAsyncResponse, PostThingModelInfoFindByPlatformProductIdAsyncData, PostThingModelInfoFindByPlatformProductIdAsyncError, PostThingModelInfoFindByPlatformProductIdAsyncResponse, PostThingModelInfoCopyAnotherThingModelAsyncData, PostThingModelInfoCopyAnotherThingModelAsyncError, PostThingModelInfoCopyAnotherThingModelAsyncResponse, PostThingModelInfoCopyStandardThingModelData, PostThingModelInfoCopyStandardThingModelError, PostThingModelInfoCopyStandardThingModelResponse, PostThingModelInfoPageData, PostThingModelInfoPageError, PostThingModelInfoPageResponse, PostFeaturesListData, PostFeaturesListError, PostFeaturesListResponse, PostFeaturesUpdateData, PostFeaturesUpdateError, PostFeaturesUpdateResponse, PostFeaturesDeleteData, PostFeaturesDeleteError, PostFeaturesDeleteResponse, PostFilesPageData, PostFilesPageError, PostFilesPageResponse, PostFilesUploadData, PostFilesUploadError, PostFilesUploadResponse, PostFilesDeleteData, PostFilesDeleteError, PostFilesDeleteResponse, PostFilesDownloadData, PostFilesDownloadError, PostFilesDownloadResponse, PostIdentitySecurityLogsPageData, PostIdentitySecurityLogsPageError, PostIdentitySecurityLogsPageResponse, PostLanguagesAllError, PostLanguagesAllResponse, PostLanguagesPageData, PostLanguagesPageError, PostLanguagesPageResponse, PostLanguagesCreateData, PostLanguagesCreateError, PostLanguagesCreateResponse, PostLanguagesUpdateData, PostLanguagesUpdateError, PostLanguagesUpdateResponse, PostLanguagesDeleteData, PostLanguagesDeleteError, PostLanguagesDeleteResponse, PostLanguagesSetDefaultData, PostLanguagesSetDefaultError, PostLanguagesSetDefaultResponse, PostLanguageTextsAllResourceError, PostLanguageTextsAllResourceResponse, PostLanguageTextsPageData, PostLanguageTextsPageError, PostLanguageTextsPageResponse, PostLanguageTextsCreateData, PostLanguageTextsCreateError, PostLanguageTextsCreateResponse, PostLanguageTextsUpdateData, PostLanguageTextsUpdateError, PostLanguageTextsUpdateResponse, PostMenusUserMenuError, PostMenusUserMenuResponse, PostMenusPageData, PostMenusPageError, PostMenusPageResponse, PostMenusCreateData, PostMenusCreateError, PostMenusCreateResponse, PostMenusUpdateData, PostMenusUpdateError, PostMenusUpdateResponse, PostMenusDeleteData, PostMenusDeleteError, PostMenusDeleteResponse, PostMenusTreeError, PostMenusTreeResponse, PostNotificationNotificationPageData, PostNotificationNotificationPageError, PostNotificationNotificationPageResponse, PostNotificationNotificationSubscriptionPageData, PostNotificationNotificationSubscriptionPageError, PostNotificationNotificationSubscriptionPageResponse, PostNotificationDeleteData, PostNotificationDeleteError, PostNotificationDeleteResponse, PostNotificationSendCommonWarningMessageData, PostNotificationSendCommonWarningMessageError, PostNotificationSendCommonWarningMessageResponse, PostNotificationSendCommonInformationMessageData, PostNotificationSendCommonInformationMessageError, PostNotificationSendCommonInformationMessageResponse, PostNotificationSendCommonErrorMessageData, PostNotificationSendCommonErrorMessageError, PostNotificationSendCommonErrorMessageResponse, PostNotificationSendBroadCastWarningMessageData, PostNotificationSendBroadCastWarningMessageError, PostNotificationSendBroadCastWarningMessageResponse, PostNotificationSendBroadCastInformationMessageData, PostNotificationSendBroadCastInformationMessageError, PostNotificationSendBroadCastInformationMessageResponse, PostNotificationSendBroadCastErrorMessageData, PostNotificationSendBroadCastErrorMessageError, PostNotificationSendBroadCastErrorMessageResponse, PostNotificationReadData, PostNotificationReadError, PostNotificationReadResponse, PostNotificationBatchReadData, PostNotificationBatchReadError, PostNotificationBatchReadResponse, PostOneNetAccountInsertAsyncData, PostOneNetAccountInsertAsyncError, PostOneNetAccountInsertAsyncResponse, PostOneNetAccountModifyAsyncData, PostOneNetAccountModifyAsyncError, PostOneNetAccountModifyAsyncResponse, PostOneNetAccountDeleteAsyncData, PostOneNetAccountDeleteAsyncError, PostOneNetAccountDeleteAsyncResponse, PostOneNetAccountListAsyncData, PostOneNetAccountListAsyncError, PostOneNetAccountListAsyncResponse, PostOneNetProductInsertAsyncData, PostOneNetProductInsertAsyncError, PostOneNetProductInsertAsyncResponse, PostOneNetProductModifyAsyncData, PostOneNetProductModifyAsyncError, PostOneNetProductModifyAsyncResponse, PostOneNetProductDeleteAsyncData, PostOneNetProductDeleteAsyncError, PostOneNetProductDeleteAsyncResponse, PostOneNetProductGetAsyncData, PostOneNetProductGetAsyncError, PostOneNetProductGetAsyncResponse, PostOneNetProductProductStatusChangeAsyncData, PostOneNetProductProductStatusChangeAsyncError, PostOneNetProductProductStatusChangeAsyncResponse, PostOneNetProductListAsyncData, PostOneNetProductListAsyncError, PostOneNetProductListAsyncResponse, PostOneNetServiceReceivePlaintextDataChangeData, PostOneNetServiceReceivePlaintextDataChangeError, PostOneNetServiceReceivePlaintextDataChangeResponse, GetOneNetServiceReceivePlaintextDataChangeData, GetOneNetServiceReceivePlaintextDataChangeError, GetOneNetServiceReceivePlaintextDataChangeResponse, PostOneNetServiceReceiveCiphertextDataChangeData, PostOneNetServiceReceiveCiphertextDataChangeError, PostOneNetServiceReceiveCiphertextDataChangeResponse, GetOneNetServiceReceiveCiphertextDataChangeData, GetOneNetServiceReceiveCiphertextDataChangeError, GetOneNetServiceReceiveCiphertextDataChangeResponse, PostOrganizationUnitsTreeError, PostOrganizationUnitsTreeResponse, PostOrganizationUnitsCreateData, PostOrganizationUnitsCreateError, PostOrganizationUnitsCreateResponse, PostOrganizationUnitsDeleteData, PostOrganizationUnitsDeleteError, PostOrganizationUnitsDeleteResponse, PostOrganizationUnitsUpdateData, PostOrganizationUnitsUpdateError, PostOrganizationUnitsUpdateResponse, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncData, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncError, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncResponse, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncData, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncError, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncResponse, PostOrganizationUnitsAddUserToOrganizationUnitData, PostOrganizationUnitsAddUserToOrganizationUnitError, PostOrganizationUnitsAddUserToOrganizationUnitResponse, PostOrganizationUnitsRemoveUserFromOrganizationUnitData, PostOrganizationUnitsRemoveUserFromOrganizationUnitError, PostOrganizationUnitsRemoveUserFromOrganizationUnitResponse, PostOrganizationUnitsGetUsersData, PostOrganizationUnitsGetUsersError, PostOrganizationUnitsGetUsersResponse, PostOrganizationUnitsGetRolesData, PostOrganizationUnitsGetRolesError, PostOrganizationUnitsGetRolesResponse, PostOrganizationUnitsGetUnAddUsersData, PostOrganizationUnitsGetUnAddUsersError, PostOrganizationUnitsGetUnAddUsersResponse, PostOrganizationUnitsGetUnAddRolesData, PostOrganizationUnitsGetUnAddRolesError, PostOrganizationUnitsGetUnAddRolesResponse, PostPermissionsTreeData, PostPermissionsTreeError, PostPermissionsTreeResponse, PostPermissionsUpdateData, PostPermissionsUpdateError, PostPermissionsUpdateResponse, PostRolesAllError, PostRolesAllResponse, PostRolesPageData, PostRolesPageError, PostRolesPageResponse, PostRolesCreateData, PostRolesCreateError, PostRolesCreateResponse, PostRolesUpdateData, PostRolesUpdateError, PostRolesUpdateResponse, PostRolesDeleteData, PostRolesDeleteError, PostRolesDeleteResponse, GetApiAppAbpProBasicApplicationConfigurationError, GetApiAppAbpProBasicApplicationConfigurationResponse, PostSettingsAllError, PostSettingsAllResponse, PostSettingsUpdateData, PostSettingsUpdateError, PostSettingsUpdateResponse, PostTableModelPacketInfoPageData, PostTableModelPacketInfoPageError, PostTableModelPacketInfoPageResponse, PostTableModelDeviceDataInfoPageData, PostTableModelDeviceDataInfoPageError, PostTableModelDeviceDataInfoPageResponse, PostTableModelCtWingLogInfoData, PostTableModelCtWingLogInfoError, PostTableModelCtWingLogInfoResponse, PostTableModelOneNetLogInfoData, PostTableModelOneNetLogInfoError, PostTableModelOneNetLogInfoResponse, PostTenantsFindData, PostTenantsFindError, PostTenantsFindResponse, PostTenantsPageData, PostTenantsPageError, PostTenantsPageResponse, PostTenantsCreateData, PostTenantsCreateError, PostTenantsCreateResponse, PostTenantsUpdateData, PostTenantsUpdateError, PostTenantsUpdateResponse, PostTenantsDeleteData, PostTenantsDeleteError, PostTenantsDeleteResponse, PostTenantsPageConnectionStringData, PostTenantsPageConnectionStringError, PostTenantsPageConnectionStringResponse, PostTenantsAddOrUpdateConnectionStringData, PostTenantsAddOrUpdateConnectionStringError, PostTenantsAddOrUpdateConnectionStringResponse, PostTenantsDeleteConnectionStringData, PostTenantsDeleteConnectionStringError, PostTenantsDeleteConnectionStringResponse, PostTextTemplatesPageData, PostTextTemplatesPageError, PostTextTemplatesPageResponse, PostTextTemplatesCreateData, PostTextTemplatesCreateError, PostTextTemplatesCreateResponse, PostTextTemplatesUpdateData, PostTextTemplatesUpdateError, PostTextTemplatesUpdateResponse, PostTextTemplatesDeleteData, PostTextTemplatesDeleteError, PostTextTemplatesDeleteResponse, PostTextTemplatesExportData, PostTextTemplatesExportError, PostTextTemplatesExportResponse, PostTreeModelDeviceDataInfoPageData, PostTreeModelDeviceDataInfoPageError, PostTreeModelDeviceDataInfoPageResponse, PostUsersPageData, PostUsersPageError, PostUsersPageResponse, PostUsersListData, PostUsersListError, PostUsersListResponse, PostUsersExportData, PostUsersExportError, PostUsersExportResponse, PostUsersCreateData, PostUsersCreateError, PostUsersCreateResponse, PostUsersUpdateData, PostUsersUpdateError, PostUsersUpdateResponse, PostUsersDeleteData, PostUsersDeleteError, PostUsersDeleteResponse, PostUsersRoleData, PostUsersRoleError, PostUsersRoleResponse, PostUsersChangePasswordData, PostUsersChangePasswordError, PostUsersChangePasswordResponse, PostUsersResetPasswordData, PostUsersResetPasswordError, PostUsersResetPasswordResponse, PostUsersLockData, PostUsersLockError, PostUsersLockResponse, PostUsersFindByUserNameData, PostUsersFindByUserNameError, PostUsersFindByUserNameResponse, PostUsersMyProfileError, PostUsersMyProfileResponse, PostUsersCanUseTwoFactorError, PostUsersCanUseTwoFactorResponse, PostUsersGetQrCodeError, PostUsersGetQrCodeResponse, PostUsersEnabledTwoFactorData, PostUsersEnabledTwoFactorError, PostUsersEnabledTwoFactorResponse, PostUsersDisabledTwoFactorData, PostUsersDisabledTwoFactorError, PostUsersDisabledTwoFactorResponse, PostUsersResetTwoFactorData, PostUsersResetTwoFactorError, PostUsersResetTwoFactorResponse, PostUsersNeedChangePasswordError, PostUsersNeedChangePasswordResponse, PostAggregationWorkshopReceiveWorkshopProductionInfoAsyncData, PostAggregationWorkshopReceiveWorkshopProductionInfoAsyncError, PostAggregationWorkshopReceiveWorkshopProductionInfoAsyncResponse, PostAggregationWorkshopGetProductListAsyncData, PostAggregationWorkshopGetProductListAsyncError, PostAggregationWorkshopGetProductListAsyncResponse } from './types.gen'; +import type { GetApiAbpApiDefinitionData, GetApiAbpApiDefinitionError, GetApiAbpApiDefinitionResponse, GetApiAbpApplicationConfigurationData, GetApiAbpApplicationConfigurationError, GetApiAbpApplicationConfigurationResponse, GetApiAbpApplicationLocalizationData, GetApiAbpApplicationLocalizationError, GetApiAbpApplicationLocalizationResponse, PostApiAppAccountLoginData, PostApiAppAccountLoginError, PostApiAppAccountLoginResponse, PostApiAppAccountLogin2FaData, PostApiAppAccountLogin2FaError, PostApiAppAccountLogin2FaResponse, PostApiAppAccountLoginOidcData, PostApiAppAccountLoginOidcError, PostApiAppAccountLoginOidcResponse, PostApiAppAccountRefreshTokenData, PostApiAppAccountRefreshTokenError, PostApiAppAccountRefreshTokenResponse, PostApiAppAccountLogoutError, PostApiAppAccountLogoutResponse, PostAuditLogsPageData, PostAuditLogsPageError, PostAuditLogsPageResponse, PostAggregationBusinessReceiveCommandInfoAsyncData, PostAggregationBusinessReceiveCommandInfoAsyncError, PostAggregationBusinessReceiveCommandInfoAsyncResponse, PostAggregationBusinessBatchQueryDeviceDataInfoAsyncData, PostAggregationBusinessBatchQueryDeviceDataInfoAsyncError, PostAggregationBusinessBatchQueryDeviceDataInfoAsyncResponse, PostAggregationBusinessBatchCreateDeviceInfoAsyncData, PostAggregationBusinessBatchCreateDeviceInfoAsyncError, PostAggregationBusinessBatchCreateDeviceInfoAsyncResponse, GetCommonGetSelectListData, GetCommonGetSelectListError, GetCommonGetSelectListResponse, PostCtWingAccountInsertAsyncData, PostCtWingAccountInsertAsyncError, PostCtWingAccountInsertAsyncResponse, PostCtWingAccountModifyAsyncData, PostCtWingAccountModifyAsyncError, PostCtWingAccountModifyAsyncResponse, PostCtWingAccountDeleteAsyncData, PostCtWingAccountDeleteAsyncError, PostCtWingAccountDeleteAsyncResponse, PostCtWingAccountListAsyncData, PostCtWingAccountListAsyncError, PostCtWingAccountListAsyncResponse, PostCtWingProductInsertAsyncData, PostCtWingProductInsertAsyncError, PostCtWingProductInsertAsyncResponse, PostCtWingProductModifyAsyncData, PostCtWingProductModifyAsyncError, PostCtWingProductModifyAsyncResponse, PostCtWingProductDeleteAsyncData, PostCtWingProductDeleteAsyncError, PostCtWingProductDeleteAsyncResponse, PostCtWingProductGetAsyncData, PostCtWingProductGetAsyncError, PostCtWingProductGetAsyncResponse, PostCtWingProductProductStatusChangeAsyncData, PostCtWingProductProductStatusChangeAsyncError, PostCtWingProductProductStatusChangeAsyncResponse, PostCtWingProductListAsyncData, PostCtWingProductListAsyncError, PostCtWingProductListAsyncResponse, PostCtWingServiceReceiveStatusChangeError, PostCtWingServiceReceiveStatusChangeResponse, PostCtWingServiceReceiveDataChangeError, PostCtWingServiceReceiveDataChangeResponse, PostCtWingServiceReceiveCommandChangeError, PostCtWingServiceReceiveCommandChangeResponse, PostCtWingServiceReceiveEventChangeError, PostCtWingServiceReceiveEventChangeResponse, PostCtWingServiceReceiveDeviceChangeError, PostCtWingServiceReceiveDeviceChangeResponse, PostDataDictionaryPageData, PostDataDictionaryPageError, PostDataDictionaryPageResponse, PostDataDictionaryPageDetailData, PostDataDictionaryPageDetailError, PostDataDictionaryPageDetailResponse, PostDataDictionaryCreateData, PostDataDictionaryCreateError, PostDataDictionaryCreateResponse, PostDataDictionaryCreateDetailData, PostDataDictionaryCreateDetailError, PostDataDictionaryCreateDetailResponse, PostDataDictionaryStatusData, PostDataDictionaryStatusError, PostDataDictionaryStatusResponse, PostDataDictionaryUpdateDetailData, PostDataDictionaryUpdateDetailError, PostDataDictionaryUpdateDetailResponse, PostDataDictionaryDeleteData, PostDataDictionaryDeleteError, PostDataDictionaryDeleteResponse, PostDataDictionaryDeleteDataDictionaryTypeData, PostDataDictionaryDeleteDataDictionaryTypeError, PostDataDictionaryDeleteDataDictionaryTypeResponse, PostDataDictionaryUpdateData, PostDataDictionaryUpdateError, PostDataDictionaryUpdateResponse, PostAggregationDeviceCreateAsyncData, PostAggregationDeviceCreateAsyncError, PostAggregationDeviceCreateAsyncResponse, PostAggregationDeviceBatchCreateAsyncData, PostAggregationDeviceBatchCreateAsyncError, PostAggregationDeviceBatchCreateAsyncResponse, PostAggregationDeviceDeleteAsyncData, PostAggregationDeviceDeleteAsyncError, PostAggregationDeviceDeleteAsyncResponse, PostAggregationDeviceFindByIdAsyncData, PostAggregationDeviceFindByIdAsyncError, PostAggregationDeviceFindByIdAsyncResponse, PostAggregationDeviceRepushDeviceInfoToIoTplatformData, PostAggregationDeviceRepushDeviceInfoToIoTplatformError, PostAggregationDeviceRepushDeviceInfoToIoTplatformResponse, PostAggregationDeviceDeviceCommandForApiAsyncData, PostAggregationDeviceDeviceCommandForApiAsyncError, PostAggregationDeviceDeviceCommandForApiAsyncResponse, PostDeviceInfoFindByDeviceAddressData, PostDeviceInfoFindByDeviceAddressError, PostDeviceInfoFindByDeviceAddressResponse, PostDeviceInfoPageData, PostDeviceInfoPageError, PostDeviceInfoPageResponse, PostDeviceInfoCacheDeviceDataToRedisError, PostDeviceInfoCacheDeviceDataToRedisResponse, PostThingModelInfoCreateAsyncData, PostThingModelInfoCreateAsyncError, PostThingModelInfoCreateAsyncResponse, PostThingModelInfoUpdateAsyncData, PostThingModelInfoUpdateAsyncError, PostThingModelInfoUpdateAsyncResponse, PostThingModelInfoDeleteAsyncData, PostThingModelInfoDeleteAsyncError, PostThingModelInfoDeleteAsyncResponse, PostThingModelInfoFindByIdAsyncData, PostThingModelInfoFindByIdAsyncError, PostThingModelInfoFindByIdAsyncResponse, PostThingModelInfoFindByPlatformProductIdAsyncData, PostThingModelInfoFindByPlatformProductIdAsyncError, PostThingModelInfoFindByPlatformProductIdAsyncResponse, PostThingModelInfoCopyAnotherThingModelAsyncData, PostThingModelInfoCopyAnotherThingModelAsyncError, PostThingModelInfoCopyAnotherThingModelAsyncResponse, PostThingModelInfoCopyStandardThingModelData, PostThingModelInfoCopyStandardThingModelError, PostThingModelInfoCopyStandardThingModelResponse, PostThingModelInfoPageAsyncData, PostThingModelInfoPageAsyncError, PostThingModelInfoPageAsyncResponse, PostThingModelInfoStandardThingModelPageAsyncError, PostThingModelInfoStandardThingModelPageAsyncResponse, PostFeaturesListData, PostFeaturesListError, PostFeaturesListResponse, PostFeaturesUpdateData, PostFeaturesUpdateError, PostFeaturesUpdateResponse, PostFeaturesDeleteData, PostFeaturesDeleteError, PostFeaturesDeleteResponse, PostFilesPageData, PostFilesPageError, PostFilesPageResponse, PostFilesUploadData, PostFilesUploadError, PostFilesUploadResponse, PostFilesDeleteData, PostFilesDeleteError, PostFilesDeleteResponse, PostFilesDownloadData, PostFilesDownloadError, PostFilesDownloadResponse, PostIdentitySecurityLogsPageData, PostIdentitySecurityLogsPageError, PostIdentitySecurityLogsPageResponse, PostLanguagesAllError, PostLanguagesAllResponse, PostLanguagesPageData, PostLanguagesPageError, PostLanguagesPageResponse, PostLanguagesCreateData, PostLanguagesCreateError, PostLanguagesCreateResponse, PostLanguagesUpdateData, PostLanguagesUpdateError, PostLanguagesUpdateResponse, PostLanguagesDeleteData, PostLanguagesDeleteError, PostLanguagesDeleteResponse, PostLanguagesSetDefaultData, PostLanguagesSetDefaultError, PostLanguagesSetDefaultResponse, PostLanguageTextsAllResourceError, PostLanguageTextsAllResourceResponse, PostLanguageTextsPageData, PostLanguageTextsPageError, PostLanguageTextsPageResponse, PostLanguageTextsCreateData, PostLanguageTextsCreateError, PostLanguageTextsCreateResponse, PostLanguageTextsUpdateData, PostLanguageTextsUpdateError, PostLanguageTextsUpdateResponse, PostMenusUserMenuError, PostMenusUserMenuResponse, PostMenusPageData, PostMenusPageError, PostMenusPageResponse, PostMenusCreateData, PostMenusCreateError, PostMenusCreateResponse, PostMenusUpdateData, PostMenusUpdateError, PostMenusUpdateResponse, PostMenusDeleteData, PostMenusDeleteError, PostMenusDeleteResponse, PostMenusTreeError, PostMenusTreeResponse, PostNotificationNotificationPageData, PostNotificationNotificationPageError, PostNotificationNotificationPageResponse, PostNotificationNotificationSubscriptionPageData, PostNotificationNotificationSubscriptionPageError, PostNotificationNotificationSubscriptionPageResponse, PostNotificationDeleteData, PostNotificationDeleteError, PostNotificationDeleteResponse, PostNotificationSendCommonWarningMessageData, PostNotificationSendCommonWarningMessageError, PostNotificationSendCommonWarningMessageResponse, PostNotificationSendCommonInformationMessageData, PostNotificationSendCommonInformationMessageError, PostNotificationSendCommonInformationMessageResponse, PostNotificationSendCommonErrorMessageData, PostNotificationSendCommonErrorMessageError, PostNotificationSendCommonErrorMessageResponse, PostNotificationSendBroadCastWarningMessageData, PostNotificationSendBroadCastWarningMessageError, PostNotificationSendBroadCastWarningMessageResponse, PostNotificationSendBroadCastInformationMessageData, PostNotificationSendBroadCastInformationMessageError, PostNotificationSendBroadCastInformationMessageResponse, PostNotificationSendBroadCastErrorMessageData, PostNotificationSendBroadCastErrorMessageError, PostNotificationSendBroadCastErrorMessageResponse, PostNotificationReadData, PostNotificationReadError, PostNotificationReadResponse, PostNotificationBatchReadData, PostNotificationBatchReadError, PostNotificationBatchReadResponse, PostOneNetAccountInsertAsyncData, PostOneNetAccountInsertAsyncError, PostOneNetAccountInsertAsyncResponse, PostOneNetAccountModifyAsyncData, PostOneNetAccountModifyAsyncError, PostOneNetAccountModifyAsyncResponse, PostOneNetAccountDeleteAsyncData, PostOneNetAccountDeleteAsyncError, PostOneNetAccountDeleteAsyncResponse, PostOneNetAccountListAsyncData, PostOneNetAccountListAsyncError, PostOneNetAccountListAsyncResponse, PostOneNetProductInsertAsyncData, PostOneNetProductInsertAsyncError, PostOneNetProductInsertAsyncResponse, PostOneNetProductModifyAsyncData, PostOneNetProductModifyAsyncError, PostOneNetProductModifyAsyncResponse, PostOneNetProductDeleteAsyncData, PostOneNetProductDeleteAsyncError, PostOneNetProductDeleteAsyncResponse, PostOneNetProductGetAsyncData, PostOneNetProductGetAsyncError, PostOneNetProductGetAsyncResponse, PostOneNetProductProductStatusChangeAsyncData, PostOneNetProductProductStatusChangeAsyncError, PostOneNetProductProductStatusChangeAsyncResponse, PostOneNetProductListAsyncData, PostOneNetProductListAsyncError, PostOneNetProductListAsyncResponse, PostOneNetServiceReceivePlaintextDataChangeData, PostOneNetServiceReceivePlaintextDataChangeError, PostOneNetServiceReceivePlaintextDataChangeResponse, GetOneNetServiceReceivePlaintextDataChangeData, GetOneNetServiceReceivePlaintextDataChangeError, GetOneNetServiceReceivePlaintextDataChangeResponse, PostOneNetServiceReceiveCiphertextDataChangeData, PostOneNetServiceReceiveCiphertextDataChangeError, PostOneNetServiceReceiveCiphertextDataChangeResponse, GetOneNetServiceReceiveCiphertextDataChangeData, GetOneNetServiceReceiveCiphertextDataChangeError, GetOneNetServiceReceiveCiphertextDataChangeResponse, PostOrganizationUnitsTreeError, PostOrganizationUnitsTreeResponse, PostOrganizationUnitsCreateData, PostOrganizationUnitsCreateError, PostOrganizationUnitsCreateResponse, PostOrganizationUnitsDeleteData, PostOrganizationUnitsDeleteError, PostOrganizationUnitsDeleteResponse, PostOrganizationUnitsUpdateData, PostOrganizationUnitsUpdateError, PostOrganizationUnitsUpdateResponse, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncData, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncError, PostOrganizationUnitsAddRoleToOrganizationUnitAsyncResponse, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncData, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncError, PostOrganizationUnitsRemoveRoleFromOrganizationUnitAsyncResponse, PostOrganizationUnitsAddUserToOrganizationUnitData, PostOrganizationUnitsAddUserToOrganizationUnitError, PostOrganizationUnitsAddUserToOrganizationUnitResponse, PostOrganizationUnitsRemoveUserFromOrganizationUnitData, PostOrganizationUnitsRemoveUserFromOrganizationUnitError, PostOrganizationUnitsRemoveUserFromOrganizationUnitResponse, PostOrganizationUnitsGetUsersData, PostOrganizationUnitsGetUsersError, PostOrganizationUnitsGetUsersResponse, PostOrganizationUnitsGetRolesData, PostOrganizationUnitsGetRolesError, PostOrganizationUnitsGetRolesResponse, PostOrganizationUnitsGetUnAddUsersData, PostOrganizationUnitsGetUnAddUsersError, PostOrganizationUnitsGetUnAddUsersResponse, PostOrganizationUnitsGetUnAddRolesData, PostOrganizationUnitsGetUnAddRolesError, PostOrganizationUnitsGetUnAddRolesResponse, PostPermissionsTreeData, PostPermissionsTreeError, PostPermissionsTreeResponse, PostPermissionsUpdateData, PostPermissionsUpdateError, PostPermissionsUpdateResponse, PostRolesAllError, PostRolesAllResponse, PostRolesPageData, PostRolesPageError, PostRolesPageResponse, PostRolesCreateData, PostRolesCreateError, PostRolesCreateResponse, PostRolesUpdateData, PostRolesUpdateError, PostRolesUpdateResponse, PostRolesDeleteData, PostRolesDeleteError, PostRolesDeleteResponse, GetApiAppAbpProBasicApplicationConfigurationError, GetApiAppAbpProBasicApplicationConfigurationResponse, PostSettingsAllError, PostSettingsAllResponse, PostSettingsUpdateData, PostSettingsUpdateError, PostSettingsUpdateResponse, PostTableModelPacketInfoPageData, PostTableModelPacketInfoPageError, PostTableModelPacketInfoPageResponse, PostTableModelDeviceDataInfoPageData, PostTableModelDeviceDataInfoPageError, PostTableModelDeviceDataInfoPageResponse, PostTableModelCtWingLogInfoData, PostTableModelCtWingLogInfoError, PostTableModelCtWingLogInfoResponse, PostTableModelOneNetLogInfoData, PostTableModelOneNetLogInfoError, PostTableModelOneNetLogInfoResponse, PostTenantsFindData, PostTenantsFindError, PostTenantsFindResponse, PostTenantsPageData, PostTenantsPageError, PostTenantsPageResponse, PostTenantsCreateData, PostTenantsCreateError, PostTenantsCreateResponse, PostTenantsUpdateData, PostTenantsUpdateError, PostTenantsUpdateResponse, PostTenantsDeleteData, PostTenantsDeleteError, PostTenantsDeleteResponse, PostTenantsPageConnectionStringData, PostTenantsPageConnectionStringError, PostTenantsPageConnectionStringResponse, PostTenantsAddOrUpdateConnectionStringData, PostTenantsAddOrUpdateConnectionStringError, PostTenantsAddOrUpdateConnectionStringResponse, PostTenantsDeleteConnectionStringData, PostTenantsDeleteConnectionStringError, PostTenantsDeleteConnectionStringResponse, PostTextTemplatesPageData, PostTextTemplatesPageError, PostTextTemplatesPageResponse, PostTextTemplatesCreateData, PostTextTemplatesCreateError, PostTextTemplatesCreateResponse, PostTextTemplatesUpdateData, PostTextTemplatesUpdateError, PostTextTemplatesUpdateResponse, PostTextTemplatesDeleteData, PostTextTemplatesDeleteError, PostTextTemplatesDeleteResponse, PostTextTemplatesExportData, PostTextTemplatesExportError, PostTextTemplatesExportResponse, PostTreeModelDeviceDataInfoPageData, PostTreeModelDeviceDataInfoPageError, PostTreeModelDeviceDataInfoPageResponse, PostUsersPageData, PostUsersPageError, PostUsersPageResponse, PostUsersListData, PostUsersListError, PostUsersListResponse, PostUsersExportData, PostUsersExportError, PostUsersExportResponse, PostUsersCreateData, PostUsersCreateError, PostUsersCreateResponse, PostUsersUpdateData, PostUsersUpdateError, PostUsersUpdateResponse, PostUsersDeleteData, PostUsersDeleteError, PostUsersDeleteResponse, PostUsersRoleData, PostUsersRoleError, PostUsersRoleResponse, PostUsersChangePasswordData, PostUsersChangePasswordError, PostUsersChangePasswordResponse, PostUsersResetPasswordData, PostUsersResetPasswordError, PostUsersResetPasswordResponse, PostUsersLockData, PostUsersLockError, PostUsersLockResponse, PostUsersFindByUserNameData, PostUsersFindByUserNameError, PostUsersFindByUserNameResponse, PostUsersMyProfileError, PostUsersMyProfileResponse, PostUsersCanUseTwoFactorError, PostUsersCanUseTwoFactorResponse, PostUsersGetQrCodeError, PostUsersGetQrCodeResponse, PostUsersEnabledTwoFactorData, PostUsersEnabledTwoFactorError, PostUsersEnabledTwoFactorResponse, PostUsersDisabledTwoFactorData, PostUsersDisabledTwoFactorError, PostUsersDisabledTwoFactorResponse, PostUsersResetTwoFactorData, PostUsersResetTwoFactorError, PostUsersResetTwoFactorResponse, PostUsersNeedChangePasswordError, PostUsersNeedChangePasswordResponse, PostAggregationWorkshopReceiveWorkshopProductionInfoAsyncData, PostAggregationWorkshopReceiveWorkshopProductionInfoAsyncError, PostAggregationWorkshopReceiveWorkshopProductionInfoAsyncResponse, PostAggregationWorkshopGetProductListAsyncData, PostAggregationWorkshopGetProductListAsyncError, PostAggregationWorkshopGetProductListAsyncResponse } from './types.gen'; export const client = createClient(createConfig()); @@ -529,10 +529,20 @@ export const postThingModelInfoCopyStandardThingModel = (options?: Options) => { - return (options?.client ?? client).post({ +export const postThingModelInfoPageAsync = (options?: Options) => { + return (options?.client ?? client).post({ ...options, - url: '/ThingModelInfo/Page' + url: '/ThingModelInfo/PageAsync' + }); +}; + +/** + * 获取所有的标准物模型信息 + */ +export const postThingModelInfoStandardThingModelPageAsync = (options?: Options) => { + return (options?.client ?? client).post({ + ...options, + url: '/ThingModelInfo/StandardThingModelPageAsync' }); }; diff --git a/apps/web-antd/src/api-client/types.gen.ts b/apps/web-antd/src/api-client/types.gen.ts index 785c65d..4afc622 100644 --- a/apps/web-antd/src/api-client/types.gen.ts +++ b/apps/web-antd/src/api-client/types.gen.ts @@ -204,16 +204,32 @@ export type ControllerInterfaceApiDescriptionModel = { * 根据数据ID复制已存在物模型信息 */ export type CopyAnotherProductInput = { + ioTPlatform?: IoTPlatformTypeEnum; /** - * 待复制设备物模型数据ID - */ - pendingCopyDataId?: string; - /** - * 产品ID + * 平台产品ID */ ioTPlatformProductId?: (string) | null; }; +/** + * 复制标准物模型 + */ +export type CopyStandardThingModelInput = { + /** + * 物联网平台中对应产品物模型属性或者事件类型 JiShe.ServicePro.Core.DataDictionaryTypeConst + */ + filedType?: (string) | null; + ioTPlatform?: IoTPlatformTypeEnum; + /** + * 平台产品ID + */ + ioTPlatformProductId?: (string) | null; + /** + * 标准物模型集合 + */ + dataDictionaries?: Array | null; +}; + export type CreateDataDictinaryDetailInput = { id?: string; code?: (string) | null; @@ -393,11 +409,19 @@ export type CreateThingModelInput = { /** * 物联网平台中对应的产品物模型属性或者事件名称 */ - rawFieldName?: (string) | null; + ioTPlatformRawFieldName?: (string) | null; /** * 管理后台产品标准的物模型属性或者事件名称 */ standardFieldName?: (string) | null; + /** + * 标准物模型字段值类型 + */ + standardFieldValueType?: (string) | null; + /** + * 标准物模型字段显示名称 + */ + standardFieldDisplayName?: (string) | null; /** * 是否需要值类型转换 */ @@ -857,6 +881,48 @@ export type CurrentUserDto = { sessionId?: (string) | null; }; +/** + * 数据字典详情信息 + */ +export type DataDictionaryDetailInfoDto = { + /** + * 所属字典Id + */ + dataDictionaryId?: string; + /** + * 所属字典名称 + */ + dataDictionaryName?: (string) | null; + /** + * 字典编码 + */ + dataDictionaryCode?: (string) | null; + /** + * 字典明细编码 + */ + code?: (string) | null; + /** + * 展现列表时排序用 + */ + order?: number; + /** + * 显示名 + */ + displayText?: (string) | null; + /** + * 描述 + */ + description?: (string) | null; + /** + * 启/停用(默认启用) + */ + isEnabled?: boolean; + /** + * 扩展属性 + */ + extendedAttribute?: (string) | null; +}; + /** * 数据加密方式 */ @@ -1206,11 +1272,19 @@ export type DeviceThingModelInfoDto = { /** * 物联网平台中对应的产品物模型属性或者事件名称 */ - rawFieldName?: (string) | null; + ioTPlatformRawFieldName?: (string) | null; /** * 管理后台产品标准的物模型属性或者事件名称 */ standardFieldName?: (string) | null; + /** + * 标准物模型字段值类型 + */ + standardFieldValueType?: (string) | null; + /** + * 标准物模型字段显示名称 + */ + standardFieldDisplayName?: (string) | null; /** * 是否需要值类型转换 */ @@ -2760,6 +2834,10 @@ export type PageDeviceInput = { */ deviceAddress?: (string) | null; ioTPlatform?: IoTPlatformTypeEnum; + /** + * 物联网平台中对应的设备Id或者名称 + */ + ioTPlatformDeviceOpenInfo?: (string) | null; /** * 搜索关键字 */ @@ -3260,9 +3338,9 @@ export type PageThingModelInput = { */ filedType?: (string) | null; /** - * 物联网平台中对应的产品物模型属性或者事件名称 + * 搜索关键词 */ - rawFieldName?: (string) | null; + searchKeyWords?: (string) | null; }; export type PagingAuditLogActionOutput = { @@ -3422,6 +3500,10 @@ export type PagingDataDictionaryDetailOutput = { * 描述 */ description?: (string) | null; + /** + * 扩展属性 + */ + extendedAttribute?: (string) | null; /** * 启/停用(默认启用) */ @@ -4660,11 +4742,19 @@ export type UpdateThingModelInput = { /** * 物联网平台中对应的产品物模型属性或者事件名称 */ - rawFieldName?: (string) | null; + ioTPlatformRawFieldName?: (string) | null; /** * 管理后台产品标准的物模型属性或者事件名称 */ standardFieldName?: (string) | null; + /** + * 标准物模型字段值类型 + */ + standardFieldValueType?: (string) | null; + /** + * 标准物模型字段显示名称 + */ + standardFieldDisplayName?: (string) | null; /** * 是否需要值类型转换 */ @@ -5132,7 +5222,7 @@ export type PostThingModelInfoFindByPlatformProductIdAsyncData = { }; }; -export type PostThingModelInfoFindByPlatformProductIdAsyncResponse = (DeviceThingModelInfoDto); +export type PostThingModelInfoFindByPlatformProductIdAsyncResponse = (Array); export type PostThingModelInfoFindByPlatformProductIdAsyncError = unknown; @@ -5142,29 +5232,33 @@ export type PostThingModelInfoCopyAnotherThingModelAsyncData = { }; }; -export type PostThingModelInfoCopyAnotherThingModelAsyncResponse = (DeviceThingModelInfoDto); +export type PostThingModelInfoCopyAnotherThingModelAsyncResponse = (boolean); export type PostThingModelInfoCopyAnotherThingModelAsyncError = unknown; export type PostThingModelInfoCopyStandardThingModelData = { query?: { - input?: StringIdInput; + input?: CopyStandardThingModelInput; }; }; -export type PostThingModelInfoCopyStandardThingModelResponse = (DeviceThingModelInfoDto); +export type PostThingModelInfoCopyStandardThingModelResponse = (boolean); export type PostThingModelInfoCopyStandardThingModelError = unknown; -export type PostThingModelInfoPageData = { +export type PostThingModelInfoPageAsyncData = { query?: { input?: PageThingModelInput; }; }; -export type PostThingModelInfoPageResponse = (DeviceThingModelInfoDtoPagedResultDto); +export type PostThingModelInfoPageAsyncResponse = (DeviceThingModelInfoDtoPagedResultDto); -export type PostThingModelInfoPageError = unknown; +export type PostThingModelInfoPageAsyncError = unknown; + +export type PostThingModelInfoStandardThingModelPageAsyncResponse = (Array); + +export type PostThingModelInfoStandardThingModelPageAsyncError = unknown; export type PostFeaturesListData = { body?: GetFeatureListResultInput; diff --git a/apps/web-antd/src/locales/langs/en-US/abp.json b/apps/web-antd/src/locales/langs/en-US/abp.json index fd0bd5a..b54d0f1 100644 --- a/apps/web-antd/src/locales/langs/en-US/abp.json +++ b/apps/web-antd/src/locales/langs/en-US/abp.json @@ -218,6 +218,14 @@ "deviceInfoManage": "DeviceInfoManage", "thingModelInfoManage": "ThingModelInfoManage" }, + "thingModelInfos": { + "FiledType": "FiledType", + "IoTPlatformRawFieldName": "IoTPlatformRawFieldName", + "StandardFieldName": "StandardFieldName", + "StandardFieldDisplayName": "StandardFieldDisplayName", + "IsValueNeedConvert": "IsValueNeedConvert", + "StandardFieldValueType": "StandardFieldValueType" + }, "IoTDBBase": { "IoTDataType": "IoTDataType", "DataBaseName": "DataBaseName", diff --git a/apps/web-antd/src/locales/langs/en-US/common.json b/apps/web-antd/src/locales/langs/en-US/common.json index 0150e08..0eb7d0c 100644 --- a/apps/web-antd/src/locales/langs/en-US/common.json +++ b/apps/web-antd/src/locales/langs/en-US/common.json @@ -66,5 +66,6 @@ "AppSecret": "AppSecret", "operationSuccess": "OperationSuccess", "operationFailed": "OperationFailed", + "required":"Required", "loading": "Loading" } diff --git a/apps/web-antd/src/locales/langs/zh-CN/abp.json b/apps/web-antd/src/locales/langs/zh-CN/abp.json index 51b360a..68d67f0 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/abp.json +++ b/apps/web-antd/src/locales/langs/zh-CN/abp.json @@ -211,6 +211,14 @@ "deviceInfoManage": "设备管理", "thingModelInfoManage": "物模型管理" }, + "thingModelInfos": { + "FiledType": "物模型类型", + "IoTPlatformRawFieldName": "平台物模型编码", + "StandardFieldName": "标准物模型编码", + "StandardFieldDisplayName": "标准物模型名称", + "IsValueNeedConvert": "是否需要值类型转换", + "StandardFieldValueType": "标准物模型值类型" + }, "IoTDBBase": { "IoTDataType": "数据类型", "DataBaseName": "所属数据库", diff --git a/apps/web-antd/src/locales/langs/zh-CN/common.json b/apps/web-antd/src/locales/langs/zh-CN/common.json index eab53b3..8a107cd 100644 --- a/apps/web-antd/src/locales/langs/zh-CN/common.json +++ b/apps/web-antd/src/locales/langs/zh-CN/common.json @@ -67,5 +67,6 @@ "AppSecret": "应用Secret", "operationSuccess": "操作成功", "operationFailed": "操作失败", + "required": "必填", "loading": "正在处理" } diff --git a/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue b/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue index c971b18..45994d0 100644 --- a/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue +++ b/apps/web-antd/src/views/ctwingmanagement/privateProduct/index.vue @@ -23,6 +23,8 @@ import { import { TableAction } from '#/components/table-action'; import { $t } from '#/locales'; +import ThingModelInfoModal from '#/views/devicemanagement/thingmodelinfo/index.vue'; + import { addProductFormSchema, editProductFormSchemaEdit, @@ -76,6 +78,10 @@ const editRow: Record = ref({}); // 声明文件变量,用于存储选择的文件 let selectedFile: File | null = null; +// 物模型模态框相关状态 +const thingModelModalVisible = ref(false); +const currentProductInfo = ref({}); + // 设置文件选择回调 setFileSelectedCallback((file) => { selectedFile = file; @@ -305,6 +311,25 @@ async function onStatusChange(record: any) { Message.error(record.isEnabled ? '禁用失败' : '启用失败'); } } + +// 物模型管理函数 +function onThingModelManagement(record: any) { + console.log('物模型管理按钮被点击', record); + // 设置当前产品信息 + currentProductInfo.value = { + productId: record.ioTPlatformProductId, + productName: record.productName, + ioTPlatform: '1', // CTWing平台类型为1 + }; + // 打开物模型模态框 + thingModelModalVisible.value = true; +} + +// 关闭物模型模态框 +function closeThingModelModal() { + thingModelModalVisible.value = false; + currentProductInfo.value = {}; +} diff --git a/apps/web-antd/src/views/devicemanagement/thingmodelinfo/index.vue b/apps/web-antd/src/views/devicemanagement/thingmodelinfo/index.vue index e69de29..541d3fd 100644 --- a/apps/web-antd/src/views/devicemanagement/thingmodelinfo/index.vue +++ b/apps/web-antd/src/views/devicemanagement/thingmodelinfo/index.vue @@ -0,0 +1,351 @@ + + + diff --git a/apps/web-antd/src/views/devicemanagement/thingmodelinfo/schema.ts b/apps/web-antd/src/views/devicemanagement/thingmodelinfo/schema.ts index e69de29..806edae 100644 --- a/apps/web-antd/src/views/devicemanagement/thingmodelinfo/schema.ts +++ b/apps/web-antd/src/views/devicemanagement/thingmodelinfo/schema.ts @@ -0,0 +1,232 @@ +import { computed } from 'vue'; + +import { z } from '@vben/common-ui'; + +import dayjs from 'dayjs'; + +import { $t } from '#/locales'; + +export const querySchema = computed(() => [ + { + component: 'Input', + fieldName: 'SearchKeyWords', + label: $t('common.keyword'), + }, +]); + +export const tableSchema = computed(() => [ + { + field: 'filedType', + title: '物模型类型', + minWidth: 120, + showOverflow: 'tooltip', + formatter: ({ cellValue }: { cellValue: any }) => { + const typeMap: Record = { + 'Property': '属性', + 'Service': '服务', + 'Event': '事件', + }; + return typeMap[cellValue] || cellValue; + }, + }, + { + field: 'ioTPlatformRawFieldName', + title: '平台原始字段名', + minWidth: 150, + showOverflow: 'tooltip', + }, + { + field: 'standardFieldName', + title: '标准字段名', + minWidth: 150, + showOverflow: 'tooltip', + }, + { + field: 'standardFieldDisplayName', + title: '标准字段显示名称', + minWidth: 150, + showOverflow: 'tooltip', + }, + { + field: 'standardFieldValueType', + title: '标准字段值类型', + minWidth: 120, + showOverflow: 'tooltip', + formatter: ({ cellValue }: { cellValue: any }) => { + const typeMap: Record = { + 'String': '字符串', + 'Int32': '整数', + 'Int64': '长整数', + 'Float': '浮点数', + 'Double': '双精度', + 'Boolean': '布尔值', + 'DateTime': '日期时间', + 'Object': 'JSON对象', + 'Array': '数组', + }; + return typeMap[cellValue] || cellValue; + }, + }, + { + field: 'isValueNeedConvert', + title: '需要值类型转换', + minWidth: 120, + slots: { default: 'isValueNeedConvert' }, + }, + { + field: 'creationTime', + title: $t('common.creationTime'), + minWidth: 180, + formatter: ({ cellValue }: { cellValue: any }) => { + return cellValue ? dayjs(cellValue).format('YYYY-MM-DD HH:mm:ss') : '-'; + }, + }, + { + field: 'action', + title: $t('common.action'), + width: 200, + fixed: 'right', + slots: { default: 'action' }, + }, +]); + +// 添加物模型表单schema +export const addThingModelFormSchema = computed(() => [ + { + component: 'Select', + fieldName: 'filedType', + label: '物模型类型', + rules: z.string().min(1, $t('common.required')), + componentProps: { + options: [ + { label: '属性', value: 'Property' }, + { label: '服务', value: 'Service' }, + { label: '事件', value: 'Event' }, + ], + placeholder: '请选择物模型类型', + }, + }, + { + component: 'Input', + fieldName: 'ioTPlatformRawFieldName', + label: '平台原始字段名', + rules: z.string().min(1, $t('common.required')), + componentProps: { + placeholder: '请输入物联网平台中的原始字段名', + }, + }, + { + component: 'Input', + fieldName: 'standardFieldName', + label: '标准字段名', + rules: z.string().min(1, $t('common.required')), + componentProps: { + placeholder: '请输入管理后台产品标准的字段名', + }, + }, + { + component: 'Select', + fieldName: 'standardFieldValueType', + label: '标准字段值类型', + rules: z.string().min(1, $t('common.required')), + componentProps: { + options: [ + { label: '字符串', value: 'String' }, + { label: '整数', value: 'Int32' }, + { label: '长整数', value: 'Int64' }, + { label: '浮点数', value: 'Float' }, + { label: '双精度', value: 'Double' }, + { label: '布尔值', value: 'Boolean' }, + { label: '日期时间', value: 'DateTime' }, + { label: 'JSON对象', value: 'Object' }, + { label: '数组', value: 'Array' }, + ], + placeholder: '请选择标准字段值类型', + }, + }, + { + component: 'Input', + fieldName: 'standardFieldDisplayName', + label: '标准字段显示名称', + rules: z.string().min(1, $t('common.required')), + componentProps: { + placeholder: '请输入标准字段的显示名称', + }, + }, + { + component: 'Switch', + fieldName: 'isValueNeedConvert', + label: '是否需要值类型转换', + defaultValue: false, + }, +]); + +// 编辑物模型表单schema +export const editThingModelFormSchema = computed(() => [ + { + component: 'Select', + fieldName: 'filedType', + label: '物模型类型', + rules: z.string().min(1, $t('common.required')), + componentProps: { + options: [ + { label: '属性', value: 'Property' }, + { label: '服务', value: 'Service' }, + { label: '事件', value: 'Event' }, + ], + placeholder: '请选择物模型类型', + }, + }, + { + component: 'Input', + fieldName: 'ioTPlatformRawFieldName', + label: '平台原始字段名', + rules: z.string().min(1, $t('common.required')), + componentProps: { + placeholder: '请输入物联网平台中的原始字段名', + }, + }, + { + component: 'Input', + fieldName: 'standardFieldName', + label: '标准字段名', + rules: z.string().min(1, $t('common.required')), + componentProps: { + placeholder: '请输入管理后台产品标准的字段名', + }, + }, + { + component: 'Select', + fieldName: 'standardFieldValueType', + label: '标准字段值类型', + rules: z.string().min(1, $t('common.required')), + componentProps: { + options: [ + { label: '字符串', value: 'String' }, + { label: '整数', value: 'Int32' }, + { label: '长整数', value: 'Int64' }, + { label: '浮点数', value: 'Float' }, + { label: '双精度', value: 'Double' }, + { label: '布尔值', value: 'Boolean' }, + { label: '日期时间', value: 'DateTime' }, + { label: 'JSON对象', value: 'Object' }, + { label: '数组', value: 'Array' }, + ], + placeholder: '请选择标准字段值类型', + }, + }, + { + component: 'Input', + fieldName: 'standardFieldDisplayName', + label: '标准字段显示名称', + rules: z.string().min(1, $t('common.required')), + componentProps: { + placeholder: '请输入标准字段的显示名称', + }, + }, + { + component: 'Switch', + fieldName: 'isValueNeedConvert', + label: '是否需要值类型转换', + }, +]); diff --git a/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue b/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue index aca6945..060fc39 100644 --- a/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue +++ b/apps/web-antd/src/views/onenetmanagement/privateProduct/index.vue @@ -23,6 +23,8 @@ import { import { TableAction } from '#/components/table-action'; import { $t } from '#/locales'; +import ThingModelInfoModal from '#/views/devicemanagement/thingmodelinfo/index.vue'; + import { addProductFormSchema, editProductFormSchemaEdit, @@ -76,6 +78,10 @@ const editRow: Record = ref({}); // 声明文件变量,用于存储选择的文件 let selectedFile: File | null = null; +// 物模型模态框相关状态 +const thingModelModalVisible = ref(false); +const currentProductInfo = ref({}); + // 设置文件选择回调 setFileSelectedCallback((file) => { selectedFile = file; @@ -324,15 +330,22 @@ function onDeviceManagement(record: any) { // 物模型管理函数 function onThingModelManagement(record: any) { console.log('物模型管理按钮被点击', record); - // 跳转到物模型管理页面,传递产品ID作为参数 - router.push({ - path: '/devicemanagement/thingmodelinfo', - query: { - ioTPlatform: '2', // OneNET平台类型为2 - ioTPlatformDeviceOpenInfo: record.ioTPlatformProductId, // 平台产品ID - productName: record.productName, - }, - }); + // 设置当前产品信息 + currentProductInfo.value = { + productId: record.ioTPlatformProductId, + productName: record.productName, + ioTPlatform: '2', // OneNET平台类型为2 + }; + console.log('设置产品信息:', currentProductInfo.value); + // 打开物模型模态框 + thingModelModalVisible.value = true; + console.log('模态框状态设置为:', thingModelModalVisible.value); +} + +// 关闭物模型模态框 +function closeThingModelModal() { + thingModelModalVisible.value = false; + currentProductInfo.value = {}; } @@ -415,5 +428,14 @@ function onThingModelManagement(record: any) { + + +