@cpzxrobot/sdk 1.3.85 → 1.3.87

package/device_gateway.ts

@@ -1021,10 +1021,10 @@ export class DeviceGateway extends Object {
    * @returns Promise 包含设备报警统计列表分页数据
    */
   async getAlarmStatistics(
-    factoryId: number | undefined = undefined,
     resolveType: number = 2,
     pageNum: number = 1,
-    pageSize: number = 10
+    pageSize: number = 10,
+    factoryId: number | undefined = undefined
   ): Promise<DeviceAlarmStatisticsResponse> {
     const axios = await this.context.ready;
     var _factoryId = factoryId || 0;
@@ -1094,10 +1094,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;
@@ -1141,16 +1141,20 @@ export class DeviceGateway extends Object {
    * @param factoryId 工厂ID
    * @param fromDate 查询起始时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
    * @param toDate 查询终止时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
+   * @param duration 报警恢复时长阈值，按秒计（不传则默认对所有的报警信息进行归类统计）
+   * @param hourMode 是否按小时统计（不传则默认按天统计）
    * @returns Promise 包含报警趋势数据
    */
-  async getAlarmTrend(
-    factoryId: number | undefined = undefined,
+  async getAlarmTrend(args: {
     fromDate?: Date,
-    toDate?: Date
-  ): Promise<AlarmTrendResponse> {
+    toDate?: Date,
+    duration?: number,
+    hourMode?: boolean,
+    factoryId?: number,
+  } = {}): Promise<AlarmTrendResponse> {
     const axios = await this.context.ready;
-    var _factoryId = factoryId || 0;
-    if (!factoryId) {
+    var _factoryId = args.factoryId || 0;
+    if (!args.factoryId) {
       const farm = await this.context.user.getSelectedFarm();
       _factoryId = farm?.id || 0;
     }
@@ -1159,17 +1163,24 @@ export class DeviceGateway extends Object {
     if (!_factoryId) {
       throw new Error('工厂ID不能为空');
     }
-    if (fromDate && toDate && fromDate > toDate) {
+    if (args.fromDate && args.toDate && args.fromDate > args.toDate) {
       throw new Error('fromDate不能晚于toDate');
     }
 
     // 构建请求参数
     const params: any = { factoryId: _factoryId };
-    if (fromDate) {
-      params.fromDate = fromDate.toISOString();
+    if (args.fromDate) {
+      params.fromDate = args.fromDate.toISOString();
     }
-    if (toDate) {
-      params.toDate = toDate.toISOString();
+    if (args.toDate) {
+      params.toDate = args.toDate.toISOString();
+    }
+
+    if (args.duration !== undefined) {
+      params.duration = args.duration;
+    }
+    if (args.hourMode !== undefined) {
+      params.perHour = args.hourMode; 
     }
 
     return axios.get(`/api/v2/device/stat/alarms/trend`, {

package/dist/device_gateway.js

@@ -812,7 +812,7 @@ class DeviceGateway extends Object {
      * @returns Promise 包含设备报警统计列表分页数据
      */
     getAlarmStatistics() {
-        return __awaiter(this, arguments, void 0, function* (factoryId = undefined, resolveType = 2, pageNum = 1, pageSize = 10) {
+        return __awaiter(this, arguments, void 0, function* (resolveType = 2, pageNum = 1, pageSize = 10, factoryId = undefined) {
             const axios = yield this.context.ready;
             var _factoryId = factoryId || 0;
             if (!factoryId) {
@@ -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) {
@@ -918,13 +918,15 @@ class DeviceGateway extends Object {
      * @param factoryId 工厂ID
      * @param fromDate 查询起始时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
      * @param toDate 查询终止时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
+     * @param duration 报警恢复时长阈值，按秒计（不传则默认对所有的报警信息进行归类统计）
+     * @param hourMode 是否按小时统计（不传则默认按天统计）
      * @returns Promise 包含报警趋势数据
      */
     getAlarmTrend() {
-        return __awaiter(this, arguments, void 0, function* (factoryId = undefined, fromDate, toDate) {
+        return __awaiter(this, arguments, void 0, function* (args = {}) {
             const axios = yield this.context.ready;
-            var _factoryId = factoryId || 0;
-            if (!factoryId) {
+            var _factoryId = args.factoryId || 0;
+            if (!args.factoryId) {
                 const farm = yield this.context.user.getSelectedFarm();
                 _factoryId = (farm === null || farm === void 0 ? void 0 : farm.id) || 0;
             }
@@ -932,16 +934,22 @@ class DeviceGateway extends Object {
             if (!_factoryId) {
                 throw new Error('工厂ID不能为空');
             }
-            if (fromDate && toDate && fromDate > toDate) {
+            if (args.fromDate && args.toDate && args.fromDate > args.toDate) {
                 throw new Error('fromDate不能晚于toDate');
             }
             // 构建请求参数
             const params = { factoryId: _factoryId };
-            if (fromDate) {
-                params.fromDate = fromDate.toISOString();
+            if (args.fromDate) {
+                params.fromDate = args.fromDate.toISOString();
             }
-            if (toDate) {
-                params.toDate = toDate.toISOString();
+            if (args.toDate) {
+                params.toDate = args.toDate.toISOString();
+            }
+            if (args.duration !== undefined) {
+                params.duration = args.duration;
+            }
+            if (args.hourMode !== undefined) {
+                params.perHour = args.hourMode;
             }
             return axios.get(`/api/v2/device/stat/alarms/trend`, {
                 params: params

package/package.json

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