@cpzxrobot/sdk 1.0.75 → 1.0.77

package/device_filter.ts

@@ -1,5 +1,6 @@
 import { Cpzxrobot, DataQueryArgs } from ".";
 import type { AxiosResponse } from "axios";
+import { FieldDatas, SensorDatas } from "./sensor_datas";
 
 export abstract class DeviceFilter<T extends { id: number }> {
   context: Cpzxrobot;
@@ -199,11 +200,15 @@ export abstract class DeviceFilter<T extends { id: number }> {
         }
       })
       .then((res: AxiosResponse) => {
-        if (res.data.Error) {
-          throw res.data.Error;
+        if (args.type == "raw") {
+          return res;
+        } else {
+          if (res.data.Error) {
+            throw res.data.Error;
+          }
+          // this.devices.push(res.data);
+          return res.data;
         }
-        // this.devices.push(res.data);
-        return res.data;
       });
   }
 

package/dist/device_filter.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceFilter = void 0;
+const sensor_datas_1 = require("./sensor_datas");
 class DeviceFilter {
     // private getDetail!: (info: T, id: number, context: Shzx) => Promise<any> | null
     // axios: MyAxiosInstance;
@@ -128,7 +129,7 @@ class DeviceFilter {
                     string = string.replace(/\r/g, "");
                     var arr = string.split("\n");
                     var inAnnotation = false;
-                    var dataGroups = new SensorDatas();
+                    var dataGroups = new sensor_datas_1.SensorDatas();
                     var field = null;
                     for (var i = 0; i < arr.length; i++) {
                         var values = arr[i].split(",");
@@ -138,7 +139,7 @@ class DeviceFilter {
                                 if (field) {
                                     dataGroups.push(field);
                                 }
-                                field = new FieldDatas();
+                                field = new sensor_datas_1.FieldDatas();
                             }
                             switch (values[0]) {
                                 case "#datatype":
@@ -179,11 +180,16 @@ class DeviceFilter {
             }
         })
             .then((res) => {
-            if (res.data.Error) {
-                throw res.data.Error;
+            if (args.type == "raw") {
+                return res;
+            }
+            else {
+                if (res.data.Error) {
+                    throw res.data.Error;
+                }
+                // this.devices.push(res.data);
+                return res.data;
             }
-            // this.devices.push(res.data);
-            return res.data;
         });
     }
     //按月获取数据：period = '1mo'，按天获取数据：period = '1d'

package/dist/sensor_datas.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SensorDatas = exports.FieldDatas = void 0;
 class FieldDatas {
     constructor() {
         this.datatypes = [];
@@ -33,6 +35,7 @@ class FieldDatas {
         return fields;
     }
 }
+exports.FieldDatas = FieldDatas;
 class SensorDatas {
     constructor() {
         this.data_fields = [];
@@ -70,3 +73,4 @@ class SensorDatas {
         return fields;
     }
 }
+exports.SensorDatas = SensorDatas;

package/package.json

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

package/sensor_datas.ts

@@ -1,5 +1,4 @@
-
-class FieldDatas {
+export class FieldDatas {
     datatypes: string[] = [];
     groups: boolean[] = [];
     defaults: string[] = [];
@@ -36,7 +35,7 @@ class FieldDatas {
     }
 }
 
-class SensorDatas {
+export class SensorDatas {
   push(datas: FieldDatas) {
     this.data_fields.push(datas);
   }

package/types.d.ts

@@ -5,6 +5,7 @@ import { UserGateway } from "@cpzxrobot/sdk/user_gateway";
 import { CameraGateway } from "@cpzxrobot/sdk/camera_gateway";
 import { PigfarmGateway } from "@cpzxrobot/sdk/pigfarm_gateway";
 import { UnitGateway } from "@cpzxrobot/sdk//unit_gateway";
+import { FieldDatas } from "./sensor_datas";
 
 type Device = {
   id: number;
@@ -19,7 +20,7 @@ type Device = {
   typeCode: string;
 };
 
-export type FeedTowerExtraInfo = {
+type FeedTowerExtraInfo = {
   currentAmount: number;
   loadAmount: number;
   feedTowerAmount: number;
@@ -29,7 +30,7 @@ export type FeedTowerExtraInfo = {
 };
 
 //FodderOrder 料单信息
-export type FodderOrder = {
+type FodderOrder = {
   id?: number;
   fodderId?: string;
   fodderAmount: number;
@@ -42,7 +43,7 @@ export type FodderOrder = {
   type?: string;
 };
 //
-export type FodderOrderList = {
+type FodderOrderList = {
   car: string; //车牌号
   date: string; //日期
   source: string; //来源
@@ -55,7 +56,7 @@ type FodderOrderInFactory = {
   towers: FodderOrderInTower[];
 };
 
-export type FodderOrderInTower = {
+type FodderOrderInTower = {
   name: string; //料塔名称
   unit: string; //单位
   weight: number; //重量
@@ -67,7 +68,7 @@ type Assistant = {
   name: String;
   id: Number;
 };
-export type Factory = {
+type Factory = {
   code: string;
   name?: string;
   company_code: string;
@@ -115,6 +116,21 @@ type DeviceConfig = {
   type?: string;
 };
 
+type FieldDatas = {
+  length: number;
+  valuesAt(at: string): Map<string, any>;
+  fields: string[];
+};
+
+type SensorDatas = {
+  push: (data: FieldDatas) => void;
+  datas: {
+    time: string;
+    [key: string]: any;
+  }[];
+  fields: string[];
+};
+
 type Electricity = {
   deviceId: string;
   nextDeviceList: number[] | [];
@@ -219,7 +235,7 @@ type FeedTowerV2 = {
   buildTime: string;
 };
 
-export type FeedTower = {
+type FeedTower = {
   id: number;
   name: string;
   currentAmount: number;
@@ -237,23 +253,23 @@ export type FeedTower = {
   diff: number;
 };
 
-export interface MyAxiosInstance {
+interface MyAxiosInstance {
   get: (url: string, config?: any) => Promise<any>;
   post: (url: string, data?: any, config?: any) => Promise<any>;
 }
 
-export interface Assistant {
+interface Assistant {
   info: String;
   status: Number;
   name: String;
   id: Number;
 }
-export interface ElectricMeter extends Device {
+interface ElectricMeter extends Device {
   coefficient: number;
   status: string;
 }
 
-export interface DataQueryArgs {
+interface DataQueryArgs {
   start?: string;
   stop?: string;
   type?:
@@ -271,7 +287,7 @@ export interface DataQueryArgs {
   [key: string]: any;
 }
 
-export class Cpzxrobot {
+class Cpzxrobot {
   transport: TransportGateway;
   ready: Promise<MyAxiosInstance>;
   factory: FactoryGateway;
@@ -290,7 +306,7 @@ export class Cpzxrobot {
   setTitle: (title: string) => void;
   saveBase64: (base64: string, filename: string) => void;
   saveBlob: (blob: Blob, filename: string) => void;
-  scanQrcode:() => Promise<string>;
+  scanQrcode: () => Promise<string>;
   vibrate: (time?: number) => void;
 }
 
@@ -342,5 +358,7 @@ declare module "@cpzxrobot/sdk" {
     DataQueryArgs,
     HeatLamp,
     DeviceV2,
+    FieldDatas,
+    SensorDatas,
   };
 }