@cpzxrobot/sdk 1.3.90 → 1.3.91

package/device_gateway.ts

@@ -216,7 +216,7 @@ export class DeviceGateway extends Object {
         // 参数验证
         if (!factoryId) {
           let farm = await this.context.user.getSelectedFarm();
-          factoryId = farm?.id;
+          factoryId = farm?.id || 0; 
         }
 
         return axios.get(`/api/v2/device/stat/alarms/rule`, {
@@ -238,8 +238,8 @@ export class DeviceGateway extends Object {
         const axios = await this.context.ready;
 
         // 参数验证
-        if (!ruleId || ruleId <= 0) {
-          throw new Error('规则ID不能为空且必须大于0');
+        if (!ruleId) {
+          throw new Error('规则ID不能为空');
         }
 
         return axios.get(`/api/v2/device/stat/alarms/rule/${ruleId}`).then((res) => {
@@ -261,7 +261,7 @@ export class DeviceGateway extends Object {
         // 参数验证
         if (!request.factoryId) {
           let farm = await this.context.user.getSelectedFarm();
-          request.factoryId = farm?.id;
+          request.factoryId = farm?.id || 0;
         }
         if (!request.ruleName) {
           throw new Error('规则名称不能为空');

package/dist/device_gateway.js

@@ -159,7 +159,7 @@ class DeviceGateway extends Object {
                 // 参数验证
                 if (!factoryId) {
                     let farm = yield this.context.user.getSelectedFarm();
-                    factoryId = farm === null || farm === void 0 ? void 0 : farm.id;
+                    factoryId = (farm === null || farm === void 0 ? void 0 : farm.id) || 0;
                 }
                 return axios.get(`/api/v2/device/stat/alarms/rule`, {
                     params: { factoryId }
@@ -178,8 +178,8 @@ class DeviceGateway extends Object {
             get: (ruleId) => __awaiter(this, void 0, void 0, function* () {
                 const axios = yield this.context.ready;
                 // 参数验证
-                if (!ruleId || ruleId <= 0) {
-                    throw new Error('规则ID不能为空且必须大于0');
+                if (!ruleId) {
+                    throw new Error('规则ID不能为空');
                 }
                 return axios.get(`/api/v2/device/stat/alarms/rule/${ruleId}`).then((res) => {
                     if (res.data.code !== 200) {
@@ -198,7 +198,7 @@ class DeviceGateway extends Object {
                 // 参数验证
                 if (!request.factoryId) {
                     let farm = yield this.context.user.getSelectedFarm();
-                    request.factoryId = farm === null || farm === void 0 ? void 0 : farm.id;
+                    request.factoryId = (farm === null || farm === void 0 ? void 0 : farm.id) || 0;
                 }
                 if (!request.ruleName) {
                     throw new Error('规则名称不能为空');

package/dist/factory_gateway.js

@@ -120,12 +120,28 @@ class FactoryGateway extends Object {
     //获得工厂的基础信息，城市，省份，建造信息等
     get info() {
         return {
-            get: (factory) => {
-                return this.context.axios.get(`/api/v2/factory/${factory.id}/info`);
-            },
-            post: (info) => {
-                return this.context.axios.post(`/api/v2/factory/${info.id}/info`, info);
-            },
+            get: (factory) => __awaiter(this, void 0, void 0, function* () {
+                var axios = yield this.context.ready;
+                const response = yield axios.get(`/api/v2/factory/${factory.id}/info`);
+                const body = response.data;
+                if (body.code === 200) {
+                    return body.data;
+                }
+                else {
+                    throw new Error(body.message);
+                }
+            }),
+            post: (info) => __awaiter(this, void 0, void 0, function* () {
+                var axios = yield this.context.ready;
+                const response = yield axios.post(`/api/v2/factory/${info.id}/info`, info);
+                const body = response.data;
+                if (body.code === 200) {
+                    return body.data;
+                }
+                else {
+                    throw new Error(body.message);
+                }
+            }),
         };
     }
     //获得工厂的所有车间信息

package/dist/index.js

@@ -133,7 +133,7 @@ class Cpzxrobot {
                 this.mode = "miniapp_in_web";
                 baseURL = "https://www.cpzxrobot.com";
             }
-            this.platform = new web_platform_1.WebPlatform(this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
+            this.platform = new web_platform_1.WebPlatform(this, this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
         }
         this.platformReady = this.platform.ready();
         this.axios = this.platform.getAxiosFromMiniApp();

package/dist/web_platform.js

@@ -11,14 +11,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WebPlatform = void 0;
 class WebPlatform {
-    constructor(appCode, baseURL, selectedFarm, selectedUnit) {
+    constructor(context, appCode, baseURL, selectedFarm, selectedUnit) {
         this.token = "";
         this.appCode = "";
         this.baseURL = "";
+        this.context = context;
         this.appCode = appCode;
         this.baseURL = baseURL !== null && baseURL !== void 0 ? baseURL : "";
-        this._selectedFarm = selectedFarm;
-        this._selectedUnit = selectedUnit;
+        this._defaultSelectedFarm = selectedFarm;
+        this._defaultSelectedUnit = selectedUnit;
     }
     addMessage(_message) {
         throw new Error("Method not implemented.");
@@ -31,9 +32,13 @@ class WebPlatform {
     }
     setSelectedFarm(farm) {
         this._selectedFarm = farm;
+        //保存到本地缓存
+        localStorage.setItem("selectedFarm", JSON.stringify(farm));
     }
     setSelectedUnit(unit) {
         this._selectedUnit = unit;
+        //保存到本地缓存
+        localStorage.setItem("selectedUnit", JSON.stringify(unit));
     }
     fetchWithAuth(input, init) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -337,9 +342,35 @@ class WebPlatform {
         return Promise.resolve(true);
     }
     getSelectedFarmFromMiniApp() {
-        return Promise.resolve(this._selectedFarm);
+        // 从本地缓存中获取选中的工厂
+        const farm = localStorage.getItem("selectedFarm");
+        if (farm) {
+            this._selectedFarm = JSON.parse(farm);
+            return Promise.resolve(this._selectedFarm);
+        }
+        else {
+            return new Promise((resolve, reject) => {
+                try {
+                    this.context.factory.info.get(this._defaultSelectedFarm).then(() => {
+                        // 成功获取默认选中的工厂后，将其赋值给 _selectedFarm
+                        this._selectedFarm = this._defaultSelectedFarm;
+                        resolve(this._selectedFarm);
+                    });
+                }
+                catch (error) {
+                    //表示用户没有相关工厂权限
+                    console.error("Failed to get default selected farm:", error);
+                    reject(error);
+                }
+            });
+        }
     }
     getSelectedUnitFromMiniApp() {
+        // 从本地缓存中获取选中的单位
+        const unit = localStorage.getItem("selectedUnit");
+        if (unit) {
+            this._selectedUnit = JSON.parse(unit);
+        }
         return Promise.resolve(this._selectedUnit);
     }
     jumpToMiniApp(url) {

package/factory_gateway.ts

@@ -105,12 +105,26 @@ export class FactoryGateway extends Object {
   //获得工厂的基础信息，城市，省份，建造信息等
   get info() {
     return {
-      get: (factory: Factory) => {
-        return this.context.axios.get(`/api/v2/factory/${factory.id}/info`);
-      },
-      post: (info: any) => {
-        return this.context.axios.post(`/api/v2/factory/${info.id}/info`, info);
+      get: async (factory: Factory) => {
+        var axios = await this.context.ready;
+        const response = await axios.get(`/api/v2/factory/${factory.id}/info`);
+        const body = response.data;
+        if (body.code === 200) {
+          return body.data;
+        }else{
+          throw new Error(body.message);
+        }
       },
+      post: async (info: any) => {
+        var axios = await this.context.ready;
+        const response = await axios.post(`/api/v2/factory/${info.id}/info`, info);
+        const body = response.data;
+        if (body.code === 200) {
+          return body.data;
+        }else{
+          throw new Error(body.message);
+        }
+      },  
     };
   }
 

package/index.ts

@@ -140,7 +140,7 @@ export class Cpzxrobot {
         this.mode = "miniapp_in_web";
         baseURL = "https://www.cpzxrobot.com"
       }
-      this.platform = new WebPlatform(this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
+      this.platform = new WebPlatform(this, this.appCode, baseURL, initSelectedFactory, initSelectedUnit);
     }
 
     this.platformReady = this.platform.ready();

package/package.json

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

package/web_platform.ts

@@ -1,5 +1,5 @@
 import { PlatformInterface } from "./platform_interface";
-import { Factory, MyAxiosInstance, Unit } from "./types";
+import { Cpzxrobot, Factory, MyAxiosInstance, Unit } from "./types";
 
 export class WebPlatform implements PlatformInterface {
   token: string = "";
@@ -7,12 +7,16 @@ export class WebPlatform implements PlatformInterface {
   baseURL: string = "";
   _selectedFarm: Factory | undefined;
   _selectedUnit: Unit | undefined;
+  _defaultSelectedFarm: Factory | undefined;
+  _defaultSelectedUnit: Unit | undefined;
+  context: Cpzxrobot;
 
-  constructor(appCode: string, baseURL: string, selectedFarm: Factory | undefined, selectedUnit: Unit | undefined) {
+  constructor(context: Cpzxrobot, appCode: string, baseURL: string, selectedFarm: Factory | undefined, selectedUnit: Unit | undefined) {
+    this.context = context;
     this.appCode = appCode;
     this.baseURL = baseURL ?? "";
-    this._selectedFarm = selectedFarm;
-    this._selectedUnit = selectedUnit;
+    this._defaultSelectedFarm = selectedFarm;
+    this._defaultSelectedUnit = selectedUnit;
   }
   addMessage(_message: any): void {
     throw new Error("Method not implemented.");
@@ -25,9 +29,13 @@ export class WebPlatform implements PlatformInterface {
   }
   setSelectedFarm(farm: Factory): void {
     this._selectedFarm = farm;
+    //保存到本地缓存
+    localStorage.setItem("selectedFarm", JSON.stringify(farm));
   }
   setSelectedUnit(unit: Unit): void {
     this._selectedUnit = unit;
+    //保存到本地缓存
+    localStorage.setItem("selectedUnit", JSON.stringify(unit));
   }
 
   async fetchWithAuth(input: RequestInfo, init?: RequestInit) {
@@ -340,10 +348,34 @@ export class WebPlatform implements PlatformInterface {
     return Promise.resolve(true);
   }
   getSelectedFarmFromMiniApp(): Promise<any> {
-    return Promise.resolve(this._selectedFarm);
+    // 从本地缓存中获取选中的工厂
+    const farm = localStorage.getItem("selectedFarm");
+    if (farm) {
+      this._selectedFarm = JSON.parse(farm);
+      return Promise.resolve(this._selectedFarm);
+    }else{
+      return new Promise<any>((resolve, reject) => {
+        try {
+          this.context.factory.info.get(this._defaultSelectedFarm).then(() => {
+            // 成功获取默认选中的工厂后，将其赋值给 _selectedFarm
+            this._selectedFarm = this._defaultSelectedFarm;
+            resolve(this._selectedFarm);
+          });
+        } catch (error) {
+          //表示用户没有相关工厂权限
+          console.error("Failed to get default selected farm:", error);
+          reject(error);
+        }
+      });
+    }
   }
 
   getSelectedUnitFromMiniApp(): Promise<any> {
+    // 从本地缓存中获取选中的单位
+    const unit = localStorage.getItem("selectedUnit");
+    if (unit) {
+      this._selectedUnit = JSON.parse(unit);
+    }
     return Promise.resolve(this._selectedUnit);
   }