@cpzxrobot/sdk 1.3.109 → 1.3.112

package/device_gateway.ts

@@ -154,6 +154,29 @@ export class DeviceGateway extends Object {
         });
       },
 
+      export: async (params: any = undefined) => {
+        let axios = await this.context.ready;
+        var url = `/api/v2/device/list/export`;
+        if (params) {
+          //if params is string
+          if (typeof params === "string") {
+            url = `/api/v2/device/list/export?${params}`;
+          }
+          // if params is object
+          else {
+            url = `/api/v2/device/list/export?${Object.keys(params)
+              .map((key) => `${key}=${params[key]}`)
+              .join("&")}`;
+          }
+        }
+
+        return axios.getAndSave(url, {
+          params: params,
+        }).then((res) => {
+          return res.data;
+        });
+      },
+
       preview: async (type: String, sn: any) => {
         let axios = await this.context.ready;
 

package/dist/device_gateway.js

@@ -99,6 +99,27 @@ class DeviceGateway extends Object {
                     return res.data;
                 });
             }),
+            export: (...args_1) => __awaiter(this, [...args_1], void 0, function* (params = undefined) {
+                let axios = yield this.context.ready;
+                var url = `/api/v2/device/list/export`;
+                if (params) {
+                    //if params is string
+                    if (typeof params === "string") {
+                        url = `/api/v2/device/list/export?${params}`;
+                    }
+                    // if params is object
+                    else {
+                        url = `/api/v2/device/list/export?${Object.keys(params)
+                            .map((key) => `${key}=${params[key]}`)
+                            .join("&")}`;
+                    }
+                }
+                return axios.getAndSave(url, {
+                    params: params,
+                }).then((res) => {
+                    return res.data;
+                });
+            }),
             preview: (type, sn) => __awaiter(this, void 0, void 0, function* () {
                 let axios = yield this.context.ready;
                 return axios.get(`/api/v2/device/iotValue/${type}/${sn}`).then((res) => {

package/dist/factory_gateway.js

@@ -85,10 +85,10 @@ class FactoryGateway extends Object {
             return axios.post("/api/v2/factory/role/delete?id=" + roleId);
         });
     }
-    users(id) {
-        return __awaiter(this, void 0, void 0, function* () {
+    users(id_1) {
+        return __awaiter(this, arguments, void 0, function* (id, scope = "current") {
             var axios = yield this.context.ready;
-            return axios.get("/api/v2/factory/" + id + "/users");
+            return axios.get("/api/v2/factory/" + id + "/users?scope=" + scope);
         });
     }
     //获得工厂的车间信息
@@ -117,6 +117,19 @@ class FactoryGateway extends Object {
             }),
         };
     }
+    get(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var axios = yield this.context.ready;
+            const response = yield axios.get(`/api/v1/factory/${id}`);
+            const body = response.data;
+            if (body.Error) {
+                throw new Error(body.Error);
+            }
+            else {
+                return body;
+            }
+        });
+    }
     //获得工厂的基础信息，城市，省份，建造信息等
     get info() {
         return {

package/dist/mobile_platform.js

@@ -116,11 +116,6 @@ class MobilePlatform {
             return this.platform.callHandler("getSelectedFarmFromMiniApp");
         });
     }
-    setSelectedFarmFromMiniApp(farmId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.platform.callHandler("setSelectedFarmFromMiniApp", farmId);
-        });
-    }
     getSelectedUnitFromMiniApp() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.platform.callHandler("getSelectedUnitFromMiniApp");

package/dist/web_platform.js

@@ -43,13 +43,18 @@ class WebPlatform {
     }
     setSelectedFarm(farm) {
         if (typeof farm === 'number') {
-            this._selectedFarm = { id: farm };
+            return this.context.factory.get(farm).then((f) => {
+                this._selectedFarm = f;
+                //保存到本地缓存
+                localStorage.setItem("selectedFarm", JSON.stringify(this._selectedFarm));
+                return Promise.resolve(true);
+            });
         }
         else {
             this._selectedFarm = farm;
         }
         //保存到本地缓存
-        localStorage.setItem("selectedFarm", JSON.stringify(farm));
+        localStorage.setItem("selectedFarm", JSON.stringify(this._selectedFarm));
         return Promise.resolve(true);
     }
     setSelectedUnit(unit) {

package/factory_gateway.ts

@@ -70,9 +70,9 @@ export class FactoryGateway extends Object {
     return axios.post("/api/v2/factory/role/delete?id=" + roleId);
   }
 
-  async users(id: number) {
+  async users(id: number, scope: "current" | "parents" | "children" = "current") {
     var axios = await this.context.ready;
-    return axios.get("/api/v2/factory/" + id+"/users");
+    return axios.get("/api/v2/factory/" + id+"/users?scope=" + scope);
   }
 
   //获得工厂的车间信息
@@ -102,6 +102,17 @@ export class FactoryGateway extends Object {
     };
   }
 
+  async get(id: number): Promise<Factory> {
+    var axios = await this.context.ready;
+    const response = await axios.get(`/api/v1/factory/${id}`);
+    const body = response.data;
+    if (body.Error) {
+      throw new Error(body.Error);
+    }else{
+      return body as Factory;
+    }
+  }
+
   //获得工厂的基础信息，城市，省份，建造信息等
   get info() {
     return {

package/mobile_platform.ts

@@ -118,10 +118,6 @@ export class MobilePlatform implements PlatformInterface {
     return this.platform.callHandler("getSelectedFarmFromMiniApp");
   }
 
-  async setSelectedFarmFromMiniApp(farmId: number): Promise<boolean> {
-    return this.platform.callHandler("setSelectedFarmFromMiniApp", farmId);
-  }
-
   async getSelectedUnitFromMiniApp(): Promise<any> {
     return this.platform.callHandler("getSelectedUnitFromMiniApp");
   }

package/package.json

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

package/types.d.ts

@@ -371,6 +371,20 @@ interface DataQueryArgs {
   aggerate?: string;
 }
 
+
+
+/**
+ * 设备告警统计响应接口
+ */
+interface DeviceAlarmStatsResponse {
+  /** 响应码 */
+  code: number;
+  /** 告警统计数据 */
+  data: DeviceAlarmStats;
+  /** 响应消息 */
+  message: string;
+}
+
 /**
  * 设备告警统计数据接口
  */
@@ -389,18 +403,6 @@ interface DeviceAlarmStats {
   maxResolveId: number;
 }
 
-/**
- * 设备告警统计响应接口
- */
-interface DeviceAlarmStatsResponse {
-  /** 响应码 */
-  code: number;
-  /** 告警统计数据 */
-  data: DeviceAlarmStats;
-  /** 响应消息 */
-  message: string;
-}
-
 /**
  * 设备报警统计列表项接口
  */

package/web_platform.ts

@@ -39,12 +39,17 @@ export class WebPlatform implements PlatformInterface {
   }
   setSelectedFarm(farm: Factory|number): Promise<boolean> {
     if (typeof farm === 'number') {
-      this._selectedFarm = {id: farm} as Factory;
+      return this.context.factory.get(farm).then((f:Factory) => {
+        this._selectedFarm = f;
+        //保存到本地缓存
+        localStorage.setItem("selectedFarm", JSON.stringify(this._selectedFarm));
+        return Promise.resolve(true);
+      });
     } else {
       this._selectedFarm = farm;
     }
     //保存到本地缓存
-    localStorage.setItem("selectedFarm", JSON.stringify(farm));
+    localStorage.setItem("selectedFarm", JSON.stringify(this._selectedFarm));
     return Promise.resolve(true);
   }
   setSelectedUnit(unit: Unit): void {