@cpzxrobot/sdk 1.3.38 → 1.3.39

package/car_gateway.ts

@@ -21,6 +21,13 @@ export class CarGateway extends Object {
       .then((res) => res.data);
   }
 
+  async cars(factory: Factory, date: Date) {
+    var axios = await this.context.ready;
+    return axios
+      .get(`/api/v2/car/${factory.pid}/cars`)
+      .then((res) => res.data);
+  }
+
   //根据工厂pid获取订单列表，注意，该接口和
   async orders(factory: Factory, date: Date) {
     var axios = await this.context.ready;

package/device_gateway.ts

@@ -895,33 +895,12 @@ export class DeviceGateway extends Object {
     };
   }
 
-  get maintenanceLevels() {
-    return {
-      // 获取维护级别列表
-      list: async (factoryId: number): Promise<any> => {
-        const axios = await this.context.ready;
-        return axios.get('/api/v3/device/maintenance-levels', {
-          params: { factoryId }
-        });
-      },
-      create: async (data: {
-        name: string;
-        code?: string;
-        color?: string;
-        description?: string;
-      }): Promise<any> => {
-        var axios = await this.context.ready;
-        return axios.post('/api/v3/device/maintenance-levels', data);
-      }
-    }
-  }
-
-  get maintenanceTypes() {
+  private generateFunctionsForDict(dictName: string): any {
     return {
       // 获取维护类型列表
       list: async (factoryId: number): Promise<any> => {
         const axios = await this.context.ready;
-        return axios.get('/api/v3/device/maintenance-types', {
+        return axios.get(`/api/v3/device/${dictName}`, {
           params: { factoryId }
         });
       },
@@ -932,88 +911,29 @@ export class DeviceGateway extends Object {
         description?: string;
       }): Promise<any> => {
         var axios = await this.context.ready;
-        return axios.post('/api/v3/device/maintenance-levels', data);
-      }
-    }
-  }
-
-  get maintenanceFeedbackTypes() {
-    return {
-      // 获取维护类型列表
-      list: async (factoryId: number): Promise<any> => {
-        const axios = await this.context.ready;
-        return axios.get('/api/v3/device/maintenance-feedback-types', {
-          params: { factoryId }
-        });
+        return axios.post(`/api/v3/device/${dictName}`, data);
       },
-      create: async (data: {
-        name: string;
-        code?: string;
-        color?: string;
-        description?: string;
-      }): Promise<any> => {
+      delete: async (id: number): Promise<any> => {
         var axios = await this.context.ready;
-        return axios.post('/api/v3/device/maintenance-feedback-types', data);
+        return axios.delete(`/api/v3/device/${dictName}/${id}`);
       }
     }
   }
 
+  public maintenanceLevels = this.generateFunctionsForDict('maintenance-levels');
+
+  public maintenanceTypes = this.generateFunctionsForDict('maintenance-types');
+
+  public maintenanceFeedbackTypes = this.generateFunctionsForDict('maintenance-feedback-types');
+
   //维修中状态
-  get maintenanceStatus() {
-    return {
-      list: async (): Promise<any> => {
-        const axios = await this.context.ready;
-        return axios.get('/api/v3/device/maintenance-status');
-      },
-      create: async (data: {
-        name: string;
-        code?: string;
-        color?: string;
-        description?: string;
-      }): Promise<any> => {
-        var axios = await this.context.ready;
-        return axios.post('/api/v3/device/maintenance-status', data);
-      }
-    };
-  }
+  public maintenanceStatus = this.generateFunctionsForDict('maintenance-status');
 
   //外委中状态列表
-  get maintenanceOutsourceStatus() {
-    return {
-      list: async (): Promise<any> => {
-        const axios = await this.context.ready;
-        return axios.get('/api/v3/device/maintenance-outsource-status');
-      },
-      create: async (data: {
-        name: string;
-        code?: string;
-        color?: string;
-        description?: string;
-      }): Promise<any> => {
-        var axios = await this.context.ready;
-        return axios.post('/api/v3/device/maintenance-outsource-status', data);
-      }
-    };
-  }
+  public maintenanceOutsourceStatus =this.generateFunctionsForDict('maintenance-outsource-status');
 
   //故障来源
-  get troubleDetectSource() {
-    return {
-      list: async (): Promise<any> => {
-        const axios = await this.context.ready;
-        return axios.get('/api/v3/device/trouble-detect-source');
-      },
-      create: async (data: {
-        name: string;
-        code?: string;
-        color?: string;
-        description?: string;
-      }): Promise<any> => {
-        var axios = await this.context.ready;
-        return axios.post('/api/v3/device/trouble-detect-source', data);
-      }
-    };
-  }
+  public troubleDetectSource = this.generateFunctionsForDict('trouble-detect-source');
 
   get usage() {
     return {

package/device_types/feedtower.ts

@@ -95,11 +95,11 @@ export class FeedTowerGateway extends DeviceFilter<FeedTower> {
     });
     return res.data;
   }
-  async getCarList(): Promise<any> {
-    var axios = await this.context.ready;
-    const res = await axios.get("/api/v1/pigfarm/car/list");
-    return res.data;
-  }
+  // async getCarList(): Promise<any> {
+  //   var axios = await this.context.ready;
+  //   const res = await axios.get("/api/v1/pigfarm/car/list");
+  //   return res.data;
+  // }
   async updateZeroTime(id: Number): Promise<any> {
     var axios = await this.context.ready;
     const res = await axios.post(

package/dist/car_gateway.js

@@ -18,6 +18,12 @@ class CarGateway extends Object {
             .get(`/api/v2/car/${factory.pid}/detections?date=` + date.toISOString())
             .then((res) => res.data);
     }
+    async cars(factory, date) {
+        var axios = await this.context.ready;
+        return axios
+            .get(`/api/v2/car/${factory.pid}/cars`)
+            .then((res) => res.data);
+    }
     //根据工厂pid获取订单列表，注意，该接口和
     async orders(factory, date) {
         var axios = await this.context.ready;

package/dist/device_gateway.js

@@ -140,6 +140,15 @@ class DeviceGateway extends Object {
     }
     constructor(context) {
         super();
+        this.maintenanceLevels = this.generateFunctionsForDict('maintenance-levels');
+        this.maintenanceTypes = this.generateFunctionsForDict('maintenance-types');
+        this.maintenanceFeedbackTypes = this.generateFunctionsForDict('maintenance-feedback-types');
+        //维修中状态
+        this.maintenanceStatus = this.generateFunctionsForDict('maintenance-status');
+        //外委中状态列表
+        this.maintenanceOutsourceStatus = this.generateFunctionsForDict('maintenance-outsource-status');
+        //故障来源
+        this.troubleDetectSource = this.generateFunctionsForDict('trouble-detect-source');
         this.context = context;
         // this.devices = []
         this.type = new device_type_gateway_1.DeviceTypeGateway(context);
@@ -677,87 +686,22 @@ class DeviceGateway extends Object {
             },
         };
     }
-    get maintenanceLevels() {
-        return {
-            // 获取维护级别列表
-            list: async (factoryId) => {
-                const axios = await this.context.ready;
-                return axios.get('/api/v3/device/maintenance-levels', {
-                    params: { factoryId }
-                });
-            },
-            create: async (data) => {
-                var axios = await this.context.ready;
-                return axios.post('/api/v3/device/maintenance-levels', data);
-            }
-        };
-    }
-    get maintenanceTypes() {
+    generateFunctionsForDict(dictName) {
         return {
             // 获取维护类型列表
             list: async (factoryId) => {
                 const axios = await this.context.ready;
-                return axios.get('/api/v3/device/maintenance-types', {
+                return axios.get(`/api/v3/device/${dictName}`, {
                     params: { factoryId }
                 });
             },
             create: async (data) => {
                 var axios = await this.context.ready;
-                return axios.post('/api/v3/device/maintenance-levels', data);
-            }
-        };
-    }
-    get maintenanceFeedbackTypes() {
-        return {
-            // 获取维护类型列表
-            list: async (factoryId) => {
-                const axios = await this.context.ready;
-                return axios.get('/api/v3/device/maintenance-feedback-types', {
-                    params: { factoryId }
-                });
+                return axios.post(`/api/v3/device/${dictName}`, data);
             },
-            create: async (data) => {
-                var axios = await this.context.ready;
-                return axios.post('/api/v3/device/maintenance-feedback-types', data);
-            }
-        };
-    }
-    //维修中状态
-    get maintenanceStatus() {
-        return {
-            list: async () => {
-                const axios = await this.context.ready;
-                return axios.get('/api/v3/device/maintenance-status');
-            },
-            create: async (data) => {
-                var axios = await this.context.ready;
-                return axios.post('/api/v3/device/maintenance-status', data);
-            }
-        };
-    }
-    //外委中状态列表
-    get maintenanceOutsourceStatus() {
-        return {
-            list: async () => {
-                const axios = await this.context.ready;
-                return axios.get('/api/v3/device/maintenance-outsource-status');
-            },
-            create: async (data) => {
-                var axios = await this.context.ready;
-                return axios.post('/api/v3/device/maintenance-outsource-status', data);
-            }
-        };
-    }
-    //故障来源
-    get troubleDetectSource() {
-        return {
-            list: async () => {
-                const axios = await this.context.ready;
-                return axios.get('/api/v3/device/trouble-detect-source');
-            },
-            create: async (data) => {
+            delete: async (id) => {
                 var axios = await this.context.ready;
-                return axios.post('/api/v3/device/trouble-detect-source', data);
+                return axios.delete(`/api/v3/device/${dictName}/${id}`);
             }
         };
     }

package/dist/device_types/feedtower.js

@@ -81,11 +81,11 @@ class FeedTowerGateway extends device_filter_1.DeviceFilter {
         });
         return res.data;
     }
-    async getCarList() {
-        var axios = await this.context.ready;
-        const res = await axios.get("/api/v1/pigfarm/car/list");
-        return res.data;
-    }
+    // async getCarList(): Promise<any> {
+    //   var axios = await this.context.ready;
+    //   const res = await axios.get("/api/v1/pigfarm/car/list");
+    //   return res.data;
+    // }
     async updateZeroTime(id) {
         var axios = await this.context.ready;
         const res = await axios.post("/api/v1/pigfarm/device/status/updateZeroTime" + "?id=" + id);

package/dist/user_gateway.js

@@ -37,9 +37,29 @@ class UserGateway extends Object {
         var axios = await this.context.ready;
         return axios.post('/api/v2/user', user);
     }
-    async list(factory) {
-        var axios = await this.context.ready;
-        return axios.get('/api/v2/' + factory.id + '/users');
+    //根据组织机构id获得该组织机构下所有人员
+    listByGroup(groupId) {
+        return this.context.ready.then((axios) => {
+            return axios.get(`/api/v2/user/list/${groupId}`);
+        });
+    }
+    async list(factory = undefined) {
+        var factoryId = 0;
+        if (factory) {
+            if (typeof factory === 'number') {
+                factoryId = factory;
+            }
+            else {
+                factoryId = factory.id;
+            }
+        }
+        else {
+            var selectedFarm = await this.context.user.getSelectedFarm();
+            factoryId = selectedFarm.id;
+        }
+        return this.context.ready.then((axios) => {
+            return axios.get(`/api/v2/user/list/${factoryId}`);
+        });
     }
     listByProvince(area_code) {
         return this.context.ready.then((axios) => {
@@ -310,12 +330,6 @@ class UserGateway extends Object {
             },
         };
     }
-    //根据组织机构id获得该组织机构下所有人员
-    listByGroup(groupId) {
-        return this.context.ready.then((axios) => {
-            return axios.get(`/api/v2/user/list/${groupId}`);
-        });
-    }
     get position() {
         return {
             leader: () => {

package/package.json

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

package/user_gateway.ts

@@ -45,9 +45,28 @@ export class UserGateway extends Object {
     return axios.post('/api/v2/user', user)
   }
 
-  async list(factory: Factory) {
-    var axios = await this.context.ready
-    return axios.get('/api/v2/' + factory.id + '/users')
+  //根据组织机构id获得该组织机构下所有人员
+  listByGroup(groupId: number) {
+    return this.context.ready.then((axios) => {
+      return axios.get(`/api/v2/user/list/${groupId}`)
+    })
+  }
+
+  async list(factory: Factory | number| undefined = undefined) {
+    var factoryId = 0
+    if (factory) {
+      if (typeof factory === 'number') {
+        factoryId = factory
+      } else {
+        factoryId = factory.id as number
+      }
+    }else{
+      var selectedFarm = await this.context.user.getSelectedFarm()
+      factoryId = selectedFarm.id
+    }
+    return this.context.ready.then((axios) => {
+      return axios.get(`/api/v2/user/list/${factoryId}`)
+    })
   }
 
   listByProvince(area_code: string) {
@@ -70,9 +89,9 @@ export class UserGateway extends Object {
     role:
       | string
       | {
-          deptName: string
-          roleCode: string
-        }
+        deptName: string
+        roleCode: string
+      }
   ) {
     var args = {}
     if (typeof role === 'string') {
@@ -386,12 +405,7 @@ export class UserGateway extends Object {
     }
   }
 
-  //根据组织机构id获得该组织机构下所有人员
-  listByGroup(groupId: number) {
-    return this.context.ready.then((axios) => {
-      return axios.get(`/api/v2/user/list/${groupId}`)
-    })
-  }
+
 
   get position() {
     return {