@cpzxrobot/sdk 1.3.69 → 1.3.71

package/company_gateway.ts

@@ -39,13 +39,14 @@ export class CompanyGateway extends Object {
 
   get data() {
     return {
-      export: async (companyId: string, supplier?: string, startDate?: string, endDate?: string) => {
+      export: async (companyId: string, supplier?: string,modelId?: string, startDate?: string, endDate?: string) => {
         var axios = await this.context.ready;
         return axios.getAndSave(`/api/v2/company/${companyId}/data/export`, {
           params: {
             supplier,
             startDate,
-            endDate
+            endDate,
+            model: modelId,
           }
         });
       }

package/device_filter.ts

@@ -160,8 +160,8 @@ export abstract class DeviceFilter<T extends { id: number }> {
             var dataGroups = new SensorDatas();
             var field: FieldDatas | null = null;
             for (var i = 0; i < arr.length; i++) {
-              var values = arr[i].split(",");
-              if (arr[i].startsWith("#")) {
+              var values = arr[i]!.split(",");
+              if (arr[i]!.startsWith("#")) {
                 if (!inAnnotation) {
                   inAnnotation = true;
                   if (field) {
@@ -188,7 +188,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
                 if (inAnnotation) {
                   inAnnotation = false;
                   for (var j = 0; j < values.length; j++) {
-                    field!.columns.set(values[j], j);
+                    field!.columns.set(values[j]!, j);
                   }
                 } else {
                   field!.values.push(values);
@@ -240,7 +240,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
         const matcher = args.start.match(/-(\d+)(\w+)/);
         if (matcher) {
           d = new Date();
-          const num = parseInt(matcher[1]);
+          const num = parseInt(matcher[1]!);
           const unit = matcher[2];
           if (unit == "y") {
             d.setFullYear(d.getFullYear() - num);

package/device_gateway.ts

@@ -75,6 +75,16 @@ export class DeviceGateway extends Object {
   filters: Map<string, DeviceFilter<any>>;
   public normalFilter: NormalGateway;
   context: Cpzxrobot;
+  public categories = [
+    { id: 0, name: '网关',order: 4 }, //排序时网关优先级不高
+    { id: 1, name: '传感器',order: 1 },
+    { id: 2, name: '执行器',order: 2 },
+    { id: 3, name: 'AI设备',order: 3 },
+    { id: 4, name: '业务数据',order: 5 },
+    { id: 5, name: '设备参数',order: 6 },
+    { id: 8, name: '生产设备',order: 7 },
+    { id: 9, name: '设备部件',order: 8 },
+  ];
 
   get v2() {
     return {
@@ -355,8 +365,8 @@ export class DeviceGateway extends Object {
     var columns: string[] = [];
     var faults: DeviceFault[] = [];
     for (var i = 0; i < arr.length; i++) {
-      var values = arr[i].split(",");
-      if (arr[i].startsWith("#")) {
+      var values = arr[i]!.split(",");
+      if (arr[i]!.startsWith("#")) {
       } else if (arr[i] != "") {
         if (inAnnotation) {
           inAnnotation = false;

package/device_types/feedtower.ts

@@ -14,7 +14,7 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
     return "FeedTower";
   }
 
-  async getDetail(info: FeedTower, id: number) {
+  override async getDetail(info: FeedTower, id: number) {
     var axios = await this.context.ready;
     return axios
       .post("/api/v1/pigfarm/device/status/detail?deviceId=" + id)
@@ -27,9 +27,9 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
       });
   }
 
-  async wrapData(id: number, args: DataQueryArgs, p1: Promise<any>) {
+  override async wrapData(id: number, args: DataQueryArgs, p1: Promise<any>) {
     const ps = [p1];
-    if (!args.ingoreInput) {
+    if (!args["ingoreInput"]) {
       var axios = await this.context.ready;
       ps.push(
         axios.post(`/api/v1/pigfarm/device/fodder`, {
@@ -43,7 +43,7 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
       if (res[0].data.Error) {
         throw res[0].data.Error;
       } else {
-        if (!args.ingoreInput) {
+        if (!args["ingoreInput"]) {
           if (res[1].data.data.list == undefined) {
             throw "未查询到饲料下料数据，请联系管理员";
           }
@@ -56,7 +56,7 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
     });
   }
 
-  async wrapList(list: FeedTower[]): Promise<FeedTower[]> {
+  override async wrapList(list: FeedTower[]): Promise<FeedTower[]> {
     const ids = list.map((device) => device.id);
     var axios = await this.context.ready;
     //TODO 其他设备的详情需要支持，目前只有喂料塔

package/dist/camera_gateway.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CameraGateway = void 0;
 class CameraGateway extends Object {
@@ -7,55 +16,65 @@ class CameraGateway extends Object {
         this.context = context;
     }
     //查询摄像头，如果传unit，按单元搜索，或者有unit_id，优先使用unit_id，然后使用workshop_id，最后使用factory_id，查询对应的摄像头
-    async search(data) {
-        var axios = await this.context.ready;
-        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;
-        }
-        else {
-            params = { unit_id: data.id };
-        }
-        const response = await axios.post("/api/v1/camera/search", params);
-        return response.data;
+    search(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            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;
+            }
+            else {
+                params = { unit_id: data.id };
+            }
+            const response = yield axios.post("/api/v1/camera/search", params);
+            return response.data;
+        });
     }
     //获得摄像头的播放地址
-    async getUrl(data) {
-        var axios = await this.context.ready;
-        const response = await axios.get(`/api/v1/camera/${data.id}/url/wss`);
-        return response.data;
+    getUrl(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            const response = yield axios.get(`/api/v1/camera/${data.id}/url/wss`);
+            return response.data;
+        });
     }
     //获取工厂天气
-    async weather(id) {
-        var axios = await this.context.ready;
-        const response = await axios.get(`/api/v1/weather?factoryId=${id}`);
-        return response.data;
+    weather(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            const response = yield axios.get(`/api/v1/weather?factoryId=${id}`);
+            return response.data;
+        });
     }
-    async control(data, action, start, stop) {
-        var axios = await this.context.ready;
-        var url = `/api/v1/camera/${data.id}/control/${action}`;
-        if (start) {
-            url += `?start=${start}`;
-        }
-        else if (stop) {
-            url += `?stop=${stop}`;
-        }
-        const response = await axios.get(url);
-        return response.data;
+    control(data, action, start, stop) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            var url = `/api/v1/camera/${data.id}/control/${action}`;
+            if (start) {
+                url += `?start=${start}`;
+            }
+            else if (stop) {
+                url += `?stop=${stop}`;
+            }
+            const response = yield axios.get(url);
+            return response.data;
+        });
     }
     // 获取摄像头历史视频回放地址
-    async playback(data) {
-        var axios = await this.context.ready;
-        var url = `/api/v1/camera/${data.id}/playback`;
-        if (data.start) {
-            url += `?start=${encodeURIComponent(data.start)}`;
-        }
-        if (data.end) {
-            url += `${data.start ? '&' : '?'}end=${encodeURIComponent(data.end)}`;
-        }
-        const response = await axios.get(url);
-        return response.data;
+    playback(data) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            var url = `/api/v1/camera/${data.id}/playback`;
+            if (data.start) {
+                url += `?start=${encodeURIComponent(data.start)}`;
+            }
+            if (data.end) {
+                url += `${data.start ? '&' : '?'}end=${encodeURIComponent(data.end)}`;
+            }
+            const response = yield axios.get(url);
+            return response.data;
+        });
     }
 }
 exports.CameraGateway = CameraGateway;

package/dist/car_gateway.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CarGateway = void 0;
 class CarGateway extends Object {
@@ -6,36 +15,46 @@ class CarGateway extends Object {
         super();
         this.context = context;
     }
-    async weightRecords(factory, date) {
-        var axios = await this.context.ready;
-        return axios
-            .get(`/api/v2/car/${factory.pid}/weightRecords?date=` + date.toISOString())
-            .then((res) => res.data);
+    weightRecords(factory, date) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            return axios
+                .get(`/api/v2/car/${factory.pid}/weightRecords?date=` + date.toISOString())
+                .then((res) => res.data);
+        });
     }
-    async detections(factory, date) {
-        var axios = await this.context.ready;
-        return axios
-            .get(`/api/v2/car/${factory.pid}/detections?date=` + date.toISOString())
-            .then((res) => res.data);
+    detections(factory, date) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            return axios
+                .get(`/api/v2/car/${factory.pid}/detections?date=` + date.toISOString())
+                .then((res) => res.data);
+        });
     }
-    async cars(factory) {
-        var axios = await this.context.ready;
-        return axios
-            .get(`/api/v2/car/${factory.pid}/cars`)
-            .then((res) => res.data);
+    cars(factory) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            return axios
+                .get(`/api/v2/car/${factory.pid}/cars`)
+                .then((res) => res.data);
+        });
     }
     //根据工厂pid获取订单列表，注意，该接口和
-    async orders(factory, date) {
-        var axios = await this.context.ready;
-        return axios
-            .get(`/api/v2/car/${factory.pid}/orders?date=` + date.toISOString());
+    orders(factory, date) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            return axios
+                .get(`/api/v2/car/${factory.pid}/orders?date=` + date.toISOString());
+        });
     }
-    async ordersByFactory(factory, date) {
-        var axios = await this.context.ready;
-        //filter=未分配的
-        return axios
-            .get(`/api/v2/car/${factory.id}/order?date=` + date.toISOString() + "&filter=unallocated")
-            .then((res) => res.data);
+    ordersByFactory(factory, date) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            //filter=未分配的
+            return axios
+                .get(`/api/v2/car/${factory.id}/order?date=` + date.toISOString() + "&filter=unallocated")
+                .then((res) => res.data);
+        });
     }
     listByProvince(area_code) {
         return this.context.ready.then((axios) => {
@@ -65,13 +84,17 @@ class CarGateway extends Object {
     //   "manualCarWeightTime":"2025-05-08 08:20:49"
     // }
     // 增加手动重量记录或者增加称重记录
-    async updateRecord(factory, record) {
-        var axios = await this.context.ready;
-        return axios.post(`/api/v2/car/${factory.pid}/weightRecord`, record);
+    updateRecord(factory, record) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            return axios.post(`/api/v2/car/${factory.pid}/weightRecord`, record);
+        });
     }
-    async addRecord(factory, record) {
-        var axios = await this.context.ready;
-        return axios.post(`/api/v2/car/${factory.pid}/weightRecord`, record);
+    addRecord(factory, record) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            return axios.post(`/api/v2/car/${factory.pid}/weightRecord`, record);
+        });
     }
 }
 exports.CarGateway = CarGateway;

package/dist/chickenfarm_gateway.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ChickenFarmGateway = void 0;
 class ChickenFarmGateway extends Object {
@@ -9,11 +18,11 @@ class ChickenFarmGateway extends Object {
     //获得日龄
     get deadDetection() {
         return {
-            by_factory: async (factory, status = "running") => {
+            by_factory: (factory_1, ...args_1) => __awaiter(this, [factory_1, ...args_1], void 0, function* (factory, status = "running") {
                 return this.context.ready.then((axios) => {
                     return axios.get(`api/v2/diedchicken/task/factory=${factory.id}/status=${status}`);
                 });
-            },
+            }),
             detail: (taskId, offset = 0, size = 10) => {
                 return this.context.ready.then((axios) => {
                     return axios.get(`api/v2/diedchicken/task/${taskId}`, {