@cpzxrobot/sdk 1.2.10 → 1.2.12

package/dist/index.js

@@ -405,24 +405,30 @@ class Cpzxrobot {
         else {
             this.initAxios(baseURL);
             this.auth = auth;
-            this.axios
-                .post("/api/v1/user/auth", {
-                appCode: this.appCode,
-                auth: auth,
-            })
-                .then((res) => {
-                if (res.data.Error) {
-                    throw res.data.Error;
-                }
-                else {
-                    this.token = "Bearer " + res.data.token;
-                }
+            if (this.auth.startsWith("Bearer ")) {
+                this.token = auth;
                 this.resolveReady(this.axios);
-            })
-                .catch((err) => {
-                console.log("shzx ready caller reject", err);
-                this.rejectReady(err);
-            });
+            }
+            else {
+                this.axios
+                    .post("/api/v1/user/auth", {
+                    appCode: this.appCode,
+                    auth: auth,
+                })
+                    .then((res) => {
+                    if (res.data.Error) {
+                        throw res.data.Error;
+                    }
+                    else {
+                        this.token = "Bearer " + res.data.token;
+                    }
+                    this.resolveReady(this.axios);
+                })
+                    .catch((err) => {
+                    console.log("shzx ready caller reject", err);
+                    this.rejectReady(err);
+                });
+            }
         }
     }
     isLocalDomain(domain) {

package/dist/robot_gateway.js

@@ -6,55 +6,96 @@ class RobotGateway extends Object {
         super();
         this.context = context;
     }
-    async cage(unitId) {
-        ///api/v2/robot/getCageList/{unitId}
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/getCageList/${unitId}`);
+    get alarm() {
+        return {
+            list: (unitId) => {
+                return this.context.ready.then(axios => axios.get(`/api/v2/robot/alarm/list/${unitId}`));
+            }
+        };
     }
-    async alarm(unitId) {
-        ///api/v2/robot/getAlarmList/{unitId}
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/getAlarmList/${unitId}`);
+    get task() {
+        return {
+            list: (unitId) => {
+                return this.context.ready.then(axios => axios.get(`/api/v2/robot/inspectTask/list/${unitId}`));
+            },
+            add: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectTask/add', data));
+            },
+            update: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectTask/update', data));
+            },
+            delete: (id) => {
+                return this.context.ready.then(axios => axios.post(`/api/v2/robot/inspectTask/delete/${id}`));
+            },
+            dispatch: (taskId) => {
+                return this.context.ready.then(axios => axios.post(`/api/v2/robot/inspectTask/dispatch/${taskId}`));
+            }
+        };
     }
-    // 获取任务列表
-    async getInspectTaskList(unitId) {
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/inspectTask/list/${unitId}`);
+    get record() {
+        return {
+            list: (taskId) => {
+                return this.context.ready.then(axios => axios.get(`/api/v2/robot/inspectRecord/list/${taskId}`));
+            }
+        };
     }
-    // 获取任务详情
-    async getInspectTaskDetail(id) {
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/inspectTask/${id}`);
+    get cage() {
+        return {
+            list: (unitId) => {
+                return this.context.ready.then(axios => axios.get(`/api/v2/robot/cage/list/${unitId}`));
+            },
+            addList: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/cage/addList', data));
+            },
+            updateList: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/cage/updateList', data));
+            },
+            update: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/cage/update', data));
+            },
+            delete: (id) => {
+                return this.context.ready.then(axios => axios.post(`/api/v2/robot/cage/delete/${id}`));
+            },
+            deleteList: (unitId) => {
+                return this.context.ready.then(axios => axios.post(`/api/v2/robot/cage/deleteList/${unitId}`));
+            }
+        };
     }
-    // 新增任务
-    async addInspectTask(data) {
-        var axios = await this.context.ready;
-        return axios.post('/api/v2/robot/inspectTask/add', data);
-    }
-    // 修改任务
-    async updateInspectTask(data) {
-        var axios = await this.context.ready;
-        return axios.post('/api/v2/robot/inspectTask/update', data);
-    }
-    // 删除任务
-    async deleteInspectTask(id) {
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/inspectTask/delete/${id}`);
-    }
-    // 获取未下发任务列表
-    async getNotAssignedInspectTaskList() {
-        var axios = await this.context.ready;
-        return axios.get('/api/v2/robot/inspectTask/notAssignedList');
-    }
-    // 下发任务
-    async assignInspectTask(taskId) {
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/inspectTask/assign/${taskId}`);
-    }
-    // 获取巡检结果
-    async getInspectRecordList(taskId) {
-        var axios = await this.context.ready;
-        return axios.get(`/api/v2/robot/inspectRecord/list/${taskId}`);
+    get path() {
+        return {
+            list: (unitId) => {
+                return this.context.ready.then(axios => axios.get(`/api/v2/robot/inspectPath/list/${unitId}`));
+            },
+            add: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectPath/add', data));
+            },
+            update: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectPath/update', data));
+            },
+            delete: (data) => {
+                return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectPath/delete', data));
+            },
+            point: {
+                list: (pathId) => {
+                    return this.context.ready.then(axios => axios.get(`/api/v2/robot/inspectPathPoint/list/${pathId}`));
+                },
+                addList: (data) => {
+                    return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectPathPoint/addList', data));
+                },
+                updateList: (data) => {
+                    return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectPathPoint/updateList', data));
+                },
+                update: (data) => {
+                    return this.context.ready.then(axios => axios.post('/api/v2/robot/inspectPathPoint/update', data));
+                },
+                delete: (id) => {
+                    return this.context.ready.then(axios => axios.post(`/api/v2/robot/inspectPathPoint/delete/${id}`));
+                },
+                deleteList: (pathId) => {
+                    return this.context.ready.then(axios => axios.post(`/api/v2/robot/inspectPathPoint/deleteList/${pathId}`));
+                }
+            }
+        };
     }
 }
 exports.RobotGateway = RobotGateway;

package/index.ts

@@ -132,29 +132,29 @@ export class Cpzxrobot {
       instance.upload = (url: string, option?: {
         [key: string]: any;
       }) => {
-        return new Promise<any>((resolve, reject)=>{
+        return new Promise<any>((resolve, reject) => {
           //add a file button to the body
-        var button = document.createElement("input");
-        button.type = "file";
-        button.style.display = "none";
-        document.body.appendChild(button);
-        button.onclick = (e: Event) => {
-          var file = (e.target as HTMLInputElement).files?.[0];
-          if (file) {
-            const formData = new FormData();
-            formData.append(option?.["fileField"] || "file", file);
-            for (let key in option?.["data"]) {
-              formData.append(key, option!["data"][key]);
-            }
-            instance.post(url, formData).then((res) => {
+          var button = document.createElement("input");
+          button.type = "file";
+          button.style.display = "none";
+          document.body.appendChild(button);
+          button.onclick = (e: Event) => {
+            var file = (e.target as HTMLInputElement).files?.[0];
+            if (file) {
+              const formData = new FormData();
+              formData.append(option?.["fileField"] || "file", file);
+              for (let key in option?.["data"]) {
+                formData.append(key, option!["data"][key]);
+              }
+              instance.post(url, formData).then((res) => {
+                button.remove();
+                resolve(res);
+              });
+            } else {
               button.remove();
-              resolve(res);
-            });
-          } else {
-            button.remove();
-            resolve({data:{Error:"没有选择文件"}})
-          }
-        };
+              resolve({ data: { Error: "没有选择文件" } })
+            }
+          };
         })
       }
       // @ts-ignore
@@ -197,7 +197,7 @@ export class Cpzxrobot {
       // @ts-ignore
       this.vibrate = window.miniapp.vibrate;
       // @ts-ignore
-      this.reloadGroup= window.miniapp.reloadGroup;
+      this.reloadGroup = window.miniapp.reloadGroup;
       this.saveBlob = this._saveBlobAsBase64;
       // @ts-ignore
       this.getGeo = window.miniapp.getGeo;
@@ -432,9 +432,9 @@ export class Cpzxrobot {
                 window.location.href = "/login.html?error=" + res.data.Error;
                 return;
               }
-              if (res.data.token){
+              if (res.data.token) {
                 this.token = "Bearer " + res.data.token;
-              }else if (access_token.startsWith("Bearer ")){
+              } else if (access_token.startsWith("Bearer ")) {
                 this.token = access_token;
               }
               localStorage.setItem("token", this.token);
@@ -450,23 +450,28 @@ export class Cpzxrobot {
     } else {
       this.initAxios(baseURL);
       this.auth = auth;
-      this.axios
-        .post("/api/v1/user/auth", {
-          appCode: this.appCode,
-          auth: auth,
-        })
-        .then((res) => {
-          if (res.data.Error) {
-            throw res.data.Error;
-          } else {
-            this.token = "Bearer " + res.data.token;
-          }
-          this.resolveReady(this.axios);
-        })
-        .catch((err) => {
-          console.log("shzx ready caller reject", err);
-          this.rejectReady(err);
-        });
+      if (this.auth.startsWith("Bearer ")) {
+        this.token = auth;
+        this.resolveReady(this.axios);
+      } else {
+        this.axios
+          .post("/api/v1/user/auth", {
+            appCode: this.appCode,
+            auth: auth,
+          })
+          .then((res) => {
+            if (res.data.Error) {
+              throw res.data.Error;
+            } else {
+              this.token = "Bearer " + res.data.token;
+            }
+            this.resolveReady(this.axios);
+          })
+          .catch((err) => {
+            console.log("shzx ready caller reject", err);
+            this.rejectReady(err);
+          });
+      }
     }
   }
 

package/package.json

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

package/readme.md

@@ -320,73 +320,60 @@ heatlamp 属性提供了一组方法，用于管理猪场的热灯配置。它
 
 ### 巡检任务相关接口
 
-以下是新增的巡检任务相关接口，这些接口都在 `cpzxrobot().robot` 命名空间下：
+以下是更新后的巡检任务相关接口，分组在 `cpzxrobot().task` 和 `cpzxrobot().record` 命名空间下：
+
+#### 任务管理 (cpzxrobot().task)
 
 1. **获取任务列表**
    ```typescript
-   cpzxrobot().robot.getInspectTaskList(unitId: number)
+   cpzxrobot().task.list(unitId: number)
    ```
    - 描述：获取指定单元的巡检任务列表
    - 参数：`unitId` - 单元ID
    - HTTP方法：GET
    - 接口路径：`/api/v2/robot/inspectTask/list/{unitId}`
 
-2. **获取任务详情**
-   ```typescript
-   cpzxrobot().robot.getInspectTaskDetail(id: number)
-   ```
-   - 描述：获取指定巡检任务的详细信息
-   - 参数：`id` - 任务ID
-   - HTTP方法：GET
-   - 接口路径：`/api/v2/robot/inspectTask/{id}`
-
-3. **新增任务**
+2. **新增任务**
    ```typescript
-   cpzxrobot().robot.addInspectTask(data: any)
+   cpzxrobot().task.add(data: any)
    ```
    - 描述：添加新的巡检任务
    - 参数：`data` - 包含任务信息的对象
    - HTTP方法：POST
    - 接口路径：`/api/v2/robot/inspectTask/add`
 
-4. **修改任务**
+3. **修改任务**
    ```typescript
-   cpzxrobot().robot.updateInspectTask(data: any)
+   cpzxrobot().task.update(data: any)
    ```
    - 描述：更新现有的巡检任务
    - 参数：`data` - 包含更新信息的对象
    - HTTP方法：POST
    - 接口路径：`/api/v2/robot/inspectTask/update`
 
-5. **删除任务**
+4. **删除任务**
    ```typescript
-   cpzxrobot().robot.deleteInspectTask(id: number)
+   cpzxrobot().task.delete(id: number)
    ```
    - 描述：删除指定的巡检任务
    - 参数：`id` - 任务ID
-   - HTTP方法：GET
+   - HTTP方法：POST
    - 接口路径：`/api/v2/robot/inspectTask/delete/{id}`
 
-6. **获取未下发任务列表**
+5. **下发任务**
    ```typescript
-   cpzxrobot().robot.getNotAssignedInspectTaskList()
-   ```
-   - 描述：获取所有未下发的巡检任务列表
-   - HTTP方法：GET
-   - 接口路径：`/api/v2/robot/inspectTask/notAssignedList`
-
-7. **下发任务**
-   ```typescript
-   cpzxrobot().robot.assignInspectTask(taskId: number)
+   cpzxrobot().task.dispatch(taskId: number)
    ```
    - 描述：下发指定的巡检任务
    - 参数：`taskId` - 任务ID
-   - HTTP方法：GET
-   - 接口路径：`/api/v2/robot/inspectTask/assign/{taskId}`
+   - HTTP方法：POST
+   - 接口路径：`/api/v2/robot/inspectTask/dispatch/{taskId}`
+
+#### 巡检记录 (cpzxrobot().record)
 
-8. **获取巡检结果**
+1. **获取巡检结果**
    ```typescript
-   cpzxrobot().robot.getInspectRecordList(taskId: number)
+   cpzxrobot().record.list(taskId: number)
    ```
    - 描述：获取指定巡检任务的结果列表
    - 参数：`taskId` - 任务ID

package/robot_gateway.ts

@@ -8,63 +8,145 @@ export class RobotGateway extends Object {
     this.context = context;
   }
 
-  async cage(unitId: number) {
-    ///api/v2/robot/getCageList/{unitId}
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/getCageList/${unitId}`);
+  get alarm() {
+    return {
+      list: (unitId: number) => {
+        return this.context.ready.then(axios => 
+          axios.get(`/api/v2/robot/alarm/list/${unitId}`)
+        );
+      }
+    };
   }
 
-  async alarm(unitId: number) {
-    ///api/v2/robot/getAlarmList/{unitId}
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/getAlarmList/${unitId}`);
+  get task() {
+    return {
+      list: (unitId: number) => {
+        return this.context.ready.then(axios => 
+          axios.get(`/api/v2/robot/inspectTask/list/${unitId}`)
+        );
+      },
+      add: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/inspectTask/add', data)
+        );
+      },
+      update: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/inspectTask/update', data)
+        );
+      },
+      delete: (id: number) => {
+        return this.context.ready.then(axios => 
+          axios.post(`/api/v2/robot/inspectTask/delete/${id}`)
+        );
+      },
+      dispatch: (taskId: number) => {
+        return this.context.ready.then(axios => 
+          axios.post(`/api/v2/robot/inspectTask/dispatch/${taskId}`)
+        );
+      }
+    };
   }
 
-  // 获取任务列表
-  async getInspectTaskList(unitId: number) {
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/inspectTask/list/${unitId}`);
+  get record() {
+    return {
+      list: (taskId: number) => {
+        return this.context.ready.then(axios => 
+          axios.get(`/api/v2/robot/inspectRecord/list/${taskId}`)
+        );
+      }
+    };
   }
 
-  // 获取任务详情
-  async getInspectTaskDetail(id: number) {
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/inspectTask/${id}`);
+  get cage() {
+    return {
+      list: (unitId: number) => {
+        return this.context.ready.then(axios => 
+          axios.get(`/api/v2/robot/cage/list/${unitId}`)
+        );
+      },
+      addList: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/cage/addList', data)
+        );
+      },
+      updateList: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/cage/updateList', data)
+        );
+      },
+      update: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/cage/update', data)
+        );
+      },
+      delete: (id: number) => {
+        return this.context.ready.then(axios => 
+          axios.post(`/api/v2/robot/cage/delete/${id}`)
+        );
+      },
+      deleteList: (unitId: number) => {
+        return this.context.ready.then(axios => 
+          axios.post(`/api/v2/robot/cage/deleteList/${unitId}`)
+        );
+      }
+    };
   }
 
-  // 新增任务
-  async addInspectTask(data: any) {
-    var axios = await this.context.ready;
-    return axios.post('/api/v2/robot/inspectTask/add', data);
-  }
-
-  // 修改任务
-  async updateInspectTask(data: any) {
-    var axios = await this.context.ready;
-    return axios.post('/api/v2/robot/inspectTask/update', data);
-  }
-
-  // 删除任务
-  async deleteInspectTask(id: number) {
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/inspectTask/delete/${id}`);
-  }
-
-  // 获取未下发任务列表
-  async getNotAssignedInspectTaskList() {
-    var axios = await this.context.ready;
-    return axios.get('/api/v2/robot/inspectTask/notAssignedList');
-  }
-
-  // 下发任务
-  async assignInspectTask(taskId: number) {
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/inspectTask/assign/${taskId}`);
-  }
-
-  // 获取巡检结果
-  async getInspectRecordList(taskId: number) {
-    var axios = await this.context.ready;
-    return axios.get(`/api/v2/robot/inspectRecord/list/${taskId}`);
+  get path() {
+    return {
+      list: (unitId: number) => {
+        return this.context.ready.then(axios => 
+          axios.get(`/api/v2/robot/inspectPath/list/${unitId}`)
+        );
+      },
+      add: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/inspectPath/add', data)
+        );
+      },
+      update: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/inspectPath/update', data)
+        );
+      },
+      delete: (data: any) => {
+        return this.context.ready.then(axios => 
+          axios.post('/api/v2/robot/inspectPath/delete', data)
+        );
+      },
+      point: {
+        list: (pathId: number) => {
+          return this.context.ready.then(axios => 
+            axios.get(`/api/v2/robot/inspectPathPoint/list/${pathId}`)
+          );
+        },
+        addList: (data: any) => {
+          return this.context.ready.then(axios => 
+            axios.post('/api/v2/robot/inspectPathPoint/addList', data)
+          );
+        },
+        updateList: (data: any) => {
+          return this.context.ready.then(axios => 
+            axios.post('/api/v2/robot/inspectPathPoint/updateList', data)
+          );
+        },
+        update: (data: any) => {
+          return this.context.ready.then(axios => 
+            axios.post('/api/v2/robot/inspectPathPoint/update', data)
+          );
+        },
+        delete: (id: number) => {
+          return this.context.ready.then(axios => 
+            axios.post(`/api/v2/robot/inspectPathPoint/delete/${id}`)
+          );
+        },
+        deleteList: (pathId: number) => {
+          return this.context.ready.then(axios => 
+            axios.post(`/api/v2/robot/inspectPathPoint/deleteList/${pathId}`)
+          );
+        }
+      }
+    };
   }
 }