@cpzxrobot/sdk 1.3.80 → 1.3.82

package/device_gateway.ts

@@ -79,14 +79,14 @@ export class DeviceGateway extends Object {
   public normalFilter: NormalGateway;
   context: Cpzxrobot;
   public categories = [
-    { id: 0, name: '网关',order: 4 }, //排序时网关优先级不高
-    { id: 1, name: '传感器',order: 1 },
-    { id: 2, name: '执行器',order: 2 },
-    { id: 3, name: 'AI设备',order: 3 },
-    { id: 4, name: '业务数据',order: 5 },
-    { id: 5, name: '设备参数',order: 6 },
-    { id: 8, name: '生产设备',order: 7 },
-    { id: 9, name: '设备部件',order: 8 },
+    { id: 0, name: '网关', order: 4 }, //排序时网关优先级不高
+    { id: 1, name: '传感器', order: 1 },
+    { id: 2, name: '执行器', order: 2 },
+    { id: 3, name: 'AI设备', order: 3 },
+    { id: 4, name: '业务数据', order: 5 },
+    { id: 5, name: '设备参数', order: 6 },
+    { id: 8, name: '生产设备', order: 7 },
+    { id: 9, name: '设备部件', order: 8 },
   ];
 
   get v2() {
@@ -1093,10 +1093,10 @@ export class DeviceGateway extends Object {
    * @returns Promise 包含报警分类统计数据
    */
   async getAlarmStatisticsByType(
-    factoryId: number | undefined = undefined,
-    topN?: number,
     fromDate?: string,
-    toDate?: string
+    toDate?: string,
+    factoryId?: number,
+    topN?: number
   ): Promise<AlarmStatisticsByTypeResponse> {
     const axios = await this.context.ready;
     var _factoryId = factoryId || 0;
@@ -1112,15 +1112,6 @@ export class DeviceGateway extends Object {
     if (topN !== undefined && topN <= 0) {
       throw new Error('topN参数必须大于0');
     }
-    if (fromDate && !this.isValidDateTime(fromDate)) {
-      throw new Error('fromDate参数格式错误，应为YYYY-MM-DD HH:mm:ss格式');
-    }
-    if (toDate && !this.isValidDateTime(toDate)) {
-      throw new Error('toDate参数格式错误，应为YYYY-MM-DD HH:mm:ss格式');
-    }
-    if (fromDate && toDate && fromDate > toDate) {
-      throw new Error('fromDate不能晚于toDate');
-    }
 
     // 构建请求参数
     const params: any = { factoryId: _factoryId };
@@ -1144,19 +1135,5 @@ export class DeviceGateway extends Object {
     });
   }
 
-  /**
-   * 验证日期时间格式（YYYY-MM-DD HH:mm:ss）
-   * @param dateTime 日期时间字符串
-   * @returns 是否有效
-   */
-  private isValidDateTime(dateTime: string): boolean {
-    const regex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
-    if (!regex.test(dateTime)) {
-      return false;
-    }
-    
-    const date = new Date(dateTime);
-    return !isNaN(date.getTime());
-  }
 
 }

package/dist/device_gateway.js

@@ -877,8 +877,8 @@ class DeviceGateway extends Object {
      * @param toDate 查询终止时间（格式：YYYY-MM-DD HH:mm:ss，不传则默认对所有的报警信息进行归类统计）
      * @returns Promise 包含报警分类统计数据
      */
-    getAlarmStatisticsByType() {
-        return __awaiter(this, arguments, void 0, function* (factoryId = undefined, topN, fromDate, toDate) {
+    getAlarmStatisticsByType(fromDate, toDate, factoryId, topN) {
+        return __awaiter(this, void 0, void 0, function* () {
             const axios = yield this.context.ready;
             var _factoryId = factoryId || 0;
             if (!factoryId) {
@@ -892,15 +892,6 @@ class DeviceGateway extends Object {
             if (topN !== undefined && topN <= 0) {
                 throw new Error('topN参数必须大于0');
             }
-            if (fromDate && !this.isValidDateTime(fromDate)) {
-                throw new Error('fromDate参数格式错误，应为YYYY-MM-DD HH:mm:ss格式');
-            }
-            if (toDate && !this.isValidDateTime(toDate)) {
-                throw new Error('toDate参数格式错误，应为YYYY-MM-DD HH:mm:ss格式');
-            }
-            if (fromDate && toDate && fromDate > toDate) {
-                throw new Error('fromDate不能晚于toDate');
-            }
             // 构建请求参数
             const params = { factoryId: _factoryId };
             if (topN !== undefined) {
@@ -922,18 +913,5 @@ class DeviceGateway extends Object {
             });
         });
     }
-    /**
-     * 验证日期时间格式（YYYY-MM-DD HH:mm:ss）
-     * @param dateTime 日期时间字符串
-     * @returns 是否有效
-     */
-    isValidDateTime(dateTime) {
-        const regex = /^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
-        if (!regex.test(dateTime)) {
-            return false;
-        }
-        const date = new Date(dateTime);
-        return !isNaN(date.getTime());
-    }
 }
 exports.DeviceGateway = DeviceGateway;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.3.80",
+  "version": "1.3.82",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {