@cpzxrobot/sdk 1.1.4 → 1.1.6

package/device_filter.ts

@@ -330,22 +330,22 @@ export abstract class DeviceFilter<T extends { id: number }> {
     options:
       | undefined
       | {
-          id?: Number | null | undefined;
-          data?:
-            | "diffPerDay"
-            | "sumPerDay"
-            | "latest"
-            | "weekoverweek"
-            | "last"
-            | "rangeOfDay"
-            | "rangeToday"
-            | null; //如果data为null，则不获取数据，只获取设备列表，否则获取设备列表和数据
-          status?: string;
-          unit?: Number;
-          detail?: boolean;
-          type?: string;
-          supplier?: string; //供应商,可用于过滤设备
-        } = undefined
+        id?: Number | null | undefined;
+        data?:
+        | "diffPerDay"
+        | "sumPerDay"
+        | "latest"
+        | "weekoverweek"
+        | "last"
+        | "rangeOfDay"
+        | "rangeToday"
+        | null; //如果data为null，则不获取数据，只获取设备列表，否则获取设备列表和数据
+        status?: string;
+        unit?: Number;
+        detail?: boolean;
+        type?: string;
+        supplier?: string; //供应商,可用于过滤设备
+      } = undefined
   ): Promise<T[]> {
     // if (this.devices.length > 0) {
     //   return Promise.resolve(this.devices)

package/dist/factory_gateway.js

@@ -23,6 +23,29 @@ class FactoryGateway extends Object {
         const response = await axios.get(`/api/v1/workshop/unit/${id}`);
         return response.data;
     }
+    //获得工厂的应用信息, 如果指定withRoles为true，则返回app和app的详细角色信息
+    async apps(id, withRoles = false) {
+        var axios = await this.context.ready;
+        var url = `/api/v2/factory/${id}/apps`;
+        if (withRoles) {
+            url += "/roles";
+        }
+        const response = await axios.get(url);
+        return response.data;
+    }
+    async roles(id) {
+        var axios = await this.context.ready;
+        return axios.get("/api/v2/factory/" + id + "/roles");
+    }
+    async addRole(id, data) {
+        data.factoryId = id;
+        var axios = await this.context.ready;
+        return axios.post("/api/v2/factory/role", data);
+    }
+    async users(id) {
+        var axios = await this.context.ready;
+        return axios.get("/api/v2/factory/" + id + "/users");
+    }
     //获得工厂的车间信息
     get workshop() {
         return {

package/dist/pigfarm_gateway.js

@@ -198,6 +198,19 @@ class PigfarmGateway extends Object {
                 var axios = await this.context.ready;
                 return axios.post(`/api/v1/pigfarm/heatLamp/config/list?unitId=${unit.id}`);
             },
+            template: {
+                //获取配置模版列表
+                list: async (factory) => {
+                    var axios = await this.context.ready;
+                    return axios.get(`/api/v1/pigfarm/heatLamp/config/template/list/${factory.id}`);
+                },
+                //增加模板
+                add: (factory, name, data) => {
+                    return this.context.ready.then((axios) => {
+                        return axios.post(`/api/v1/pigfarm/heatLamp/config/add`, Object.assign(Object.assign({}, data), { factoryId: factory.id, templateName: name }));
+                    });
+                },
+            },
             list: async (unit) => {
                 var axios = await this.context.ready;
                 return axios.post(`/api/v1/pigfarm/heatLamp/list/${unit.id}`);

package/dist/user_gateway.js

@@ -105,11 +105,7 @@ class UserGateway extends Object {
     }
     async list(factory) {
         var axios = await this.context.ready;
-        return axios.get("/api/v2/user/list/" + factory.id);
-    }
-    async roles() {
-        var axios = await this.context.ready;
-        return axios.get("/api/v2/user/role/list");
+        return axios.get("/api/v2/" + factory.id + "/users");
     }
     async mypermission() {
         var axios = await this.context.ready;

package/factory_gateway.ts

@@ -28,6 +28,33 @@ export class FactoryGateway extends Object {
     return response.data;
   }
 
+  //获得工厂的应用信息, 如果指定withRoles为true，则返回app和app的详细角色信息
+  async apps(id: number, withRoles = false): Promise<any> {
+    var axios = await this.context.ready;
+    var url = `/api/v2/factory/${id}/apps`;
+    if (withRoles) {
+      url += "/roles";
+    }
+    const response = await axios.get(url);
+    return response.data;
+  }
+
+  async roles(id: number) {
+    var axios = await this.context.ready;
+    return axios.get("/api/v2/factory/" + id+"/roles");
+  }
+
+  async addRole(id: number, data: any) {
+    data.factoryId = id;
+    var axios = await this.context.ready;
+    return axios.post("/api/v2/factory/role", data);
+  }
+
+  async users(id: number) {
+    var axios = await this.context.ready;
+    return axios.get("/api/v2/factory/" + id+"/users");
+  }
+
   //获得工厂的车间信息
   get workshop() {
     return {

package/package.json

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

package/pigfarm_gateway.ts

@@ -247,6 +247,25 @@ export class PigfarmGateway extends Object {
           `/api/v1/pigfarm/heatLamp/config/list?unitId=${unit.id}`
         );
       },
+      template: {
+        //获取配置模版列表
+        list: async (factory: Factory): Promise<any> => {
+          var axios = await this.context.ready;
+          return axios.get(
+            `/api/v1/pigfarm/heatLamp/config/template/list/${factory.id }`
+          );
+        },
+        //增加模板
+        add: (factory: Factory, name:String,data: HeatLamp) => {
+          return this.context.ready.then((axios) => {
+            return axios.post(`/api/v1/pigfarm/heatLamp/config/add`, {
+              ...data,
+              factoryId: factory.id,
+              templateName: name,
+            });
+          });
+        }, 
+      },
       list: async (unit: Unit): Promise<any> => {
         var axios = await this.context.ready;
         return axios.post(`/api/v1/pigfarm/heatLamp/list/${unit.id}`);

package/readme.md

@@ -87,6 +87,9 @@ baseURL: "/"
 | cpzxrobot().camera.xxx  | 获得摄像头的相关信息 |
 | cpzxrobot().camera.control  | 控制摄像头，例如：左移，右移，上移，下移等，如果传输start为true，则开始控制，如果传输stop为true，则停止控制，如果都没传输，则执行3秒后自动停止，传输start为true时，前端必须在需要停止时自行发送stop为true的消息 |
 | cpzxrobot().factory.entry | 获得工厂的可显示动态信息 |
+| cpzxrobot().factory.apps | 获得工厂的应用列表，如果指定withRoles为true，则返回app和app的详细角色信息 |
+| cpzxrobot().factory.roles | 获得工厂的角色列表 |  
+| cpzxrobot().factory.addRole | 添加工厂的角色 |
 | cpzxrobot().factory.info.get | 获得工厂的附加信息 |
 | cpzxrobot().factory.info.post | 更新或更新工厂的附加信息 |
 | cpzxrobot().factory.banner.add | 添加工厂的banner图片，提交formdata，需要传入file参数 |
@@ -112,6 +115,8 @@ baseURL: "/"
 | cpzxrobot().pigfarm.heatlamp.set | 设置保温灯的当前工作日龄，调用时，action传"dayage",argc传天数 |
 | cpzxrobot().pigfarm.heatlamp.switch | 设置保温灯的当前工作日龄，调用时，action"on"或"off" |
 | cpzxrobot().pigfarm.heatlamp.iotFields | 获取保温灯用于获取iot的字段列表 |
+| cpzxrobot().pigfarm.heatlamp.template.add | 添加保温灯的模板 |
+| cpzxrobot().pigfarm.heatlamp.template.list | 获取保温灯的模板列表 |
 | cpzxrobot().pigfarm.threshold | 获取单元中特定类型的阈值信息 |
 | cpzxrobot().scanQrcode | 调用扫码功能，获得扫码文字 |
 | cpzxrobot().vibrate | 调用震动功能 |

package/user_gateway.ts

@@ -113,12 +113,7 @@ export class UserGateway extends Object {
 
   async list(factory: Factory) {
     var axios = await this.context.ready;
-    return axios.get("/api/v2/user/list/" + factory.id);
-  }
-
-  async roles() {
-    var axios = await this.context.ready;
-    return axios.get("/api/v2/user/role/list");
+    return axios.get("/api/v2/" + factory.id+"/users");
   }
 
   async mypermission() {