@cpzxrobot/sdk 1.0.38 → 1.0.40

package/camera_gateway.ts

@@ -6,32 +6,38 @@ export class CameraGateway extends Object {
     super();
     this.context = context;
   }
-  //搜索摄像头，传入unit对象或者unit的id
-  async search(data: Unit): Promise<any> {
+
+  async search(
+    data:
+      | Unit
+      | {
+          workshop_id?: number;
+          factory_id?: number;
+          unit_id?: number;
+        }
+  ): Promise<any> {
     var axios = await this.context.ready;
-    var id = data.id;
+    var params = {};
 
-    if (!id) {
-      //if data is string
-      if (typeof data === "string") {
-        id = data;
-      }else{
-        throw new Error("请传入正确的Unit对象");
-      }
+    if (!("id" in data)) {
+      //should has unit_id or factory_id or workshop_id at least one, if has more than one, use unit_id first,then workshop_id, then factory_id
+      params = data as {
+        workshop_id?: number;
+        factory_id?: number;
+        unit_id?: number;
+      };
+    }else{
+      params = {unit_id:data.id}
     }
 
-    const response = await axios.post("/api/v1/camera/search", {
-      unit_id: id,
-    });
+    const response = await axios.post("/api/v1/camera/search", params);
     return response.data;
   }
 
   //获得摄像头的播放地址
   async getUrl(data: Camera): Promise<any> {
     var axios = await this.context.ready;
-    const response = await axios.get(
-      `/api/v1/camera/${data.id}/url/wss`
-    );
+    const response = await axios.get(`/api/v1/camera/${data.id}/url/wss`);
     return response.data;
   }
   //获取工厂天气

package/dist/camera_gateway.js

@@ -6,22 +6,17 @@ class CameraGateway extends Object {
         super();
         this.context = context;
     }
-    //搜索摄像头，传入unit对象或者unit的id
     async search(data) {
         var axios = await this.context.ready;
-        var id = data.id;
-        if (!id) {
-            //if data is string
-            if (typeof data === "string") {
-                id = data;
-            }
-            else {
-                throw new Error("请传入正确的Unit对象");
-            }
+        var params = {};
+        if (!("id" in data)) {
+            //should has unit_id or factory_id or workshop_id at least one, if has more than one, use unit_id first,then workshop_id, then factory_id
+            params = data;
         }
-        const response = await axios.post("/api/v1/camera/search", {
-            unit_id: id,
-        });
+        else {
+            params = { unit_id: data.id };
+        }
+        const response = await axios.post("/api/v1/camera/search", params);
         return response.data;
     }
     //获得摄像头的播放地址

package/dist/transport_gateway.js

@@ -39,7 +39,7 @@ class TransportGateway extends Object {
                     return this.context.axios
                         .get("/api/v1/pigfarm/device/fodderTower/getDeviceByFodderId", {
                         params: {
-                            fodderld: id,
+                            fodderId: id,
                         },
                     })
                         .then((res) => {

package/package.json

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

package/readme.md

@@ -116,6 +116,10 @@ factory_id: 工厂id
 
 如果入参为:{factory_id:xxx}则按工厂搜索
 
+如果入参为:{workshop_id:xxx}则按车间搜索
+
+如果入参为Unit对象，则按Unit对象的id进行搜索
+
 ### app功能相关
 
 `cpzxrobot().saveBlob(blob,filname)`
@@ -134,4 +138,5 @@ heatlamp 属性提供了一组方法，用于管理猪场的热灯配置。它
 **cpzxrobot().pigfarm.heatlamp.add(unit, data)**：添加新的热灯配置。
 **cpzxrobot().pigfarm.heatlamp.list(unit)**：列出指定单元的所有热灯配置。
 **cpzxrobot().pigfarm.heatlamp.get(id)**：获取指定 ID 的热灯配置。
-**cpzxrobot().pigfarm.heatlamp.update(lamp)**：更新热灯配置。
+**cpzxrobot().pigfarm.heatlamp.update(lamp)**：更新热灯配置。
+

package/transport_gateway.ts

@@ -49,7 +49,7 @@ export class TransportGateway extends Object {
           return this.context.axios
             .get("/api/v1/pigfarm/device/fodderTower/getDeviceByFodderId", {
               params: {
-                fodderld: id,
+                fodderId: id,
               },
             })
             .then((res) => {