@cpzxrobot/sdk 1.3.42 → 1.3.44

package/device_gateway.ts

@@ -211,11 +211,17 @@ export class DeviceGateway extends Object {
   }
 
   async watch(
-    id: number,
+    ids: number|number[],
     fn: any,
   ) {
     var axios = await this.context.ready;
-    return axios.getAsSse(`/api/v1/device/watch/${id}`, fn)
+    var idQuery = "";
+    if (Array.isArray(ids)) {
+      idQuery = ids.map(x => `ids=${x}`).join("&");
+    }else{
+      idQuery = `ids=${ids}`;
+    }
+    return axios.getAsSse(`/api/v1/device/watch?`+idQuery, fn)
   }
 
   private getFilter<T extends { id: number }>(
@@ -977,7 +983,7 @@ export class DeviceGateway extends Object {
     return {
       openDoor: async (deviceId: number,door: "doora" | "doorb", open: boolean) => {
         var axios = await this.context.ready;
-        return axios.post(`/api/v2/device/disinfect/${deviceId}`, { door, open })
+        return axios.post(`/api/v2/disinfect/${deviceId}`, { door, open })
       },
       config: async (deviceId: number, config: {
         mode?: number; // 0:没有消毒 1:高温消毒 2:臭氧消毒 3:高温+臭氧
@@ -986,13 +992,13 @@ export class DeviceGateway extends Object {
         targetOzone?: number; // 目标臭氧浓度
       }) => {
         let axios = await this.context.ready;
-        return axios.post(`/api/v2/device/disinfect/${deviceId}`, config).then((res) => {
+        return axios.post(`/api/v2/disinfect/${deviceId}`, config).then((res) => {
           return res.data;
         });
       },
       history: async (deviceId: number, pageNum:number,pageSize:number) => {
         let axios = await this.context.ready;
-        return axios.get(`/api/v2/device/disinfect/${deviceId}`, { params: { pageNum, pageSize } }).then((res) => {
+        return axios.get(`/api/v2/disinfect/${deviceId}`, { params: { pageNum, pageSize } }).then((res) => {
           return res.data;
         });
       }

package/dist/device_gateway.js

@@ -168,9 +168,16 @@ class DeviceGateway extends Object {
     show(id, type = "datapoint") {
         this.context.platform.showInDeviceManager(id, type);
     }
-    async watch(id, fn) {
+    async watch(ids, fn) {
         var axios = await this.context.ready;
-        return axios.getAsSse(`/api/v1/device/watch/${id}`, fn);
+        var idQuery = "";
+        if (Array.isArray(ids)) {
+            idQuery = ids.map(x => `ids=${x}`).join("&");
+        }
+        else {
+            idQuery = `ids=${ids}`;
+        }
+        return axios.getAsSse(`/api/v1/device/watch?` + idQuery, fn);
     }
     getFilter(type, cls) {
         // 如果filters中已经有对应type的过滤器，则直接返回该过滤器
@@ -744,17 +751,17 @@ class DeviceGateway extends Object {
         return {
             openDoor: async (deviceId, door, open) => {
                 var axios = await this.context.ready;
-                return axios.post(`/api/v2/device/disinfect/${deviceId}`, { door, open });
+                return axios.post(`/api/v2/disinfect/${deviceId}`, { door, open });
             },
             config: async (deviceId, config) => {
                 let axios = await this.context.ready;
-                return axios.post(`/api/v2/device/disinfect/${deviceId}`, config).then((res) => {
+                return axios.post(`/api/v2/disinfect/${deviceId}`, config).then((res) => {
                     return res.data;
                 });
             },
             history: async (deviceId, pageNum, pageSize) => {
                 let axios = await this.context.ready;
-                return axios.get(`/api/v2/device/disinfect/${deviceId}`, { params: { pageNum, pageSize } }).then((res) => {
+                return axios.get(`/api/v2/disinfect/${deviceId}`, { params: { pageNum, pageSize } }).then((res) => {
                     return res.data;
                 });
             }

package/package.json

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

package/types.d.ts

@@ -33,7 +33,7 @@ type Device = {
   currentAmount: number;
   location: string;
   supplier?: string;
-  data?: number[];
+  data?: any;
   typeCode: string;
   unitId: number;
 };
@@ -87,9 +87,9 @@ type Assistant = {
   id: Number;
 };
 type Factory = {
-  code: string;
+  code?: string;
   name?: string;
-  company_code: string;
+  company_code?: string;
   id?: number;
   type?: string;
   kind?: string;