@cpzxrobot/sdk 1.0.57 → 1.0.59

package/device_gateway.ts

@@ -1,6 +1,6 @@
 import { DeviceTypeGateway } from "./device_type_gateway";
 import { DeviceFilter } from "./device_filter";
-import type { ElectricMeter, Cpzxrobot, DataQueryArgs } from ".";
+import type { ElectricMeter, Cpzxrobot, DataQueryArgs, DeviceV2, Unit } from ".";
 import { FeedTowerGateway } from "./device_types/feedtower";
 import { ElectricMeterGateway } from "./device_types/electricmeter";
 import { NormalGateway } from "./device_types/normal_type";
@@ -16,6 +16,42 @@ export class DeviceGateway extends Object {
   public normalFilter: NormalGateway;
   context: Cpzxrobot;
 
+  get v2() {
+    return {
+      update: async (data: DeviceV2) => {
+        let axios = await this.context.ready;
+
+        return axios.post(`/api/v2/device/update`, data).then((res) => {
+          return res.data;
+        });
+      },
+
+      add: async (data: DeviceV2) => {
+        let axios = await this.context.ready;
+
+        return axios.post(`/api/v2/device/add`, data).then((res) => {
+          return res.data;
+        });
+      },
+
+      delete: async (id: number) => {
+        let axios = await this.context.ready;
+
+        return axios.post(`/api/v2/device/delete?id=${id}`).then((res) => {
+          return res.data;
+        });
+      },
+
+      list: async (unit:Unit) => {
+        let axios = await this.context.ready;
+
+        return axios.get(`/api/v2/device/list/${unit.id}`).then((res) => {
+          return res.data;
+        });
+      },
+    };
+  }
+
   constructor(context: Cpzxrobot) {
     super();
     this.context = context;
@@ -98,6 +134,6 @@ export class DeviceGateway extends Object {
       type: "diffPerDay", // diffPerDay, sumPerDay, latest
     }
   ) {
-    return this.normalFilter.getData(id,args);
+    return this.normalFilter.getData(id, args);
   }
 }

package/dist/device_gateway.js

@@ -10,6 +10,34 @@ const normal_type_1 = require("./device_types/normal_type");
 // shzx.device.feedTower: 料塔设备的数据获取网关
 // shzx.device.electricMeter：电表设备的数据获取网关
 class DeviceGateway extends Object {
+    get v2() {
+        return {
+            update: async (data) => {
+                let axios = await this.context.ready;
+                return axios.post(`/api/v2/device/update`, data).then((res) => {
+                    return res.data;
+                });
+            },
+            add: async (data) => {
+                let axios = await this.context.ready;
+                return axios.post(`/api/v2/device/add`, data).then((res) => {
+                    return res.data;
+                });
+            },
+            delete: async (id) => {
+                let axios = await this.context.ready;
+                return axios.post(`/api/v2/device/delete?id=${id}`).then((res) => {
+                    return res.data;
+                });
+            },
+            list: async (unit) => {
+                let axios = await this.context.ready;
+                return axios.get(`/api/v2/device/list/${unit.id}`).then((res) => {
+                    return res.data;
+                });
+            },
+        };
+    }
     constructor(context) {
         super();
         this.context = context;

package/dist/pigfarm_gateway.js

@@ -86,7 +86,7 @@ class PigfarmGateway extends Object {
             //获取仪表列表，
             list: (factory) => {
                 return this.context.ready.then((axios) => {
-                    return axios.get(`/api/v2/pigfarm/relay/weightMeter/list/${factory.id}`);
+                    return axios.get(`/api/v2/pigfarm/weightMeter/list/${factory.id}`);
                 });
             },
             //获取仪表下的所有传感器，这里获得的都是已绑定的
@@ -97,13 +97,19 @@ class PigfarmGateway extends Object {
             },
             add: (data) => {
                 return this.context.ready.then((axios) => {
-                    return axios.post(`/api/v2/pigfarm/relay/weightMeter/add`, data);
+                    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}`);
                 });
             },
             //更新仪表信息
             update: (data) => {
                 return this.context.ready.then((axios) => {
-                    return axios.post(`/api/v2/pigfarm/relay/weightMeter/update`, data);
+                    return axios.post(`/api/v2/pigfarm/weightMeter/update`, data);
                 });
             },
             updateSensor: (data) => {

package/package.json

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

package/pigfarm_gateway.ts

@@ -106,7 +106,7 @@ export class PigfarmGateway extends Object {
       list: (factory: Factory) => {
         return this.context.ready.then((axios) => {
           return axios.get(
-            `/api/v2/pigfarm/relay/weightMeter/list/${factory.id}`
+            `/api/v2/pigfarm/weightMeter/list/${factory.id}`
           );
         });
       },
@@ -120,13 +120,21 @@ export class PigfarmGateway extends Object {
       },
       add: (data: WeightMeter) => {
         return this.context.ready.then((axios) => {
-          return axios.post(`/api/v2/pigfarm/relay/weightMeter/add`, data);
+          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}`
+          );
         });
       },
       //更新仪表信息
       update: (data: any) => {
         return this.context.ready.then((axios) => {
-          return axios.post(`/api/v2/pigfarm/relay/weightMeter/update`, data);
+          return axios.post(`/api/v2/pigfarm/weightMeter/update`, data);
         });
       },
       updateSensor: (data: any) => {

package/readme.md

@@ -78,6 +78,10 @@ baseURL: "/"
 | cpzxrobot().device.data | 获得设备的数据，该接口用于获取单个设备的详细数据   |
 | cpzxrobot().device.feedTower.list | 获得料塔设备的列表   |
 | cpzxrobot().device.xxx  | 获得设备的相关信息   |
+| cpzxrobot().device.v2.add  | 新增设备（仅限v2设备）   |
+| cpzxrobot().device.v2.update | 更新设备（仅限v2设备）   |
+| cpzxrobot().device.v2.list | 删除设备（仅限v2设备）   |
+| cpzxrobot().device.v2.delete | 删除设备（仅限v2设备）   |
 | cpzxrobot().camera.xxx  | 获得摄像头的相关信息 |
 | cpzxrobot().factory.entry| 获得工厂的可显示动态信息 |
 | cpzxrobot().transport.fodder.getDeviceByFodderld | 获得料单对应的设备 |

package/types.d.ts

@@ -168,6 +168,28 @@ type WeightMeterSensor = {
   deviceId: number;
 };
 
+// {
+//       "id":1,
+//       "name":"qeq",
+//       "category":"wqe",
+//       "type":"111",
+//       "unitId":123123,
+//       "realDeviceId":123123,
+//       "location":"222",
+//       "supplier":"23132"
+//   }
+//新版设备类型，后续可能还会添加新的属性
+type DeviceV2 = {
+  id: number;
+  name: string;
+  category?: string;
+  type?: string;
+  unitId?: number;
+  realDeviceId?: number;
+  location?: string;
+  supplier?: string;
+};
+
 export type FeedTower = {
   id: number;
   name: string;
@@ -287,5 +309,6 @@ declare module "@cpzxrobot/sdk" {
     DeviceConfig,
     DataQueryArgs,
     HeatLamp,
+    DeviceV2,
   };
 }