@cpzxrobot/sdk 1.0.26 → 1.0.28

package/device_filter.ts

@@ -112,13 +112,28 @@ export abstract class DeviceFilter<T extends { id: number }> {
       type: "diffPerDay", // diffPerDay, sumPerDay, latest
     }
   ) {
-    if (!args.stop) {
-      args.stop = this.formateDateToYYYYMMDD(new Date());
+    if(!args.period || args.period.endsWith("d")) {
+      if (!args.stop) {
+        args.stop = this.formateDateToYYYYMMDD(new Date());
+      }
+      if (!args.start) {
+        const sevenDaysAgo = new Date();
+        sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
+        args.start = this.formateDateToYYYYMMDD(sevenDaysAgo);
+      }
+    }else if(args.period.endsWith("h")) {
+      if (!args.stop) {
+        args.stop = new Date().toISOString();
+      }
+      if (!args.start) {
+        const oneDayAgo = new Date();
+        oneDayAgo.setDate(oneDayAgo.getDate() - 1);
+        args.start = oneDayAgo.toISOString();
+      }
     }
-    if (!args.start) {
-      const sevenDaysAgo = new Date();
-      sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
-      args.start = this.formateDateToYYYYMMDD(sevenDaysAgo);
+
+    if(!args.type) {
+      args.type = "last";
     }
 
     return this.context.ready

package/device_gateway.ts

@@ -78,6 +78,7 @@ export class DeviceGateway extends Object {
             | null; //如果data为null，则不获取数据，只获取设备列表，否则获取设备列表和数据
           status?: string;
           unit?: Number;
+          type?: string;
           detail?: boolean;
           supplier?: string; //供应商,可用于过滤设备
         } = undefined

package/dist/device_filter.js

@@ -91,13 +91,28 @@ class DeviceFilter {
         stop: "",
         type: "diffPerDay", // diffPerDay, sumPerDay, latest
     }) {
-        if (!args.stop) {
-            args.stop = this.formateDateToYYYYMMDD(new Date());
+        if (!args.period || args.period.endsWith("d")) {
+            if (!args.stop) {
+                args.stop = this.formateDateToYYYYMMDD(new Date());
+            }
+            if (!args.start) {
+                const sevenDaysAgo = new Date();
+                sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
+                args.start = this.formateDateToYYYYMMDD(sevenDaysAgo);
+            }
+        }
+        else if (args.period.endsWith("h")) {
+            if (!args.stop) {
+                args.stop = new Date().toISOString();
+            }
+            if (!args.start) {
+                const oneDayAgo = new Date();
+                oneDayAgo.setDate(oneDayAgo.getDate() - 1);
+                args.start = oneDayAgo.toISOString();
+            }
         }
-        if (!args.start) {
-            const sevenDaysAgo = new Date();
-            sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7);
-            args.start = this.formateDateToYYYYMMDD(sevenDaysAgo);
+        if (!args.type) {
+            args.type = "last";
         }
         return this.context.ready
             .then(() => {

package/dist/factory_gateway.js

@@ -46,5 +46,11 @@ class FactoryGateway extends Object {
         const response = await axios.get(`/api/v1/factory/${data.id}/organizaion`, data);
         return response.data;
     }
+    //支持以下三个name:'capacity'(规模),'used_capacity'（存栏量）,'workshop_count'（栋舍/车间数量）,'manager'(负责人)
+    async entry(factory, name) {
+        var axios = await this.context.ready;
+        const response = await axios.get(`/api/v1/factory/${factory.id}/entry/${name}`);
+        return response.data;
+    }
 }
 exports.FactoryGateway = FactoryGateway;

package/factory_gateway.ts

@@ -51,4 +51,11 @@ export class FactoryGateway extends Object {
     const response = await axios.get(`/api/v1/factory/${data.id}/organizaion`, data);
     return response.data;
   }
+
+  //支持以下三个name:'capacity'(规模),'used_capacity'（存栏量）,'workshop_count'（栋舍/车间数量）,'manager'(负责人)
+  async entry(factory:Factory,name:string): Promise<any> {
+    var axios = await this.context.ready;
+    const response = await axios.get(`/api/v1/factory/${factory.id}/entry/${name}`);
+    return response.data;
+}
 }

package/package.json

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

package/readme.md

@@ -79,6 +79,7 @@ baseURL: "/"
 | cpzxrobot().device.feedTower.list | 获得料塔设备的列表   |
 | cpzxrobot().device.xxx  | 获得设备的相关信息   |
 | cpzxrobot().camera.xxx  | 获得摄像头的相关信息 |
+| cpzxrobot().factory.entry| 获得工厂的可显示动态信息 |
 
 ### 工厂信息接口