@cpzxrobot/sdk 1.1.16 → 1.1.18

package/device_type_gateway.ts

@@ -14,7 +14,7 @@ export class DeviceTypeGateway {
     if (this.deviceTypes) {
       return Promise.resolve(this.deviceTypes)
     }
-    return this.context.axios.get('/api/device_type/list')
+    return this.context.axios.get('/api/v1/device/type')
   }
 
   alarmConfigForUnit(unit: Unit): Promise<any> {

package/dist/device_type_gateway.js

@@ -10,7 +10,7 @@ class DeviceTypeGateway {
         if (this.deviceTypes) {
             return Promise.resolve(this.deviceTypes);
         }
-        return this.context.axios.get('/api/device_type/list');
+        return this.context.axios.get('/api/v1/device/type');
     }
     alarmConfigForUnit(unit) {
         return this.context.ready.then((axios) => {

package/dist/pigfarm_gateway.js

@@ -65,7 +65,7 @@ class PigfarmGateway extends Object {
     //根据单元类型和传感器类型获取告警阈值曲线
     threshold(data, sensorType) {
         return this.context.ready.then((axios) => {
-            return axios.get(`/api/v1/pigfarm/alertThershold/${data.type}/${sensorType}`, data);
+            return axios.get(`/api/v1/pigfarm/alertThershold/${data.id}/${sensorType}`, data);
         });
     }
     get relay() {

package/dist/user_gateway.js

@@ -119,5 +119,54 @@ class UserGateway extends Object {
         var axios = await this.context.ready;
         return axios.post(`/api/v2/user/${id}/avatar/add`, avatar);
     }
+    get approval() {
+        return {
+            count: (id, status) => {
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/coremde-sale/approval/count`, {
+                        status,
+                        userId: id
+                    });
+                });
+            },
+            list: (id, status) => {
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/coremde-sale/approval/list`, {
+                        status,
+                        userId: id
+                    });
+                });
+            }
+        };
+    }
+    get checkin() {
+        return {
+            add: (userId, address) => {
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/coremde-sale/checkin/add`, {
+                        userId,
+                        address
+                    });
+                });
+            },
+            //date 传入格式为2019-8或者Date类型对象
+            list: (userId, date) => {
+                //if date is string
+                var yearMonth;
+                if (typeof date === 'string') {
+                    yearMonth = date;
+                }
+                else if (typeof date === 'object') {
+                    yearMonth = date.getFullYear() + '-' + (date.getMonth() + 1);
+                }
+                return this.context.ready.then((axios) => {
+                    return axios.post(`/api/v2/coremde-sale/checkin/list`, {
+                        userId,
+                        yearMonth
+                    });
+                });
+            }
+        };
+    }
 }
 exports.UserGateway = UserGateway;

package/package.json

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

package/pigfarm_gateway.ts

@@ -85,7 +85,7 @@ export class PigfarmGateway extends Object {
   threshold(data: Unit, sensorType: String) {
     return this.context.ready.then((axios) => {
       return axios.get(
-        `/api/v1/pigfarm/alertThershold/${data.type}/${sensorType}`,
+        `/api/v1/pigfarm/alertThershold/${data.id}/${sensorType}`,
         data
       );
     });

package/readme.md

@@ -139,6 +139,10 @@ baseURL: "/"
 | cpzxrobot().user.add | 添加用户 |
 | cpzxrobot().user.update | 更新用户 |
 | cpzxrobot().user.list | 列出用户（传入工厂） |
+| cpzxrobot().user.approval.list | 获取用户审批列表，传入userId和status参数 |
+| cpzxrobot().user.approval.count | 获取用户审批列表的数量，传入userId和status参数 |
+| cpzxrobot().user.checkin.add | 添加用户签到记录,传入userId和address参数 |
+| cpzxrobot().user.checkin.list | 列出用户签到记录,传入userId和date参数 |
 
 ### 工厂信息接口
 

package/user_gateway.ts

@@ -113,7 +113,7 @@ export class UserGateway extends Object {
 
   async list(factory: Factory) {
     var axios = await this.context.ready;
-    return axios.get("/api/v2/" + factory.id+"/users");
+    return axios.get("/api/v2/" + factory.id + "/users");
   }
 
   async mypermission() {
@@ -130,4 +130,55 @@ export class UserGateway extends Object {
     var axios = await this.context.ready;
     return axios.post(`/api/v2/user/${id}/avatar/add`, avatar);
   }
+
+  get approval() {
+    return {
+      count: (id: number, status: any) => {
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/coremde-sale/approval/count`, {
+            status,
+            userId: id
+          });
+        });
+      },
+      list: (id: number, status: any) => {
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/coremde-sale/approval/list`, {
+            status,
+            userId: id
+          });
+        });
+      }
+    }
+  }
+
+  get checkin() {
+    return {
+      add: (userId: number,address: String) => {
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/coremde-sale/checkin/add`, {
+            userId,
+            address
+          });
+        });
+      },
+      //date 传入格式为2019-8或者Date类型对象
+      list: (userId: number,date:any) => {
+        //if date is string
+        var yearMonth:string;
+        if(typeof date === 'string'){
+          yearMonth = date;
+        }else if (typeof date === 'object'){
+          yearMonth = date.getFullYear()+'-'+(date.getMonth()+1);
+        }
+
+        return this.context.ready.then((axios) => {
+          return axios.post(`/api/v2/coremde-sale/checkin/list`, {
+              userId,
+              yearMonth
+          });
+        });
+      }
+    };
+  }
 }