@cpzxrobot/sdk 1.3.82 → 1.3.85

package/device_gateway.ts

@@ -10,6 +10,7 @@ import type {
   DeviceAlarmStatsResponse,
   DeviceAlarmStatisticsResponse,
   AlarmStatisticsByTypeResponse,
+  AlarmTrendResponse,
 } from ".";
 
 class DeviceFault {
@@ -1093,10 +1094,10 @@ export class DeviceGateway extends Object {
    * @returns Promise 包含报警分类统计数据
    */
   async getAlarmStatisticsByType(
+    factoryId: number | undefined = undefined,
+    topN?: number,
     fromDate?: string,
-    toDate?: string,
-    factoryId?: number,
-    topN?: number
+    toDate?: string
   ): Promise<AlarmStatisticsByTypeResponse> {
     const axios = await this.context.ready;
     var _factoryId = factoryId || 0;
@@ -1135,5 +1136,51 @@ export class DeviceGateway extends Object {
     });
   }
 
+  /**
+   * 获取报警趋势
+   * @param factoryId 工厂ID
+   * @param fromDate 查询起始时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
+   * @param toDate 查询终止时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
+   * @returns Promise 包含报警趋势数据
+   */
+  async getAlarmTrend(
+    factoryId: number | undefined = undefined,
+    fromDate?: Date,
+    toDate?: Date
+  ): Promise<AlarmTrendResponse> {
+    const axios = await this.context.ready;
+    var _factoryId = factoryId || 0;
+    if (!factoryId) {
+      const farm = await this.context.user.getSelectedFarm();
+      _factoryId = farm?.id || 0;
+    }
+
+    // 参数验证
+    if (!_factoryId) {
+      throw new Error('工厂ID不能为空');
+    }
+    if (fromDate && toDate && fromDate > toDate) {
+      throw new Error('fromDate不能晚于toDate');
+    }
+
+    // 构建请求参数
+    const params: any = { factoryId: _factoryId };
+    if (fromDate) {
+      params.fromDate = fromDate.toISOString();
+    }
+    if (toDate) {
+      params.toDate = toDate.toISOString();
+    }
+
+    return axios.get(`/api/v2/device/stat/alarms/trend`, {
+      params: params
+    }).then((res) => {
+      if (res.data.code !== 200) {
+        throw new Error(res.data.message || '获取报警趋势信息失败');
+      }
+      return res.data;
+    });
+  }
+
 
 }

package/dist/device_gateway.js

@@ -877,8 +877,8 @@ class DeviceGateway extends Object {
      * @param toDate 查询终止时间（格式：YYYY-MM-DD HH:mm:ss，不传则默认对所有的报警信息进行归类统计）
      * @returns Promise 包含报警分类统计数据
      */
-    getAlarmStatisticsByType(fromDate, toDate, factoryId, topN) {
-        return __awaiter(this, void 0, void 0, function* () {
+    getAlarmStatisticsByType() {
+        return __awaiter(this, arguments, void 0, function* (factoryId = undefined, topN, fromDate, toDate) {
             const axios = yield this.context.ready;
             var _factoryId = factoryId || 0;
             if (!factoryId) {
@@ -913,5 +913,45 @@ class DeviceGateway extends Object {
             });
         });
     }
+    /**
+     * 获取报警趋势
+     * @param factoryId 工厂ID
+     * @param fromDate 查询起始时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
+     * @param toDate 查询终止时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，不传则默认对所有的报警信息进行归类统计）
+     * @returns Promise 包含报警趋势数据
+     */
+    getAlarmTrend() {
+        return __awaiter(this, arguments, void 0, function* (factoryId = undefined, fromDate, toDate) {
+            const axios = yield this.context.ready;
+            var _factoryId = factoryId || 0;
+            if (!factoryId) {
+                const farm = yield this.context.user.getSelectedFarm();
+                _factoryId = (farm === null || farm === void 0 ? void 0 : farm.id) || 0;
+            }
+            // 参数验证
+            if (!_factoryId) {
+                throw new Error('工厂ID不能为空');
+            }
+            if (fromDate && toDate && fromDate > toDate) {
+                throw new Error('fromDate不能晚于toDate');
+            }
+            // 构建请求参数
+            const params = { factoryId: _factoryId };
+            if (fromDate) {
+                params.fromDate = fromDate.toISOString();
+            }
+            if (toDate) {
+                params.toDate = toDate.toISOString();
+            }
+            return axios.get(`/api/v2/device/stat/alarms/trend`, {
+                params: params
+            }).then((res) => {
+                if (res.data.code !== 200) {
+                    throw new Error(res.data.message || '获取报警趋势信息失败');
+                }
+                return res.data;
+            });
+        });
+    }
 }
 exports.DeviceGateway = DeviceGateway;

package/dist/factory_gateway.js

@@ -129,10 +129,10 @@ class FactoryGateway extends Object {
         };
     }
     //获得工厂的所有车间信息
-    workshops(id) {
+    workshops(id, tags) {
         return __awaiter(this, void 0, void 0, function* () {
             var axios = yield this.context.ready;
-            const response = yield axios.get(`/api/v1/factory/${id}/workshops`);
+            const response = yield axios.get(`/api/v1/factory/${id}/workshops?tags=${tags === null || tags === void 0 ? void 0 : tags.join(',')}`);
             return response.data;
         });
     }

package/dist/test_alarm_trend.js

@@ -0,0 +1,15 @@
+"use strict";
+// 测试报警趋势查询功能
+// 简单的类型检查测试
+// 方法签名验证
+function validateMethodSignature() {
+    console.log('报警趋势查询功能语法检查通过！');
+    console.log('方法签名：getAlarmTrend(factoryId?: number, fromDate?: string, toDate?: string)');
+    console.log('参数说明：');
+    console.log('  - factoryId: 工厂ID（必填）');
+    console.log('  - fromDate: 查询起始时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，可选）');
+    console.log('  - toDate: 查询终止时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，可选）');
+    console.log('返回值：Promise<AlarmTrendResponse>');
+}
+// 运行验证
+validateMethodSignature();

package/factory_gateway.ts

@@ -115,9 +115,9 @@ export class FactoryGateway extends Object {
   }
 
   //获得工厂的所有车间信息
-  async workshops(id: number): Promise<any> {
+  async workshops(id: number, tags?: string[]): Promise<any> {
     var axios = await this.context.ready;
-    const response = await axios.get(`/api/v1/factory/${id}/workshops`);
+    const response = await axios.get(`/api/v1/factory/${id}/workshops?tags=${tags?.join(',')}`);
     return response.data;
   }
 

package/package.json

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

package/test_alarm_trend.ts

@@ -0,0 +1,16 @@
+// 测试报警趋势查询功能
+// 简单的类型检查测试
+
+// 方法签名验证
+function validateMethodSignature() {
+  console.log('报警趋势查询功能语法检查通过！');
+  console.log('方法签名：getAlarmTrend(factoryId?: number, fromDate?: string, toDate?: string)');
+  console.log('参数说明：');
+  console.log('  - factoryId: 工厂ID（必填）');
+  console.log('  - fromDate: 查询起始时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，可选）');
+  console.log('  - toDate: 查询终止时间（格式：YYYY-MM-DDTHH:mm:ss.sssZ，可选）');
+  console.log('返回值：Promise<AlarmTrendResponse>');
+}
+
+// 运行验证
+validateMethodSignature();

package/types.d.ts

@@ -385,6 +385,8 @@ interface DeviceAlarmStats {
   averageResolveTime: number;
   /** 最大解决时间（秒） */
   maxResolveTime: number;
+  /** 最大解决Id */
+  maxResolveId: number;
 }
 
 /**
@@ -509,6 +511,32 @@ interface AlarmStatisticsByTypeResponse {
   message: string;
 }
 
+/**
+ * 报警趋势项接口
+ */
+interface AlarmTrendItem {
+  /** 今日报警总数 */
+  todayAlarmAmount: number;
+  /** 今日未恢复报警数 */
+  todayAlarmingCount: number;
+  /** 今日已恢复报警数 */
+  todayResolvedCount: number;
+  /** 趋势日期（格式：YYYY-MM-DD） */
+  trendDate: string;
+}
+
+/**
+ * 报警趋势响应接口
+ */
+interface AlarmTrendResponse {
+  /** 响应码 */
+  code: number;
+  /** 报警趋势数据 */
+  data: AlarmTrendItem[];
+  /** 响应消息 */
+  message: string;
+}
+
 declare class Cpzxrobot {
   transport: TransportGateway;
   ready: Promise<MyAxiosInstance>;
@@ -599,6 +627,8 @@ declare module "@cpzxrobot/sdk" {
     DeviceAlarmStatisticsResponse,
     AlarmStatisticsByTypeItem,
     AlarmStatisticsByTypeResponse,
+    AlarmTrendItem,
+    AlarmTrendResponse,
     ElectricMeterRate,
     DevicePurpose,
   };