更新

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

@@ -607,7 +607,7 @@ export const CTWingAccountInfoDtoPagedResultDtoSchema = {
 } as const;
 
 export const CTWingAccountInsertInputSchema = {
-    required: ['accountId', 'appId', 'appKey', 'appSecret', 'communicationAddress', 'platformTenantId'],
+    required: ['accountId', 'appId', 'appKey', 'appSecret', 'communicationAddress', 'phoneNumber', 'platformTenantId'],
     type: 'object',
     properties: {
         accountName: {
@@ -646,9 +646,9 @@ export const CTWingAccountInsertInputSchema = {
             description: '通讯服务地址'
         },
         phoneNumber: {
+            minLength: 1,
             type: 'string',
-            description: '手机号码',
-            nullable: true
+            description: '手机号码'
         }
     },
     additionalProperties: false,
@@ -698,7 +698,7 @@ export const CTWingAccountListInputSchema = {
 } as const;
 
 export const CTWingAccountModifyInputSchema = {
-    required: ['accountId', 'appId', 'appKey', 'appSecret', 'communicationAddress', 'platformTenantId'],
+    required: ['accountId', 'appId', 'appKey', 'appSecret', 'communicationAddress', 'phoneNumber', 'platformTenantId'],
     type: 'object',
     properties: {
         accountName: {
@@ -737,9 +737,9 @@ export const CTWingAccountModifyInputSchema = {
             description: '通讯服务地址'
         },
         phoneNumber: {
+            minLength: 1,
             type: 'string',
-            description: '手机号码',
-            nullable: true
+            description: '手机号码'
         },
         id: {
             type: 'string',
@@ -985,6 +985,11 @@ export const CTWingPrivateProductInfoInsertInputSchema = {
             type: 'string',
             description: '设备物模型文件名称',
             nullable: true
+        },
+        tupDeviceModel: {
+            type: 'string',
+            description: '必填，设备型号',
+            nullable: true
         }
     },
     additionalProperties: false,
@@ -1065,6 +1070,11 @@ export const CTWingPrivateProductInfoModifyInputSchema = {
             description: '设备物模型文件名称',
             nullable: true
         },
+        tupDeviceModel: {
+            type: 'string',
+            description: '必填，设备型号',
+            nullable: true
+        },
         id: {
             type: 'string',
             description: '数据ID',
@@ -5330,32 +5340,14 @@ export const PageDeviceInputSchema = {
 </example>`,
             nullable: true
         },
-        meterName: {
+        deviceAddress: {
             type: 'string',
-            description: '表计名称',
-            nullable: true
-        },
-        meterAddress: {
-            type: 'string',
-            description: '表通信地址',
+            description: '设备地址',
             nullable: true
         },
         ioTPlatform: {
             '$ref': '#/components/schemas/IoTPlatformTypeEnum'
         },
-        protocol: {
-            '$ref': '#/components/schemas/ProtocolTypeEnum'
-        },
-        focusAddress: {
-            type: 'string',
-            description: '集中器地址',
-            nullable: true
-        },
-        selfDevelop: {
-            type: 'boolean',
-            description: '自研',
-            nullable: true
-        },
         searchKeyword: {
             type: 'string',
             description: '搜索关键字',
@@ -7429,13 +7421,6 @@ export const PropertyApiDescriptionModelSchema = {
     additionalProperties: false
 } as const;
 
-export const ProtocolTypeEnumSchema = {
-    enum: [0, 1, 2, 30, 31, 32, 33, 34],
-    type: 'integer',
-    format: 'int32',
-    '说明：': '无(未知)=0,DL/T 645—1997=1,交流采样装置通信协议(电表)=2,DL/T 645—2007(默认)=30,载波通信=31,CJ/T 188—2018协议(水表)=32,CJ/T 188—2004协议=33,MODBUS-RTU=34'
-} as const;
-
 export const QueryCTWingAepReceiveMessageInputSchema = {
     type: 'object',
     properties: {
@@ -7589,10 +7574,16 @@ JiShe.ServicePro.Enums.DeviceTypeEnum`,
             description: '消息上报结果,主要是用于存储上报原始数据通过处理后的结果，并非报文解析结果',
             nullable: true
         },
-        receivedTime: {
-            type: 'string',
+        receivedTimestamps: {
+            type: 'integer',
             description: '消息上报时间，单位毫秒，不是当前系统中的纳秒',
-            format: 'date-time'
+            format: 'int64'
+        },
+        formattedReceivedTimestamps: {
+            type: 'string',
+            description: '时标格式化以后的本地时间',
+            format: 'date-time',
+            readOnly: true
         },
         imsi: {
             type: 'string',
@@ -7770,10 +7761,16 @@ JiShe.ServicePro.Enums.DeviceTypeEnum`,
             description: '消息上报结果,主要是用于存储上报原始数据通过处理后的结果，并非报文解析结果',
             nullable: true
         },
-        receivedTime: {
-            type: 'string',
+        receivedTimestamps: {
+            type: 'integer',
             description: '消息上报时间，单位毫秒，不是当前系统中的纳秒',
-            format: 'date-time'
+            format: 'int64'
+        },
+        formattedReceivedTimestamps: {
+            type: 'string',
+            description: '时标格式化以后的本地时间',
+            format: 'date-time',
+            readOnly: true
         },
         isEncrypted: {
             type: 'boolean',

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

@@ -478,7 +478,7 @@ export type CTWingAccountInsertInput = {
     /**
      * 手机号码
      */
-    phoneNumber?: (string) | null;
+    phoneNumber: string;
 };
 
 /**
@@ -549,7 +549,7 @@ export type CTWingAccountModifyInput = {
     /**
      * 手机号码
      */
-    phoneNumber?: (string) | null;
+    phoneNumber: string;
     /**
      * 数据ID
      */
@@ -704,6 +704,10 @@ export type CTWingPrivateProductInfoInsertInput = {
      * 设备物模型文件名称
      */
     deviceThingModelFileName?: (string) | null;
+    /**
+     * 必填，设备型号
+     */
+    tupDeviceModel?: (string) | null;
 };
 
 export type CTWingPrivateProductInfoListInput = {
@@ -764,6 +768,10 @@ export type CTWingPrivateProductInfoModifyInput = {
      * 设备物模型文件名称
      */
     deviceThingModelFileName?: (string) | null;
+    /**
+     * 必填，设备型号
+     */
+    tupDeviceModel?: (string) | null;
     /**
      * 数据ID
      */
@@ -2620,23 +2628,10 @@ export type PageDeviceInput = {
      */
     sorting?: (string) | null;
     /**
-     * 表计名称
+     * 设备地址
      */
-    meterName?: (string) | null;
-    /**
-     * 表通信地址
-     */
-    meterAddress?: (string) | null;
+    deviceAddress?: (string) | null;
     ioTPlatform?: IoTPlatformTypeEnum;
-    protocol?: ProtocolTypeEnum;
-    /**
-     * 集中器地址
-     */
-    focusAddress?: (string) | null;
-    /**
-     * 自研
-     */
-    selfDevelop?: (boolean) | null;
     /**
      * 搜索关键字
      */
@@ -3747,8 +3742,6 @@ export type PropertyApiDescriptionModel = {
     regex?: (string) | null;
 };
 
-export type ProtocolTypeEnum = 0 | 1 | 2 | 30 | 31 | 32 | 33 | 34;
-
 /**
  * 查询CTWing接收消息
  */
@@ -3872,7 +3865,11 @@ export type QueryCTWingAepReceiveMessageOutput = {
     /**
      * 消息上报时间，单位毫秒，不是当前系统中的纳秒
      */
-    receivedTime?: string;
+    receivedTimestamps?: number;
+    /**
+     * 时标格式化以后的本地时间
+     */
+    readonly formattedReceivedTimestamps?: string;
     /**
      * IMSI
      */
@@ -4003,7 +4000,11 @@ export type QueryOneNETReceiveMessageOutput = {
     /**
      * 消息上报时间，单位毫秒，不是当前系统中的纳秒
      */
-    receivedTime?: string;
+    receivedTimestamps?: number;
+    /**
+     * 时标格式化以后的本地时间
+     */
+    readonly formattedReceivedTimestamps?: string;
     /**
      * 是否加密
      */

apps/web-antd/src/views/iotdbdatamanagement/ctwingLog/schema.ts

@@ -144,7 +144,7 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     slots: {},
   },
   {
-    field: 'receivedTime',
+    field: 'formattedReceivedTimestamps',
     title: $t('abp.CTWingLog.ReceivedTime'),
     minWidth: 150,
     slots: {},

apps/web-antd/src/views/iotdbdatamanagement/onenetLog/schema.ts

@@ -120,7 +120,7 @@ export const tableSchema: any = computed((): VxeGridProps['columns'] => [
     slots: {},
   },
   {
-    field: 'receivedTime',
+    field: 'formattedReceivedTimestamps',
     title: $t('abp.OneNETLog.ReceivedTime'),
     minWidth: '150',
     slots: {},