@cpzxrobot/sdk 1.0.27 → 1.0.29

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/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/dist/index.js

@@ -148,8 +148,14 @@ class Cpzxrobot {
                 });
             }
         }
-        else if (this.isLocalDomain(domain)) {
-            this.mode = "dev";
+        else {
+            if (this.isLocalDomain(domain)) {
+                this.mode = "dev";
+                console.log("欢迎使用上海正诚物联网IOT系统，您当前是开发环境，请在平台获取开发用jwt key，并传入devAuth设置");
+            }
+            else {
+                this.mode = "miniapp_in_web";
+            }
             this.setTitle = function (title) {
                 document.title = title;
             };
@@ -175,10 +181,6 @@ class Cpzxrobot {
                 URL.revokeObjectURL(url);
                 document.body.removeChild(a);
             };
-            console.log("欢迎使用上海正诚物联网IOT系统，您当前是开发环境，请在平台获取开发用jwt key，并传入devAuth设置");
-        }
-        else {
-            this.mode = "miniapp_in_web";
         }
     }
     isIosMiniApp(location) {
@@ -211,26 +213,43 @@ class Cpzxrobot {
             });
             return;
         }
-        this.initAxios(baseURL);
-        this.auth = auth;
-        this.axios
-            .post("/api/v1/user/auth", {
-            appCode: this.appCode,
-            auth: auth,
-        })
-            .then((res) => {
-            if (res.data.Error) {
-                throw res.data.Error;
+        else if (this.mode === "miniapp_in_web") {
+            //if url has token
+            const url = new URL(window.location.href);
+            const token = url.searchParams.get("token");
+            if (token) {
+                this.token = "Bearer " + token;
+                this.initAxios(baseURL);
+                this.resolveReady(this.axios);
+                return;
             }
             else {
-                this.token = "Bearer " + res.data.token;
+                //jump to miniapp login page
+                window.location.href = "https:///login";
             }
-            this.resolveReady(this.axios);
-        })
-            .catch((err) => {
-            console.log("shzx ready caller reject", err);
-            this.rejectReady(err);
-        });
+        }
+        else {
+            this.initAxios(baseURL);
+            this.auth = auth;
+            this.axios
+                .post("/api/v1/user/auth", {
+                appCode: this.appCode,
+                auth: auth,
+            })
+                .then((res) => {
+                if (res.data.Error) {
+                    throw res.data.Error;
+                }
+                else {
+                    this.token = "Bearer " + res.data.token;
+                }
+                this.resolveReady(this.axios);
+            })
+                .catch((err) => {
+                console.log("shzx ready caller reject", err);
+                this.rejectReady(err);
+            });
+        }
     }
     isLocalDomain(domain) {
         // 列出所有的本地开发域名

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/index.ts

@@ -179,8 +179,15 @@ export class Cpzxrobot {
           }, 1500);
         });
       }
-    } else if (this.isLocalDomain(domain)) {
-      this.mode = "dev";
+    } else {
+      if (this.isLocalDomain(domain)) {
+        this.mode = "dev";
+        console.log(
+          "欢迎使用上海正诚物联网IOT系统，您当前是开发环境，请在平台获取开发用jwt key，并传入devAuth设置"
+        );
+      } else {
+        this.mode = "miniapp_in_web";
+      }
       this.setTitle = function (title: string) {
         document.title = title;
       };
@@ -206,11 +213,6 @@ export class Cpzxrobot {
         URL.revokeObjectURL(url);
         document.body.removeChild(a);
       };
-      console.log(
-        "欢迎使用上海正诚物联网IOT系统，您当前是开发环境，请在平台获取开发用jwt key，并传入devAuth设置"
-      );
-    } else {
-      this.mode = "miniapp_in_web";
     }
   }
   isIosMiniApp(location: Location): boolean {
@@ -246,26 +248,40 @@ export class Cpzxrobot {
         this.resolveReady(this.axios);
       });
       return;
-    }
-    this.initAxios(baseURL);
-    this.auth = auth;
-    this.axios
-      .post("/api/v1/user/auth", {
-        appCode: this.appCode,
-        auth: auth,
-      })
-      .then((res) => {
-        if (res.data.Error) {
-          throw res.data.Error;
-        } else {
-          this.token = "Bearer " + res.data.token;
-        }
+    } else if (this.mode === "miniapp_in_web") {
+      //if url has token
+      const url = new URL(window.location.href);
+      const token = url.searchParams.get("token");
+      if (token) {
+        this.token = "Bearer " + token;
+        this.initAxios(baseURL);
         this.resolveReady(this.axios);
-      })
-      .catch((err) => {
-        console.log("shzx ready caller reject", err);
-        this.rejectReady(err);
-      });
+        return;
+      } else {
+        //jump to miniapp login page
+        window.location.href = "https:///login";
+      }
+    } else {
+      this.initAxios(baseURL);
+      this.auth = auth;
+      this.axios
+        .post("/api/v1/user/auth", {
+          appCode: this.appCode,
+          auth: auth,
+        })
+        .then((res) => {
+          if (res.data.Error) {
+            throw res.data.Error;
+          } else {
+            this.token = "Bearer " + res.data.token;
+          }
+          this.resolveReady(this.axios);
+        })
+        .catch((err) => {
+          console.log("shzx ready caller reject", err);
+          this.rejectReady(err);
+        });
+    }
   }
 
   isLocalDomain(domain: string): boolean {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cpzxrobot/sdk",
-  "version": "1.0.27",
+  "version": "1.0.29",
   "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| 获得工厂的可显示动态信息 |
 
 ### 工厂信息接口