@cpzxrobot/sdk 1.0.74 → 1.0.76

package/device_filter.ts

@@ -1,7 +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;
@@ -115,7 +114,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
       type: "diffPerDay", // diffPerDay, sumPerDay, latest
     }
   ) {
-    if(!args.period || args.period.endsWith("d")) {
+    if (!args.period || args.period.endsWith("d")) {
       if (!args.stop) {
         args.stop = this.formateDateToYYYYMMDD(new Date());
       }
@@ -124,7 +123,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
         sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
         args.start = this.formateDateToYYYYMMDD(sevenDaysAgo);
       }
-    }else if(args.period.endsWith("h")) {
+    } else if (args.period.endsWith("h")) {
       if (!args.stop) {
         args.stop = new Date().toISOString();
       }
@@ -135,7 +134,7 @@ export abstract class DeviceFilter<T extends { id: number }> {
       }
     }
 
-    if(!args.type) {
+    if (!args.type) {
       args.type = "last";
     }
 
@@ -147,8 +146,58 @@ export abstract class DeviceFilter<T extends { id: number }> {
             params: args,
           }
         );
-
-        return this.wrapData(id, args, p1);
+        if (args.type == "raw") {
+          return p1.then((res: AxiosResponse) => {
+            var string = res.data.data as string;
+            string = string.replace(/\r/g, "");
+            var arr = string.split("\n");
+            var inAnnotation = false;
+            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("#")) {
+                if (!inAnnotation) {
+                  inAnnotation = true;
+                  if (field) {
+                    dataGroups.push(field);
+                  }
+                  field = new FieldDatas();
+                }
+                switch (values[0]) {
+                  case "#datatype":
+                    field!.datatypes = values.slice(1);
+                    break;
+                  case "#group":
+                    field!.groups = values
+                      .slice(1)
+                      .map((item) => item == "true");
+                    break;
+                  case "#default":
+                    field!.defaults = values.slice(1);
+                    break;
+                  default:
+                    break;
+                }
+              } else if (arr[i] != "") {
+                if (inAnnotation) {
+                  inAnnotation = false;
+                  for (var j = 0; j < values.length; j++) {
+                    field!.columns.set(values[j], j);
+                  }
+                } else {
+                  field!.values.push(values);
+                }
+              }
+            }
+            if (field) {
+              dataGroups!.push(field);
+            }
+            return dataGroups;
+          });
+        } else {
+          return this.wrapData(id, args, p1);
+        }
       })
       .then((res: AxiosResponse) => {
         if (res.data.Error) {

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;
@@ -122,7 +123,61 @@ class DeviceFilter {
             const p1 = this.context.axios.get(`/api/v1/device/${id}/data/${args.type}`, {
                 params: args,
             });
-            return this.wrapData(id, args, p1);
+            if (args.type == "raw") {
+                return p1.then((res) => {
+                    var string = res.data.data;
+                    string = string.replace(/\r/g, "");
+                    var arr = string.split("\n");
+                    var inAnnotation = false;
+                    var dataGroups = new sensor_datas_1.SensorDatas();
+                    var field = null;
+                    for (var i = 0; i < arr.length; i++) {
+                        var values = arr[i].split(",");
+                        if (arr[i].startsWith("#")) {
+                            if (!inAnnotation) {
+                                inAnnotation = true;
+                                if (field) {
+                                    dataGroups.push(field);
+                                }
+                                field = new sensor_datas_1.FieldDatas();
+                            }
+                            switch (values[0]) {
+                                case "#datatype":
+                                    field.datatypes = values.slice(1);
+                                    break;
+                                case "#group":
+                                    field.groups = values
+                                        .slice(1)
+                                        .map((item) => item == "true");
+                                    break;
+                                case "#default":
+                                    field.defaults = values.slice(1);
+                                    break;
+                                default:
+                                    break;
+                            }
+                        }
+                        else if (arr[i] != "") {
+                            if (inAnnotation) {
+                                inAnnotation = false;
+                                for (var j = 0; j < values.length; j++) {
+                                    field.columns.set(values[j], j);
+                                }
+                            }
+                            else {
+                                field.values.push(values);
+                            }
+                        }
+                    }
+                    if (field) {
+                        dataGroups.push(field);
+                    }
+                    return dataGroups;
+                });
+            }
+            else {
+                return this.wrapData(id, args, p1);
+            }
         })
             .then((res) => {
             if (res.data.Error) {

package/dist/sensor_datas.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SensorDatas = exports.FieldDatas = void 0;
+class FieldDatas {
+    constructor() {
+        this.datatypes = [];
+        this.groups = [];
+        this.defaults = [];
+        this.values = [];
+        this.columns = new Map();
+    }
+    get length() {
+        return this.values.length;
+    }
+    valuesAt(at) {
+        var values = new Map();
+        for (var i = 0; i < this.values.length; i++) {
+            if (this.values[i][this.columns.get("_time")] == at) {
+                var field = this.values[i][this.columns.get("_field")];
+                var value = this.values[i][this.columns.get("_value")];
+                values.set(field, value);
+                break;
+            }
+        }
+        return values;
+    }
+    get fields() {
+        var fields = ["time"];
+        for (var i = 0; i < this.values.length; i++) {
+            var field = this.values[i][this.columns.get("_field")];
+            if (fields.indexOf(field) == -1) {
+                fields.push(field);
+            }
+        }
+        return fields;
+    }
+}
+exports.FieldDatas = FieldDatas;
+class SensorDatas {
+    constructor() {
+        this.data_fields = [];
+    }
+    push(datas) {
+        this.data_fields.push(datas);
+    }
+    get datas() {
+        var datas = [];
+        for (var i = 0; i < this.data_fields[0].values.length; i++) {
+            var data = {
+                time: this.data_fields[0].values[i][this.data_fields[0].columns.get("_time")],
+            };
+            for (var j = 0; j < this.data_fields.length; j++) {
+                var field = this.data_fields[j];
+                var values = field.valuesAt(data.time);
+                for (let [key, value] of values.entries()) {
+                    data[key] = value;
+                }
+            }
+            datas.push(data);
+        }
+        return datas;
+    }
+    get fields() {
+        var fields = [];
+        for (var i = 0; i < this.data_fields.length; i++) {
+            var subfields = this.data_fields[i].fields;
+            for (var j = 0; j < subfields.length; j++) {
+                if (fields.indexOf(subfields[j]) == -1) {
+                    fields.push(subfields[j]);
+                }
+            }
+        }
+        return fields;
+    }
+}
+exports.SensorDatas = SensorDatas;

package/index.ts

@@ -32,10 +32,10 @@ export class Cpzxrobot {
   _getSelectedFarmFromMiniApp!: () => any;
   _getSelectedUnitFromMiniApp!: () => any;
   _jumpToMiniApp!: (url: string) => any;
-  scanQrcode!:() => Promise<string>;
   setTitle!: (title: string) => void;
   saveBase64!: (base64: string, filename: string) => void;
   saveBlob!: (blob: Blob, filename: string) => void;
+  scanQrcode!:() => Promise<string>;
   vibrate!: (time?: number) => void;
   assistant: AssistantGateway;
   energy: EnergyGateway;

package/package.json

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

package/sensor_datas.ts

@@ -0,0 +1,82 @@
+export class FieldDatas {
+    datatypes: string[] = [];
+    groups: boolean[] = [];
+    defaults: string[] = [];
+    values: string[][] = [];
+    columns: Map<String, number> = new Map();
+
+    get length() {
+        return this.values.length;
+    }
+
+
+    valuesAt(at: string) {
+        var values: Map<string, any> = new Map();
+        for (var i = 0; i < this.values.length; i++) {
+            if (this.values[i][this.columns.get("_time")!] == at) {
+                var field = this.values[i][this.columns.get("_field")!];
+                var value = this.values[i][this.columns.get("_value")!];
+                values.set(field, value);
+                break;
+            }
+        }
+        return values;
+    }
+
+    get fields() {
+        var fields: string[] = ["time"];
+        for (var i = 0; i < this.values.length; i++) {
+            var field = this.values[i][this.columns.get("_field")!];
+            if (fields.indexOf(field) == -1) {
+                fields.push(field);
+            }
+        }
+        return fields;
+    }
+}
+
+export class SensorDatas {
+  push(datas: FieldDatas) {
+    this.data_fields.push(datas);
+  }
+  data_fields: FieldDatas[] = [];
+
+  get datas() {
+    var datas: {
+      time: string;
+      [key: string]: any;
+    }[] = [];
+    for (var i = 0; i < this.data_fields[0].values.length; i++) {
+      var data: {
+        time: string;
+        [key: string]: any;
+      } = {
+        time: this.data_fields[0].values[i][
+          this.data_fields[0].columns.get("_time")!
+        ],
+      };
+      for (var j = 0; j < this.data_fields.length; j++) {
+        var field = this.data_fields[j];
+        var values = field.valuesAt(data.time);
+        for (let [key, value] of values.entries()) {
+          data[key] = value;
+        }
+      }
+      datas.push(data);
+    }
+    return datas;
+  }
+
+  get fields() {
+    var fields: string[] = [];
+    for (var i = 0; i < this.data_fields.length; i++) {
+      var subfields = this.data_fields[i].fields;
+      for (var j = 0; j < subfields.length; j++) {
+        if (fields.indexOf(subfields[j]) == -1) {
+          fields.push(subfields[j]);
+        }
+      }
+    }
+    return fields;
+  }
+}

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?:
@@ -264,13 +280,14 @@ export interface DataQueryArgs {
     | "latest"
     | "latestInRangePerDay"
     | "last"
+    | "raw"
     | "difference";
   period?: "1mo" | "1d" | null;
   offset?: string; // 可以设置统计偏移量，比如设置18h, 则统计从当天晚上6点开始
   [key: string]: any;
 }
 
-export class Cpzxrobot {
+class Cpzxrobot {
   transport: TransportGateway;
   ready: Promise<MyAxiosInstance>;
   factory: FactoryGateway;
@@ -289,6 +306,8 @@ export class Cpzxrobot {
   setTitle: (title: string) => void;
   saveBase64: (base64: string, filename: string) => void;
   saveBlob: (blob: Blob, filename: string) => void;
+  scanQrcode: () => Promise<string>;
+  vibrate: (time?: number) => void;
 }
 
 declare global {
@@ -339,5 +358,7 @@ declare module "@cpzxrobot/sdk" {
     DataQueryArgs,
     HeatLamp,
     DeviceV2,
+    FieldDatas,
+    SensorDatas,
   };
 }