完善设备添加，兼容EMQX类型

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

@@ -2387,7 +2387,7 @@ export const DeviceLoginModelSchema = {
         }
     },
     additionalProperties: false,
-    description: '设备登录'
+    description: '设备登录（EMQX HTTP 认证回调请求体）'
 } as const;
 
 export const DeviceLoginResultSchema = {
@@ -2395,7 +2395,7 @@ export const DeviceLoginResultSchema = {
     properties: {
         result: {
             type: 'string',
-            description: '鉴权结果 JiShe.ServicePro.Core.DeviceEMQXLoginResultConsts',
+            description: '鉴权结果 JiShe.ServicePro.EMQXProvider.DeviceEMQXLoginResultConsts',
             nullable: true
         },
         is_superuser: {
@@ -2405,15 +2405,14 @@ export const DeviceLoginResultSchema = {
         client_attrs: {
             type: 'object',
             additionalProperties: {
-                type: 'string',
+                type: 'string'
-                nullable: true
             },
             description: '设备属性（键值均为字符串）',
             nullable: true
         }
     },
     additionalProperties: false,
-    description: '设备登录结果'
+    description: '设备登录结果（EMQX HTTP 认证回调响应体）'
 } as const;
 
 export const DeviceManagementInfoDtoSchema = {
@@ -2671,6 +2670,62 @@ export const DeviceManagementInfoDtoSchema = {
     additionalProperties: false
 } as const;
 
+export const DeviceManagementInfoDtoHttpDataResultSchema = {
+    type: 'object',
+    properties: {
+        code: {
+            '$ref': '#/components/schemas/ResponeResultEnum'
+        },
+        msg: {
+            type: 'string',
+            description: '详细描述',
+            nullable: true
+        },
+        success: {
+            type: 'boolean',
+            description: `是否获取到数据或者逻辑处理成功
+服务内部判断状态采用此属性`
+        },
+        timestamp: {
+            type: 'integer',
+            description: '时间戳(毫秒)',
+            format: 'int64',
+            readOnly: true
+        },
+        nonce: {
+            type: 'string',
+            description: '用于计算签名字符的随机串',
+            nullable: true
+        },
+        signature: {
+            type: 'string',
+            description: '加密签名，用以校验推送客户端身份合法性，校验方法见实例验证',
+            nullable: true
+        },
+        locationCode: {
+            type: 'integer',
+            description: `位置编码，主要用于接口请求逻辑定位
+使用时必须保证每个请求中不重复出现`,
+            format: 'int32'
+        },
+        extras: {
+            type: 'string',
+            description: '扩展信息',
+            nullable: true
+        },
+        data: {
+            '$ref': '#/components/schemas/DeviceManagementInfoDto'
+        },
+        total: {
+            type: 'integer',
+            description: '总数',
+            format: 'int64'
+        }
+    },
+    additionalProperties: false,
+    description: 'HTTP 请求返回结果'
+} as const;
+
 export const DeviceManagementInfoDtoPagedResultDtoSchema = {
     type: 'object',
     properties: {
@@ -2689,6 +2744,62 @@ export const DeviceManagementInfoDtoPagedResultDtoSchema = {
     additionalProperties: false
 } as const;
 
+export const DeviceManagementInfoDtoPagedResultDtoHttpDataResultSchema = {
+    type: 'object',
+    properties: {
+        code: {
+            '$ref': '#/components/schemas/ResponeResultEnum'
+        },
+        msg: {
+            type: 'string',
+            description: '详细描述',
+            nullable: true
+        },
+        success: {
+            type: 'boolean',
+            description: `是否获取到数据或者逻辑处理成功
+服务内部判断状态采用此属性`
+        },
+        timestamp: {
+            type: 'integer',
+            description: '时间戳(毫秒)',
+            format: 'int64',
+            readOnly: true
+        },
+        nonce: {
+            type: 'string',
+            description: '用于计算签名字符的随机串',
+            nullable: true
+        },
+        signature: {
+            type: 'string',
+            description: '加密签名，用以校验推送客户端身份合法性，校验方法见实例验证',
+            nullable: true
+        },
+        locationCode: {
+            type: 'integer',
+            description: `位置编码，主要用于接口请求逻辑定位
+使用时必须保证每个请求中不重复出现`,
+            format: 'int32'
+        },
+        extras: {
+            type: 'string',
+            description: '扩展信息',
+            nullable: true
+        },
+        data: {
+            '$ref': '#/components/schemas/DeviceManagementInfoDtoPagedResultDto'
+        },
+        total: {
+            type: 'integer',
+            description: '总数',
+            format: 'int64'
+        }
+    },
+    additionalProperties: false,
+    description: 'HTTP 请求返回结果'
+} as const;
+
 export const DeviceMasterSwitchInputSchema = {
     required: ['id', 'ioTPlatformProductId'],
     type: 'object',
@@ -6884,7 +6995,7 @@ export const IoTPlatformThingModelUpdateInputSchema = {
 } as const;
 
 export const IoTPlatformTypeEnumSchema = {
-    enum: ['CTWing', 'OneNET'],
+    enum: ['CTWing', 'OneNET', 'EMQX'],
     type: 'string',
     description: '物联网平台类型枚举'
 } as const;
@@ -8339,6 +8450,20 @@ export const PageDeviceInputSchema = {
             type: 'string',
             description: '搜索关键字',
             nullable: true
+        },
+        deviceSourceType: {
+            '$ref': '#/components/schemas/DeviceSourceTypeEnum'
+        },
+        lifeInfo: {
+            '$ref': '#/components/schemas/DeviceLifeTypeEnum'
+        },
+        addressList: {
+            type: 'array',
+            items: {
+                type: 'string'
+            },
+            description: '设备地址列表（批量查询）',
+            nullable: true
         }
     },
     additionalProperties: false

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

@@ -1322,7 +1322,7 @@ export type DeviceFirmwareInfoDtoPagedResultDto = {
 export type DeviceLifeTypeEnum = 'Unspecified' | 'Production' | 'FactoryTest' | 'AgingSource' | 'FactoryDelivery' | 'Running' | 'Maintenance' | 'ReturnToFactory' | 'Deactivated';
 
 /**
- * 设备登录
+ * 设备登录（EMQX HTTP 认证回调请求体）
  */
 export type DeviceLoginModel = {
     /**
@@ -1344,11 +1344,11 @@ export type DeviceLoginModel = {
 };
 
 /**
- * 设备登录结果
+ * 设备登录结果（EMQX HTTP 认证回调响应体）
  */
 export type DeviceLoginResult = {
     /**
-     * 鉴权结果 JiShe.ServicePro.Core.DeviceEMQXLoginResultConsts
+     * 鉴权结果 JiShe.ServicePro.EMQXProvider.DeviceEMQXLoginResultConsts
      */
     result?: (string) | null;
     /**
@@ -1359,7 +1359,7 @@ export type DeviceLoginResult = {
      * 设备属性（键值均为字符串）
      */
     client_attrs?: {
-        [key: string]: ((string) | null);
+        [key: string]: (string);
     } | null;
 };
 
@@ -1521,11 +1521,95 @@ export type DeviceManagementInfoDto = {
     finalMainStation?: (string) | null;
 };
 
+/**
+ * HTTP 请求返回结果
+ */
+export type DeviceManagementInfoDtoHttpDataResult = {
+    code?: ResponeResultEnum;
+    /**
+     * 详细描述
+     */
+    msg?: (string) | null;
+    /**
+     * 是否获取到数据或者逻辑处理成功
+     * 服务内部判断状态采用此属性
+     */
+    success?: boolean;
+    /**
+     * 时间戳(毫秒)
+     */
+    readonly timestamp?: number;
+    /**
+     * 用于计算签名字符的随机串
+     */
+    nonce?: (string) | null;
+    /**
+     * 加密签名，用以校验推送客户端身份合法性，校验方法见实例验证
+     */
+    signature?: (string) | null;
+    /**
+     * 位置编码，主要用于接口请求逻辑定位
+     * 使用时必须保证每个请求中不重复出现
+     */
+    locationCode?: number;
+    /**
+     * 扩展信息
+     */
+    extras?: (string) | null;
+    data?: DeviceManagementInfoDto;
+    /**
+     * 总数
+     */
+    total?: number;
+};
+
 export type DeviceManagementInfoDtoPagedResultDto = {
     items?: Array<DeviceManagementInfoDto> | null;
     totalCount?: number;
 };
 
+/**
+ * HTTP 请求返回结果
+ */
+export type DeviceManagementInfoDtoPagedResultDtoHttpDataResult = {
+    code?: ResponeResultEnum;
+    /**
+     * 详细描述
+     */
+    msg?: (string) | null;
+    /**
+     * 是否获取到数据或者逻辑处理成功
+     * 服务内部判断状态采用此属性
+     */
+    success?: boolean;
+    /**
+     * 时间戳(毫秒)
+     */
+    readonly timestamp?: number;
+    /**
+     * 用于计算签名字符的随机串
+     */
+    nonce?: (string) | null;
+    /**
+     * 加密签名，用以校验推送客户端身份合法性，校验方法见实例验证
+     */
+    signature?: (string) | null;
+    /**
+     * 位置编码，主要用于接口请求逻辑定位
+     * 使用时必须保证每个请求中不重复出现
+     */
+    locationCode?: number;
+    /**
+     * 扩展信息
+     */
+    extras?: (string) | null;
+    data?: DeviceManagementInfoDtoPagedResultDto;
+    /**
+     * 总数
+     */
+    total?: number;
+};
+
 /**
  * 设备切换主站入参
  */
@@ -3687,7 +3771,7 @@ export type IoTPlatformThingModelUpdateInput = {
 /**
  * 物联网平台类型枚举
  */
-export type IoTPlatformTypeEnum = 'CTWing' | 'OneNET';
+export type IoTPlatformTypeEnum = 'CTWing' | 'OneNET' | 'EMQX';
 
 export type IStringValueType = {
     readonly name?: (string) | null;
@@ -4626,6 +4710,12 @@ export type PageDeviceInput = {
      * 搜索关键字
      */
     searchKeyword?: (string) | null;
+    deviceSourceType?: DeviceSourceTypeEnum;
+    lifeInfo?: DeviceLifeTypeEnum;
+    /**
+     * 设备地址列表（批量查询）
+     */
+    addressList?: Array<(string)> | null;
 };
 
 /**
@@ -8785,3 +8875,29 @@ export type PostAggregationWorkshopGetProductListAsyncData = {
 export type PostAggregationWorkshopGetProductListAsyncResponse = (HttpDataResult);
 
 export type PostAggregationWorkshopGetProductListAsyncError = unknown;
+
+export type PostAggregationWorkshopReceiveWorkshopQueryDevicePageAsyncData = {
+    query?: {
+        /**
+         * 开放接口请求入参，所有外部接口请求参数
+         */
+        input?: OpenApiRequest;
+    };
+};
+
+export type PostAggregationWorkshopReceiveWorkshopQueryDevicePageAsyncResponse = (DeviceManagementInfoDtoPagedResultDtoHttpDataResult);
+
+export type PostAggregationWorkshopReceiveWorkshopQueryDevicePageAsyncError = unknown;
+
+export type PostAggregationWorkshopReceiveWorkshopUpdateDeviceLifeInfoAsyncData = {
+    query?: {
+        /**
+         * 开放接口请求入参，所有外部接口请求参数
+         */
+        input?: OpenApiRequest;
+    };
+};
+
+export type PostAggregationWorkshopReceiveWorkshopUpdateDeviceLifeInfoAsyncResponse = (DeviceManagementInfoDtoHttpDataResult);
+
+export type PostAggregationWorkshopReceiveWorkshopUpdateDeviceLifeInfoAsyncError = unknown;

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

@@ -2579,8 +2579,8 @@ async function submitBatchAdd() {
   }
 
   // 验证行数限制
-  if (addressList.length > 100) {
+  if (addressList.length > 1000) {
-    Message.error('设备地址不能超过100行');
+    Message.error('设备地址不能超过1000行');
     return;
   }
 
@@ -2645,7 +2645,7 @@ const addressLines = ref(0);
 
 // 检查行数是否超过限制
 const isOverLineLimit = computed(() => {
-  return addressLines.value > 100;
+  return addressLines.value > 1000;
 });
 
 // 监听表单值变化，实时更新行数
@@ -3279,7 +3279,7 @@ const toolbarActions = computed(() => [
             <span v-if="addressLines > 0">
               共 {{ addressLines }} 行设备地址
               <span v-if="isOverLineLimit" style="color: #ff4d4f">
-                (超过100行限制)
+                (超过1000行限制)
               </span>
             </span>
             <span v-else> 当前行数: {{ addressLines }} (调试信息) </span>

apps/web-antd/src/views/devicemanagement/deviceinfo/schema.ts

@@ -15,6 +15,17 @@ import {
 } from '#/api-client';
 import { $t } from '#/locales';
 
+// EMQX 平台使用 OneNET 的账号和产品体系，查询账号/产品时需映射为 OneNET 平台类型
+const ONENET_PLATFORM_TYPE = 2;
+const EMQX_PLATFORM_TYPE = 3;
+
+function getAccountQueryPlatformType(platform: any): number {
+  const num =
+    typeof platform === 'string' ? Number.parseInt(platform) : platform;
+  if (num === EMQX_PLATFORM_TYPE) return ONENET_PLATFORM_TYPE;
+  return num;
+}
+
 export const querySchema = computed(() => [
   {
     component: 'Input',
@@ -78,10 +89,7 @@ export const querySchema = computed(() => [
         params: platform
           ? {
               body: {
-                ioTPlatformType:
+                ioTPlatformType: getAccountQueryPlatformType(platform),
-                  typeof platform === 'string'
-                    ? Number.parseInt(platform)
-                    : platform,
               },
             }
           : {},
@@ -375,10 +383,7 @@ export const addDeviceFormSchema: any = computed(() => [
         params: platform
           ? {
               body: {
-                ioTPlatformType:
+                ioTPlatformType: getAccountQueryPlatformType(platform),
-                  typeof platform === 'string'
-                    ? Number.parseInt(platform)
-                    : platform,
               },
             }
           : {},
@@ -441,10 +446,7 @@ export const addDeviceFormSchema: any = computed(() => [
           platform && accountId
             ? {
                 body: {
-                  ioTPlatformType:
+                  ioTPlatformType: getAccountQueryPlatformType(platform),
-                    typeof platform === 'string'
-                      ? Number.parseInt(platform)
-                      : platform,
                   ioTPlatformAccount: accountId,
                 },
               }
@@ -633,10 +635,7 @@ export const editDeviceFormSchemaEdit: any = computed(() => [
         params: platform
           ? {
               body: {
-                ioTPlatformType:
+                ioTPlatformType: getAccountQueryPlatformType(platform),
-                  typeof platform === 'string'
-                    ? Number.parseInt(platform)
-                    : platform,
               },
             }
           : {},
@@ -699,10 +698,7 @@ export const editDeviceFormSchemaEdit: any = computed(() => [
           platform && accountId
             ? {
                 body: {
-                  ioTPlatformType:
+                  ioTPlatformType: getAccountQueryPlatformType(platform),
-                    typeof platform === 'string'
-                      ? Number.parseInt(platform)
-                      : platform,
                   ioTPlatformAccount: accountId,
                 },
               }
@@ -976,10 +972,7 @@ export const batchAddDeviceFormSchema: any = computed(() => [
         params: platform
           ? {
               body: {
-                ioTPlatformType:
+                ioTPlatformType: getAccountQueryPlatformType(platform),
-                  typeof platform === 'string'
-                    ? Number.parseInt(platform)
-                    : platform,
               },
             }
           : {},
@@ -1042,10 +1035,7 @@ export const batchAddDeviceFormSchema: any = computed(() => [
           platform && accountId
             ? {
                 body: {
-                  ioTPlatformType:
+                  ioTPlatformType: getAccountQueryPlatformType(platform),
-                    typeof platform === 'string'
-                      ? Number.parseInt(platform)
-                      : platform,
                   ioTPlatformAccount: accountId,
                 },
               }
@@ -1161,10 +1151,7 @@ export const batchUpgradeDeviceFormSchema: any = computed(() => [
         params: platform
           ? {
               body: {
-                ioTPlatformType:
+                ioTPlatformType: getAccountQueryPlatformType(platform),
-                  typeof platform === 'string'
-                    ? Number.parseInt(platform)
-                    : platform,
               },
             }
           : {},
@@ -1226,10 +1213,7 @@ export const batchUpgradeDeviceFormSchema: any = computed(() => [
           platform && accountId
             ? {
                 body: {
-                  ioTPlatformType:
+                  ioTPlatformType: getAccountQueryPlatformType(platform),
-                    typeof platform === 'string'
-                      ? Number.parseInt(platform)
-                      : platform,
                   ioTPlatformAccount: accountId,
                 },
               }