@cpzxrobot/sdk 1.3.105 → 1.3.106

package/dist/mobile_platform.js

@@ -35,7 +35,12 @@ class MobilePlatform {
     setToken(_token) {
     }
     setSelectedFarm(_farm) {
-        throw new Error("Method not implemented.");
+        if (typeof _farm === 'number') {
+            return this.platform.callHandler("setSelectedFarm", _farm);
+        }
+        else {
+            return this.platform.callHandler("setSelectedFarm", _farm.id);
+        }
     }
     setSelectedUnit(unit) {
         this.platform.callHandler("selectUnit", unit).then((_res) => {
@@ -111,6 +116,11 @@ 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/user_gateway.js

@@ -21,6 +21,12 @@ class UserGateway extends Object {
             return this.context.platform.getSelectedFarmFromMiniApp();
         });
     }
+    //选择工厂
+    selectFarm(farm) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.context.platform.setSelectedFarm(farm);
+        });
+    }
     selectUnit(unit) {
         return __awaiter(this, void 0, void 0, function* () {
             if (typeof unit === 'string' || typeof unit === 'number') {

package/dist/web_platform.js

@@ -42,9 +42,15 @@ class WebPlatform {
         this.token = token;
     }
     setSelectedFarm(farm) {
-        this._selectedFarm = farm;
+        if (typeof farm === 'number') {
+            this._selectedFarm = { id: farm };
+        }
+        else {
+            this._selectedFarm = farm;
+        }
         //保存到本地缓存
         localStorage.setItem("selectedFarm", JSON.stringify(farm));
+        return Promise.resolve(true);
     }
     setSelectedUnit(unit) {
         this._selectedUnit = unit;

package/dist/windows_platform.js

@@ -33,7 +33,15 @@ class WindwosMiniAppPlatform {
     setToken(_token) {
     }
     setSelectedFarm(_farm) {
-        throw new Error("Method not implemented.");
+        var _a, _b, _c, _d;
+        if (typeof _farm === 'number') {
+            // @ts-ignore
+            return (_b = (_a = window.miniapp).selectFactoryById) === null || _b === void 0 ? void 0 : _b.call(_a, _farm);
+        }
+        else {
+            // @ts-ignore
+            return (_d = (_c = window.miniapp).selectFactoryById) === null || _d === void 0 ? void 0 : _d.call(_c, _farm.id);
+        }
     }
     setSelectedUnit(unit) {
         var _a, _b;

package/mobile_platform.ts

@@ -33,8 +33,12 @@ export class MobilePlatform implements PlatformInterface {
   setToken(_token: string): void {
   }
 
-  setSelectedFarm(_farm: Factory): void {
-    throw new Error("Method not implemented.");
+  setSelectedFarm(_farm: Factory|number): Promise<boolean> {
+    if (typeof _farm === 'number') {
+      return this.platform.callHandler("setSelectedFarm", _farm);
+    } else {
+      return this.platform.callHandler("setSelectedFarm", _farm.id);
+    }
   }
   setSelectedUnit(unit: Unit): void {
     this.platform.callHandler("selectUnit", unit).then((_res: any) => {
@@ -114,6 +118,10 @@ 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.105",
+  "version": "1.3.106",
   "description": "提供给上海正芯数智APP第三方H5应用使用的SDK",
   "main": "dist/index.js",
   "scripts": {

package/platform_interface.ts

@@ -30,7 +30,7 @@ export abstract class PlatformInterface {
   abstract getAxiosFromMiniApp(): MyAxiosInstance;
   abstract ready(): Promise<boolean>;
   abstract setSelectedUnit(unit: Unit | String | Number): void;
-  abstract setSelectedFarm(farm: Factory | String | Number): void;
+  abstract setSelectedFarm(farm: Factory | Number): Promise<boolean>;
   //change factory
   abstract openFactorySelector():void;
   abstract aiAssist(args:AiAssistRequest):void;

package/types.d.ts

@@ -729,6 +729,10 @@ interface AlarmRuleDetail {
   thresholdConfigs?: AlarmRuleThresholdConfig[];
   /** 报警配置列表 */
   alarmConfigs?: AlarmRuleAlarmConfig[];
+  /** 继承自的报警规则id */
+  inheritedFrom?: number;
+  /** 激活规则的工厂数量 */
+  upperActiveSum?: number;
 }
 
 /**

package/user_gateway.ts

@@ -13,6 +13,11 @@ export class UserGateway extends Object {
     return this.context.platform.getSelectedFarmFromMiniApp()
   }
 
+  //选择工厂
+  public async selectFarm(farm: Factory | number) {
+    return this.context.platform.setSelectedFarm(farm)
+  }
+
   public async selectUnit(unit: Unit | String | Number) {
     if (typeof unit === 'string' || typeof unit === 'number') {
       var resp = await this.context.unit.get(unit)

package/web_platform.ts

@@ -37,10 +37,15 @@ export class WebPlatform implements PlatformInterface {
   setToken(token: string): void {
     this.token = token;
   }
-  setSelectedFarm(farm: Factory): void {
-    this._selectedFarm = farm;
+  setSelectedFarm(farm: Factory|number): Promise<boolean> {
+    if (typeof farm === 'number') {
+      this._selectedFarm = {id: farm} as Factory;
+    } else {
+      this._selectedFarm = farm;
+    }
     //保存到本地缓存
     localStorage.setItem("selectedFarm", JSON.stringify(farm));
+    return Promise.resolve(true);
   }
   setSelectedUnit(unit: Unit): void {
     this._selectedUnit = unit;

package/windows_platform.ts

@@ -25,8 +25,14 @@ export class WindwosMiniAppPlatform implements PlatformInterface {
   }
   setToken(_token: string): void {
   }
-  setSelectedFarm(_farm: Factory): void {
-    throw new Error("Method not implemented.");
+  setSelectedFarm(_farm: Factory|number): Promise<boolean> {
+    if (typeof _farm === 'number') {
+      // @ts-ignore
+      return window.miniapp.selectFactoryById?.(_farm);
+    } else {
+      // @ts-ignore
+      return window.miniapp.selectFactoryById?.(_farm.id);
+    }
   }
   setSelectedUnit(unit: Unit): void {
     // @ts-ignore