@cpzxrobot/sdk 1.0.66 → 1.0.69

package/camera_gateway.ts

@@ -60,11 +60,12 @@ export class CameraGateway extends Object {
       | "up"
       | "down"
       | "zoom_in"
-      | "zoom_out"
+      | "zoom_out",
+    start: boolean = true
   ): Promise<any> {
     var axios = await this.context.ready;
     const response = await axios.get(
-      `/api/v1/camera/${data.id}/control/${action}`
+      `/api/v1/camera/${data.id}/control/${action}?start=${start}`
     );
     return response.data;
   }

package/device_types/feedtower.ts

@@ -139,14 +139,50 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
       alertDays: number[];
     }
   ) {
-    return this.context.axios.post(`/api/v2/device/config/feedTowerAlert/update`, {
-      deviceId,
-      config: param,
-    });
+    return this.context.axios.post(
+      `/api/v2/device/config/feedTowerAlert/update`,
+      {
+        deviceId,
+        config: param,
+      }
+    );
   }
 
   //获取报警参数
   async getAlarmParam(deviceId: number) {
-    return this.context.axios.get(`/api/v2/device/config/feedTowerAlert/${deviceId}`);
+    return this.context.axios.get(
+      `/api/v2/device/config/feedTowerAlert/${deviceId}`
+    );
+  }
+
+  //新版料塔列表功能，id为工厂id
+  v2() {
+    return {
+      list: async (
+        options:
+          | undefined
+          | {
+              id?: Number | null | undefined; //工厂id
+              data?:
+                | "diffPerDay"
+                | "sumPerDay"
+                | "latest"
+                | "weekoverweek"
+                | "last"
+                | "rangeOfDay"
+                | "rangeToday"
+                | null; //如果data为null，则不获取数据，只获取设备列表，否则获取设备列表和数据
+              status?: string;
+              unit?: Number;
+              detail?: boolean;
+              type?: string;
+              supplier?: string; //供应商,可用于过滤设备
+            } = undefined
+      ) => {
+        return this.context.axios.get(
+          `/api/v2/device/feedTower/list/${options?.id}`
+        );
+      },
+    };
   }
 }

package/dist/camera_gateway.js

@@ -32,9 +32,9 @@ class CameraGateway extends Object {
         const response = await axios.get(`/api/v1/weather?code=${id}`);
         return response.data;
     }
-    async control(data, action) {
+    async control(data, action, start = true) {
         var axios = await this.context.ready;
-        const response = await axios.get(`/api/v1/camera/${data.id}/control/${action}`);
+        const response = await axios.get(`/api/v1/camera/${data.id}/control/${action}?start=${start}`);
         return response.data;
     }
 }

package/dist/device_types/feedtower.js

@@ -116,5 +116,13 @@ class FeedTowerGateway extends device_filter_1.DeviceFilter {
     async getAlarmParam(deviceId) {
         return this.context.axios.get(`/api/v2/device/config/feedTowerAlert/${deviceId}`);
     }
+    //新版料塔列表功能，id为工厂id
+    v2() {
+        return {
+            list: async (options = undefined) => {
+                return this.context.axios.get(`/api/v2/device/feedTower/list/${options === null || options === void 0 ? void 0 : options.id}`);
+            },
+        };
+    }
 }
 exports.FeedTowerGateway = FeedTowerGateway;

package/dist/pigfarm_gateway.js

@@ -89,22 +89,77 @@ class PigfarmGateway extends Object {
                     return axios.get(`/api/v2/pigfarm/weightMeter/list/${factory.id}`);
                 });
             },
-            //获取仪表下的所有传感器，这里获得的都是已绑定的
-            sensors: (weightMeterId) => {
-                return this.context.ready.then((axios) => {
-                    return axios.get(`/api/v2/pigfarm/weightMeterSensor/config/list/${weightMeterId}`);
-                });
-            },
             add: (data) => {
                 return this.context.ready.then((axios) => {
                     return axios.post(`/api/v2/pigfarm/weightMeter/add`, data);
                 });
             },
-            //按料塔获取仪表信息
-            getByFt: (deviceId) => {
-                return this.context.ready.then((axios) => {
-                    return axios.get(`/api/v2/pigfarm/weightMeterSensor/config/by-ft/${deviceId}`);
-                });
+            config: () => {
+                return {
+                    //获取仪表下的所有通道配置，这里获得的都是已绑定的
+                    list: (weightMeterId) => {
+                        return this.context.ready.then((axios) => {
+                            return axios.get(`/api/v2/pigfarm/weightMeter/config/list/${weightMeterId}`);
+                        });
+                    },
+                    //按料塔获取仪表信息
+                    getByFt: (deviceId) => {
+                        return this.context.ready.then((axios) => {
+                            return axios.get(`/api/v2/pigfarm/weightMeter/config/by-ft/${deviceId}`);
+                        });
+                    },
+                    updateSensor: (data) => {
+                        return this.context.ready.then((axios) => {
+                            return axios.post(`/api/v2/pigfarm/weightMeter/config/update`, data);
+                        });
+                    },
+                    //首先创建料塔，然后绑定传感器，绑定时需要传入料塔设备id和仪表id
+                    bind: (deviceId, meterId, args) => {
+                        //检查endValue1和endValue2的长度是否为2
+                        if (args.endValue1.length !== 2 || args.endValue2.length !== 2) {
+                            throw new Error("endValue1和endValue2的长度必须为2");
+                        }
+                        //检查endValue1的第二个值是否等于endValue2的第一个值
+                        if (args.endValue1[1] !== args.endValue2[0]) {
+                            throw new Error("endValue1的第二个值必须等于endValue2的第一个值");
+                        }
+                        //检查endValue1的第一个值是否是0，最好界面就限制只能是0
+                        if (args.endValue1[0] !== 0) {
+                            throw new Error("endValue1的第一个值必须为0");
+                        }
+                        args.deviceId = deviceId;
+                        args.weightMeterId = meterId;
+                        return this.context.ready.then((axios) => {
+                            return axios.post(`/api/v2/pigfarm/weightMeter/config/add`, args);
+                        });
+                    },
+                };
+            },
+            sensor: () => {
+                return {
+                    //获取配置对应的传感器列表（这里的传感器不是平台的传感器，而是绑定的实际传感器）
+                    list: (weightMeterConfigId) => {
+                        return this.context.ready.then((axios) => {
+                            return axios.get(`/api/v2/pigfarm/weightSensor/sensor/list/${weightMeterConfigId}`);
+                        });
+                    },
+                    update: (data) => {
+                        if (!data.weightMeterConfigId) {
+                            throw new Error("weightMeterConfigId不能为空");
+                        }
+                        return this.context.ready.then((axios) => {
+                            return axios.post(`/api/v2/pigfarm/weightSensor/sensor/saveOrUpdate`, data);
+                        });
+                    },
+                    add: (data) => {
+                        if (data.weightMeterConfigId) {
+                            throw new Error("weightMeterConfigId不为空");
+                        }
+                        return this.context.ready.then((axios) => {
+                            return axios.post(`/api/v2/pigfarm/weightSensor/sensor/saveOrUpdate`, data);
+                        });
+                    },
+                };
             },
             //更新仪表信息
             update: (data) => {
@@ -112,31 +167,6 @@ class PigfarmGateway extends Object {
                     return axios.post(`/api/v2/pigfarm/weightMeter/update`, data);
                 });
             },
-            updateSensor: (data) => {
-                return this.context.ready.then((axios) => {
-                    return axios.post(`/api/v2/pigfarm/weightMeterSensor/config/update`, data);
-                });
-            },
-            //首先创建料塔，然后绑定传感器，绑定时需要传入料塔设备id和仪表id
-            bind: (deviceId, meterId, args) => {
-                //检查endValue1和endValue2的长度是否为2
-                if (args.endValue1.length !== 2 || args.endValue2.length !== 2) {
-                    throw new Error("endValue1和endValue2的长度必须为2");
-                }
-                //检查endValue1的第二个值是否等于endValue2的第一个值
-                if (args.endValue1[1] !== args.endValue2[0]) {
-                    throw new Error("endValue1的第二个值必须等于endValue2的第一个值");
-                }
-                //检查endValue1的第一个值是否是0，最好界面就限制只能是0
-                if (args.endValue1[0] !== 0) {
-                    throw new Error("endValue1的第一个值必须为0");
-                }
-                args.deviceId = deviceId;
-                args.weightMeterId = meterId;
-                return this.context.ready.then((axios) => {
-                    return axios.post(`/api/v2/pigfarm/weightMeterSensor/config/add`, args);
-                });
-            },
         };
     }
     get heatlamp() {

package/dist/unit_gateway.js

@@ -38,5 +38,26 @@ class UnitGateway extends Object {
             },
         };
     }
+    v2() {
+        return {
+            //新增时必传factoryId, 当上层是workshop时，需要传workshopId
+            add: (unit) => {
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/unit/add`, unit);
+                });
+            },
+            //新增时必传factoryId, 当上层是workshop时，需要传workshopId
+            update: (unit) => {
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/unit/update`, unit);
+                });
+            },
+            delete: (unit) => {
+                return this.context.ready.then((axios) => {
+                    return axios.get(`/api/v2/unit/delete?id=${unit.id}`);
+                });
+            },
+        };
+    }
 }
 exports.UnitGateway = UnitGateway;

package/package.json

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

package/pigfarm_gateway.ts

@@ -6,6 +6,7 @@ import {
   Unit,
   WeightMeter,
   WeightMeterSensor,
+  weightMeterSensorsConfig,
 } from ".";
 
 export class PigfarmGateway extends Object {
@@ -105,31 +106,100 @@ export class PigfarmGateway extends Object {
       //获取仪表列表，
       list: (factory: Factory) => {
         return this.context.ready.then((axios) => {
-          return axios.get(
-            `/api/v2/pigfarm/weightMeter/list/${factory.id}`
-          );
-        });
-      },
-      //获取仪表下的所有传感器，这里获得的都是已绑定的
-      sensors: (weightMeterId: number) => {
-        return this.context.ready.then((axios) => {
-          return axios.get(
-            `/api/v2/pigfarm/weightMeterSensor/config/list/${weightMeterId}`
-          );
+          return axios.get(`/api/v2/pigfarm/weightMeter/list/${factory.id}`);
         });
       },
+
       add: (data: WeightMeter) => {
         return this.context.ready.then((axios) => {
           return axios.post(`/api/v2/pigfarm/weightMeter/add`, data);
         });
       },
-      //按料塔获取仪表信息
-      getByFt: (deviceId: number) => {
-        return this.context.ready.then((axios) => {
-          return axios.get(
-            `/api/v2/pigfarm/weightMeterSensor/config/by-ft/${deviceId}`
-          );
-        });
+      config: () => {
+        return {
+          //获取仪表下的所有通道配置，这里获得的都是已绑定的
+          list: (weightMeterId: number) => {
+            return this.context.ready.then((axios) => {
+              return axios.get(
+                `/api/v2/pigfarm/weightMeter/config/list/${weightMeterId}`
+              );
+            });
+          },
+          //按料塔获取仪表信息
+          getByFt: (deviceId: number) => {
+            return this.context.ready.then((axios) => {
+              return axios.get(
+                `/api/v2/pigfarm/weightMeter/config/by-ft/${deviceId}`
+              );
+            });
+          },
+          updateSensor: (data: any) => {
+            return this.context.ready.then((axios) => {
+              return axios.post(
+                `/api/v2/pigfarm/weightMeter/config/update`,
+                data
+              );
+            });
+          },
+          //首先创建料塔，然后绑定传感器，绑定时需要传入料塔设备id和仪表id
+          bind: (
+            deviceId: number,
+            meterId: number,
+            args: WeightMeterSensor
+          ) => {
+            //检查endValue1和endValue2的长度是否为2
+            if (args.endValue1.length !== 2 || args.endValue2.length !== 2) {
+              throw new Error("endValue1和endValue2的长度必须为2");
+            }
+            //检查endValue1的第二个值是否等于endValue2的第一个值
+            if (args.endValue1[1] !== args.endValue2[0]) {
+              throw new Error("endValue1的第二个值必须等于endValue2的第一个值");
+            }
+            //检查endValue1的第一个值是否是0，最好界面就限制只能是0
+            if (args.endValue1[0] !== 0) {
+              throw new Error("endValue1的第一个值必须为0");
+            }
+            args.deviceId = deviceId;
+            args.weightMeterId = meterId;
+            return this.context.ready.then((axios) => {
+              return axios.post(`/api/v2/pigfarm/weightMeter/config/add`, args);
+            });
+          },
+        };
+      },
+      sensor: () => {
+        return {
+          //获取配置对应的传感器列表（这里的传感器不是平台的传感器，而是绑定的实际传感器）
+          list: (weightMeterConfigId: number) => {
+            return this.context.ready.then((axios) => {
+              return axios.get(
+                `/api/v2/pigfarm/weightSensor/sensor/list/${weightMeterConfigId}`
+              );
+            });
+          },
+          update: (data: weightMeterSensorsConfig) => {
+            if(!data.weightMeterConfigId){
+              throw new Error("weightMeterConfigId不能为空");
+            }
+            return this.context.ready.then((axios) => {
+              return axios.post(
+                `/api/v2/pigfarm/weightSensor/sensor/saveOrUpdate`,
+                data
+              );
+            });
+          },
+          add: (data: weightMeterSensorsConfig) => {
+            if(data.weightMeterConfigId){
+              throw new Error("weightMeterConfigId不为空");
+            }
+            return this.context.ready.then((axios) => {
+              return axios.post(
+                `/api/v2/pigfarm/weightSensor/sensor/saveOrUpdate`,
+                data
+              );
+            });
+          },
+        };
       },
       //更新仪表信息
       update: (data: any) => {
@@ -137,38 +207,6 @@ export class PigfarmGateway extends Object {
           return axios.post(`/api/v2/pigfarm/weightMeter/update`, data);
         });
       },
-      updateSensor: (data: any) => {
-        return this.context.ready.then((axios) => {
-          return axios.post(
-            `/api/v2/pigfarm/weightMeterSensor/config/update`,
-            data
-          );
-        });
-      },
-      //首先创建料塔，然后绑定传感器，绑定时需要传入料塔设备id和仪表id
-      bind: (
-        deviceId: number,
-        meterId: number,
-        args: WeightMeterSensor
-      ) => {
-        //检查endValue1和endValue2的长度是否为2
-        if (args.endValue1.length !== 2 || args.endValue2.length !== 2) {
-          throw new Error("endValue1和endValue2的长度必须为2");
-        }
-        //检查endValue1的第二个值是否等于endValue2的第一个值
-        if (args.endValue1[1] !== args.endValue2[0]) {
-          throw new Error("endValue1的第二个值必须等于endValue2的第一个值");
-        }
-        //检查endValue1的第一个值是否是0，最好界面就限制只能是0
-        if (args.endValue1[0] !== 0) {
-          throw new Error("endValue1的第一个值必须为0");
-        }
-        args.deviceId = deviceId;
-        args.weightMeterId = meterId;
-        return this.context.ready.then((axios) => {
-          return axios.post(`/api/v2/pigfarm/weightMeterSensor/config/add`, args);
-        });
-      },
     };
   }
 

package/readme.md

@@ -77,6 +77,7 @@ baseURL: "/"
 | cpzxrobot().device.list | 获得常见设备的列表（当没有特殊类型需求时调用）,列表接口提供data参数，可以同步获得多个设备的数据，尽量使用该接口获得设备数据   |
 | cpzxrobot().device.data | 获得设备的数据，该接口用于获取单个设备的详细数据   |
 | cpzxrobot().device.feedTower.list | 获得料塔设备的列表   |
+| cpzxrobot().device.feedTower.v2.list | 获得料塔设备的列表(新版)，暂不支持v1版本的data等附加参数，只支持按工厂获取   |
 | cpzxrobot().device.xxx  | 获得设备的相关信息   |
 | cpzxrobot().device.v2.add  | 新增设备（仅限v2设备）   |
 | cpzxrobot().device.v2.update | 更新设备（仅限v2设备）   |
@@ -86,6 +87,12 @@ baseURL: "/"
 | cpzxrobot().factory.entry| 获得工厂的可显示动态信息 |
 | cpzxrobot().transport.fodder.getDeviceByFodderld | 获得料单对应的设备 |
 | cpzxrobot().pigfarm.heatlamp.xxx | 操作保温灯 |
+| cpzxrobot().pigfarm.weightMeter.config.list | 获取称重计的配置信息 |
+| cpzxrobot().pigfarm.weightMeter.config.bind | 添加称重计的配置信息，绑定到料塔 |
+| cpzxrobot().pigfarm.weightMeter.config.update | 更新称重计的配置信息 |
+| cpzxrobot().pigfarm.weightMeter.sensor.list | 获取称重计的传感器列表 |
+| cpzxrobot().pigfarm.weightMeter.sensor.add | 添加称重计的传感器信息 |
+| cpzxrobot().pigfarm.weightMeter.sensor.update | 更新称重计的传感器信息 |
 | cpzxrobot().device.feedTower.stat | 获得料塔设备的料耗,饲料重量 |
 | cpzxrobot().device.feedTower.setAlarmParam | 设置料塔设备的报警参数 |
 | cpzxrobot().device.feedTower.updateAlarmParam | 更新料塔设备的报警参数 |
@@ -95,6 +102,10 @@ baseURL: "/"
 | cpzxrobot().pigfarm.heatlamp.switch | 设置保温灯的当前工作日龄，调用时，action"on"或"off" |
 | cpzxrobot().pigfarm.heatlamp.iotFields | 获取保温灯用于获取iot的字段列表 |
 | cpzxrobot().scanQrcode | 调用扫码功能，获得扫码文字 |
+| cpzxrobot().unit.v2.list | 获得单元列表，v2版本 |
+| cpzxrobot().unit.v2.add | 添加单元，v2版本 |
+| cpzxrobot().unit.v2.update | 更新单元，v2版本 |
+| cpzxrobot().unit.v2.delete | 删除单元，v2版本 |
 
 
 ### 工厂信息接口

package/types.d.ts

@@ -78,8 +78,9 @@ type Unit = {
   id?: number;
   type?: string;
   workshopName?: string;
+  workshopId?: number;
+  factoryId?: number;
 };
-
 type HeatLamp = {
   id: number;
   unitId: number;
@@ -169,6 +170,17 @@ type WeightMeterSensor = {
   deviceId: number;
 };
 
+type weightMeterSensorsConfig = {
+  weightMeterConfigId: number;
+  sensors: WeightMeterSensor[];
+};
+
+type WeightMeterSensor = {
+  address: number,
+  adzero: number,
+  hornScale: number,
+}
+
 // {
 //       "id":1,
 //       "name":"qeq",

package/unit_gateway.ts

@@ -50,4 +50,28 @@ export class UnitGateway extends Object {
       },
     };
   }
+
+  v2() {
+    return {
+      //新增时必传factoryId, 当上层是workshop时，需要传workshopId
+      add: (unit: Unit) => {
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/unit/add`, unit);
+        });
+      },
+
+      //新增时必传factoryId, 当上层是workshop时，需要传workshopId
+      update: (unit: Unit) => {
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/unit/update`, unit);
+        });
+      },
+
+      delete: (unit: Unit) => {
+        return this.context.ready.then((axios) => {
+          return axios.get(`/api/v2/unit/delete?id=${unit.id}`);
+        });
+      },
+    };
+  }
 }