@cpzxrobot/sdk 1.0.60 → 1.0.62

package/device_types/feedtower.ts

@@ -1,103 +1,110 @@
-import { type FodderOrderList, type FeedTower,type FeedTowerExtraInfo, DataQueryArgs } from '..'
-import { DeviceFilter } from '../device_filter'
+import {
+  type FodderOrderList,
+  type FeedTower,
+  type FeedTowerExtraInfo,
+  DataQueryArgs,
+} from "..";
+import { DeviceFilter } from "../device_filter";
 
 export class FeedTowerGateway extends DeviceFilter<FeedTower> {
   // Add properties and methods specific to the FeedTower type here
 
   get deviceType() {
-    return 'FeedTower'
+    return "FeedTower";
   }
 
   getDetail(info: FeedTower, id: number) {
     return this.context.axios
-      .post('/api/v1/pigfarm/device/status/detail?deviceId=' + id)
+      .post("/api/v1/pigfarm/device/status/detail?deviceId=" + id)
       .then((res: any) => {
         if (res.data.code != 200) {
-          throw res.data.message
+          throw res.data.message;
         }
-        res.data.data.unit = info.unit
-        return res.data.data
-      })
+        res.data.data.unit = info.unit;
+        return res.data.data;
+      });
   }
 
   wrapData(id: number, args: DataQueryArgs, p1: Promise<any>) {
-    const ps = [p1]
+    const ps = [p1];
     if (!args.ingoreInput) {
       ps.push(
         this.context.axios.post(`/api/v1/pigfarm/device/fodder`, {
           device: id,
-          times: [args.start, args.stop]
+          times: [args.start, args.stop],
         })
-      )
+      );
     }
 
     return Promise.all(ps).then((res) => {
       if (res[0].data.Error) {
-        throw res[0].data.Error
+        throw res[0].data.Error;
       } else {
         if (!args.ingoreInput) {
           res[1].data.data.list.forEach((item: any) => {
-            res[0].data[item.date] += item.data
-          })
+            res[0].data[item.date] += item.data;
+          });
         }
-        return res[0].data
+        return res[0].data;
       }
-    })
+    });
   }
 
   wrapList(list: FeedTower[]): Promise<FeedTower[]> {
-    const ids = list.map((device) => device.id)
+    const ids = list.map((device) => device.id);
     //TODO 其他设备的详情需要支持，目前只有喂料塔
     return this.context.axios
-      .post('/api/v1/pigfarm/device/status/list', ids)
-      .then((res:any) => {
+      .post("/api/v1/pigfarm/device/status/list", ids)
+      .then((res: any) => {
         if (res.data.code != 200) {
-          throw res.data.message
+          throw res.data.message;
         } else {
           res.data.data.forEach((device: FeedTowerExtraInfo) => {
-            const found = list.find((d) => d.id === device.id)
+            const found = list.find((d) => d.id === device.id);
             if (found) {
-              Object.assign(found, device)
+              Object.assign(found, device);
             }
-          })
-          return list
+          });
+          return list;
         }
-      })
+      });
   }
 
-
   async enter(data: FodderOrderList): Promise<any> {
-    const res = await this.context.axios.post('/api/v1/pigfarm/device/fodder/import', data)
-    return res
+    const res = await this.context.axios.post(
+      "/api/v1/pigfarm/device/fodder/import",
+      data
+    );
+    return res;
   }
   async getCar(truck: string): Promise<any> {
-    const res = await this.context.axios.get('/api/v1/pigfarm/car', {
+    const res = await this.context.axios.get("/api/v1/pigfarm/car", {
       params: {
         truckCode: truck,
-        random: 1
-      }
-    })
-    return res.data
+        random: 1,
+      },
+    });
+    return res.data;
   }
   async getCarList(): Promise<any> {
-    const res = await this.context.axios.get('/api/v1/pigfarm/car/list')
-    return res.data
+    const res = await this.context.axios.get("/api/v1/pigfarm/car/list");
+    return res.data;
   }
   async updateZeroTime(id: Number): Promise<any> {
     const res = await this.context.axios.post(
-      '/api/v1/pigfarm/device/status/updateZeroTime' + '?id=' + id
-    )
-    return res
+      "/api/v1/pigfarm/device/status/updateZeroTime" + "?id=" + id
+    );
+    return res;
   }
 
   /**
- * 查询指定设备的饲料统计信息
- *
- * @param deviceIds 设备ID数组
- * @param start 开始时间，格式为yyyy-MM-dd
- * @param end 结束时间，格式为yyyy-MM-dd
- * @returns 饲料统计信息
- */
+   * 查询指定设备的饲料统计信息
+   *
+   * @param deviceIds 设备ID数组
+   * @param start 开始时间，格式为yyyy-MM-dd
+   * @param end 结束时间，格式为yyyy-MM-dd
+   * @returns 饲料统计信息
+   */
   async stat(deviceIds: Number[], start: string, end: string) {
     return this.context.ready.then((axios) => {
       return axios.post(`/api/v1/pigfarm/feedStatics`, {
@@ -108,4 +115,24 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
       });
     });
   }
+
+  //设置报警参数
+  async setAlarmParam(
+    deviceId: number,
+    param: {
+      zeroPeriod: number;
+      zeroValue: number;
+      alertDays: number[];
+    }
+  ) {
+    return this.context.axios.post(`/api/v2/device/config/feedTowerAlert/add`, {
+      deviceId,
+      config: param,
+    });
+  }
+
+  //获取报警参数
+  async getAlarmParam(deviceId: number) {
+    return this.context.axios.get(`/api/v2/device/config/feedTowerAlert/${deviceId}`);
+  }
 }

package/dist/device_types/feedtower.js

@@ -5,11 +5,11 @@ const device_filter_1 = require("../device_filter");
 class FeedTowerGateway extends device_filter_1.DeviceFilter {
     // Add properties and methods specific to the FeedTower type here
     get deviceType() {
-        return 'FeedTower';
+        return "FeedTower";
     }
     getDetail(info, id) {
         return this.context.axios
-            .post('/api/v1/pigfarm/device/status/detail?deviceId=' + id)
+            .post("/api/v1/pigfarm/device/status/detail?deviceId=" + id)
             .then((res) => {
             if (res.data.code != 200) {
                 throw res.data.message;
@@ -23,7 +23,7 @@ class FeedTowerGateway extends device_filter_1.DeviceFilter {
         if (!args.ingoreInput) {
             ps.push(this.context.axios.post(`/api/v1/pigfarm/device/fodder`, {
                 device: id,
-                times: [args.start, args.stop]
+                times: [args.start, args.stop],
             }));
         }
         return Promise.all(ps).then((res) => {
@@ -44,7 +44,7 @@ class FeedTowerGateway extends device_filter_1.DeviceFilter {
         const ids = list.map((device) => device.id);
         //TODO 其他设备的详情需要支持，目前只有喂料塔
         return this.context.axios
-            .post('/api/v1/pigfarm/device/status/list', ids)
+            .post("/api/v1/pigfarm/device/status/list", ids)
             .then((res) => {
             if (res.data.code != 200) {
                 throw res.data.message;
@@ -61,34 +61,34 @@ class FeedTowerGateway extends device_filter_1.DeviceFilter {
         });
     }
     async enter(data) {
-        const res = await this.context.axios.post('/api/v1/pigfarm/device/fodder/import', data);
+        const res = await this.context.axios.post("/api/v1/pigfarm/device/fodder/import", data);
         return res;
     }
     async getCar(truck) {
-        const res = await this.context.axios.get('/api/v1/pigfarm/car', {
+        const res = await this.context.axios.get("/api/v1/pigfarm/car", {
             params: {
                 truckCode: truck,
-                random: 1
-            }
+                random: 1,
+            },
         });
         return res.data;
     }
     async getCarList() {
-        const res = await this.context.axios.get('/api/v1/pigfarm/car/list');
+        const res = await this.context.axios.get("/api/v1/pigfarm/car/list");
         return res.data;
     }
     async updateZeroTime(id) {
-        const res = await this.context.axios.post('/api/v1/pigfarm/device/status/updateZeroTime' + '?id=' + id);
+        const res = await this.context.axios.post("/api/v1/pigfarm/device/status/updateZeroTime" + "?id=" + id);
         return res;
     }
     /**
-   * 查询指定设备的饲料统计信息
-   *
-   * @param deviceIds 设备ID数组
-   * @param start 开始时间，格式为yyyy-MM-dd
-   * @param end 结束时间，格式为yyyy-MM-dd
-   * @returns 饲料统计信息
-   */
+     * 查询指定设备的饲料统计信息
+     *
+     * @param deviceIds 设备ID数组
+     * @param start 开始时间，格式为yyyy-MM-dd
+     * @param end 结束时间，格式为yyyy-MM-dd
+     * @returns 饲料统计信息
+     */
     async stat(deviceIds, start, end) {
         return this.context.ready.then((axios) => {
             return axios.post(`/api/v1/pigfarm/feedStatics`, {
@@ -99,5 +99,16 @@ class FeedTowerGateway extends device_filter_1.DeviceFilter {
             });
         });
     }
+    //设置报警参数
+    async setAlarmParam(deviceId, param) {
+        return this.context.axios.post(`/api/v2/device/config/feedTowerAlert/add`, {
+            deviceId,
+            config: param,
+        });
+    }
+    //获取报警参数
+    async getAlarmParam(deviceId) {
+        return this.context.axios.get(`/api/v2/device/config/feedTowerAlert/${deviceId}`);
+    }
 }
 exports.FeedTowerGateway = FeedTowerGateway;

package/package.json

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

package/readme.md

@@ -87,6 +87,7 @@ baseURL: "/"
 | cpzxrobot().transport.fodder.getDeviceByFodderld | 获得料单对应的设备 |
 | cpzxrobot().pigfarm.heatlamp.xxx | 操作保温灯 |
 | cpzxrobot().device.feedTower.stat | 获得料塔设备的料耗,饲料重量 |
+| cpzxrobot().device.feedTower.setAlarmParam | 设置料塔设备的报警参数 |
 | cpzxrobot().pigfarm.unitStat | 获得单元的统计信息，包括每日料耗，饲料消耗，日龄，存栏量等 |
 | cpzxrobot().pigfarm.heatlamp.set | 设置保温灯的当前工作日龄，调用时，action传"dayage",argc传天数 |
 | cpzxrobot().pigfarm.heatlamp.switch | 设置保温灯的当前工作日龄，调用时，action"on"或"off" |

package/types.d.ts

@@ -157,6 +157,7 @@ type WeightMeter = {
 type WeightMeterSensor = {
   id: number;
   weightMeterId: number; //仪表id
+  weightMeterNum: number; //仪表路数
   scaleDivision: number; //分度值
   fullScale: number; //满量程
   slopeRate: number; //斜率值

package/unit_gateway.ts

@@ -10,7 +10,7 @@ export class UnitGateway extends Object {
     return {
       add: (
         unit: Unit,
-        type: "heatLamp",
+        type: "HeatLamp",
         config: {
           [key: string]: any;
         }