@cpzxrobot/sdk 1.0.4 → 1.0.5

package/assistant_gateway.ts

@@ -1,7 +1,9 @@
+import { Cpzxrobot } from "."
+
 //消息助手网关，获取消息助手的信息
 export class AssistantGateway extends Object {
-  context: Shzx
-  constructor(context: Shzx) {
+  context: Cpzxrobot
+  constructor(context: Cpzxrobot) {
     super()
     this.context = context
   }

package/camera_gateway.ts

@@ -1,28 +1,32 @@
+import { Cpzxrobot, Unit, Camera } from ".";
+
 export class CameraGateway extends Object {
-  context: Shzx
-  constructor(context: Shzx) {
-    super()
-    this.context = context
+  context: Cpzxrobot;
+  constructor(context: Cpzxrobot) {
+    super();
+    this.context = context;
   }
   //搜索摄像头
   async search(data: Unit): Promise<any> {
-    await this.context.ready
-    const response = await this.context.axios.post('/api/v1/camera/search', {
-      unit_id: data.id
-    })
-    return response.data
+    await this.context.ready;
+    const response = await this.context.axios.post("/api/v1/camera/search", {
+      unit_id: data.id,
+    });
+    return response.data;
   }
 
   //获得摄像头的播放地址
   async getUrl(data: Camera): Promise<any> {
-    await this.context.ready
-    const response = await this.context.axios.get(`/api/v1/camera/${data.id}/url/wss`)
-    return response.data
+    await this.context.ready;
+    const response = await this.context.axios.get(
+      `/api/v1/camera/${data.id}/url/wss`
+    );
+    return response.data;
   }
   //获取工厂天气
   async weather(id: number): Promise<any> {
-    await this.context.ready
-    const response = await this.context.axios.get(`/api/v1/weather?code=${id}`)
-    return response.data
+    await this.context.ready;
+    const response = await this.context.axios.get(`/api/v1/weather?code=${id}`);
+    return response.data;
   }
 }

package/device_filter.ts

@@ -1,3 +1,4 @@
+import { Cpzxrobot } from ".";
 import type { AxiosResponse } from "axios";
 
 export interface DataQueryArgs {
@@ -14,8 +15,8 @@ export interface DataQueryArgs {
   [key: string]: any;
 }
 
-export abstract class deviceFilter<T extends { id: number }> {
-  context: Shzx;
+export abstract class DeviceFilter<T extends { id: number }> {
+  context: Cpzxrobot;
   protected devices: T[] = [];
 
   // private getDetail!: (info: T, id: number, context: Shzx) => Promise<any> | null
@@ -23,7 +24,7 @@ export abstract class deviceFilter<T extends { id: number }> {
   // user: UserGateway;
   // ready: Promise<boolean>;
 
-  constructor(context: Shzx) {
+  constructor(context: Cpzxrobot) {
     this.context = context;
   }
 
@@ -62,7 +63,7 @@ export abstract class deviceFilter<T extends { id: number }> {
 
   //获得单个设备的详细信息和状态，包括设备的基本信息和跟业务类型相关的附加状态信息
   //不应单独使用getInfo和getDetail，应使用getStatus
-  getStatus(id: number) {
+  getStatus(id: number): Promise<any> {
     return this.context.ready
       .then(() => this.getInfo(id))
       .then((info) => {
@@ -275,6 +276,7 @@ export abstract class deviceFilter<T extends { id: number }> {
             | null; //如果data为null，则不获取数据，只获取设备列表，否则获取设备列表和数据
           status?: string;
           unit?: Number;
+          detail?: boolean;
         } = undefined
   ): Promise<T[]> {
     // if (this.devices.length > 0) {

package/device_gateway.ts

@@ -1,6 +1,6 @@
 import { DeviceTypeGateway } from "./device_type_gateway";
-import { deviceFilter } from "./device_filter";
-import type { FeedTower, ElectricMeter } from ".";
+import { DeviceFilter } from "./device_filter";
+import type {  ElectricMeter, Cpzxrobot } from ".";
 import { FeedTowerGateway } from "./device_types/feedtower";
 import { ElectricMeterGateway } from "./device_types/electricmeter";
 import { NormalGateway } from "./device_types/normal_type";
@@ -12,11 +12,11 @@ import { NormalGateway } from "./device_types/normal_type";
 export class DeviceGateway extends Object {
   // private devices: Device[]
   public type: DeviceTypeGateway;
-  filters: Map<string, deviceFilter<any>>;
-  normalFilter: NormalGateway;
-  context: Shzx;
+  filters: Map<string, DeviceFilter<any>>;
+  public normalFilter: NormalGateway;
+  context: Cpzxrobot;
 
-  constructor(context: Shzx) {
+  constructor(context: Cpzxrobot) {
     super();
     this.context = context;
     // this.devices = []
@@ -26,21 +26,21 @@ export class DeviceGateway extends Object {
   }
 
   //料塔设备的数据获取网关
-  get feedTower(): deviceFilter<FeedTower> {
-    return this.getFilter("FeedTower", FeedTowerGateway);
+  public get feedTower(): FeedTowerGateway {
+    return this.getFilter("FeedTower", FeedTowerGateway) as FeedTowerGateway;
   }
 
   //电表设备的数据获取网关
-  get electricMeter(): deviceFilter<ElectricMeter> {
+  get electricMeter(): DeviceFilter<ElectricMeter> {
     return this.getFilter("ElectricMeter", ElectricMeterGateway);
   }
 
   private getFilter<T extends { id: number }>(
     type: string,
-    cls: new (context: Shzx) => deviceFilter<T>
-  ): deviceFilter<T> {
+    cls: new (context: Cpzxrobot) => DeviceFilter<T>
+  ): DeviceFilter<T> {
     if (this.filters.has(type)) {
-      return this.filters.get(type) as deviceFilter<T>;
+      return this.filters.get(type) as DeviceFilter<T>;
     }
     const filter = new cls(this.context);
     this.filters.set(type, filter);

package/device_type_gateway.ts

@@ -1,10 +1,12 @@
+import { Cpzxrobot, Unit } from "."
+
 //缓存设备类型数据
 export class DeviceTypeGateway {
   deviceTypes: any
   // axios: MyAxiosInstance;
-  context: Shzx
+  context: Cpzxrobot
 
-  constructor(context: Shzx) {
+  constructor(context: Cpzxrobot) {
     this.context = context
   }
 

package/device_types/electricmeter.ts

@@ -1,7 +1,7 @@
 import { type ElectricMeter } from "..";
-import { deviceFilter } from "../device_filter";
+import { DeviceFilter } from "../device_filter";
 
-export class ElectricMeterGateway extends deviceFilter<ElectricMeter> {
+export class ElectricMeterGateway extends DeviceFilter<ElectricMeter> {
   // Add properties and methods specific to the FeedTower type here
 
   get deviceType() {

package/device_types/feedtower.ts

@@ -1,7 +1,7 @@
-import { type FeedTower } from '..'
-import { deviceFilter, type DataQueryArgs } from '../device_filter'
+import { type FodderOrderList, type FeedTower,type FeedTowerExtraInfo } from '..'
+import { DeviceFilter, type DataQueryArgs } from '../device_filter'
 
-export class FeedTowerGateway extends deviceFilter<FeedTower> {
+export class FeedTowerGateway extends DeviceFilter<FeedTower> {
   // Add properties and methods specific to the FeedTower type here
 
   get deviceType() {
@@ -50,7 +50,7 @@ export class FeedTowerGateway extends deviceFilter<FeedTower> {
     //TODO 其他设备的详情需要支持，目前只有喂料塔
     return this.context.axios
       .post('/api/v1/pigfarm/device/status/list', ids)
-      .then((res) => {
+      .then((res:any) => {
         if (res.data.code != 200) {
           throw res.data.message
         } else {
@@ -66,7 +66,7 @@ export class FeedTowerGateway extends deviceFilter<FeedTower> {
   }
 
 
-  async enter(data: FodderAdd): Promise<any> {
+  async enter(data: FodderOrderList): Promise<any> {
     const res = await this.context.axios.post('/api/v1/pigfarm/device/fodder/import', data)
     return res
   }

package/device_types/normal_type.ts

@@ -1,7 +1,8 @@
-import { deviceFilter } from "../device_filter";
+import { Device } from "..";
+import { DeviceFilter } from "../device_filter";
 
 //适配常见设备类型
-export class NormalGateway extends deviceFilter<Device> {
+export class NormalGateway extends DeviceFilter<Device> {
   get deviceType() {
     return null;
   }

package/dist/camera_gateway.js

@@ -9,8 +9,8 @@ class CameraGateway extends Object {
     //搜索摄像头
     async search(data) {
         await this.context.ready;
-        const response = await this.context.axios.post('/api/v1/camera/search', {
-            unit_id: data.id
+        const response = await this.context.axios.post("/api/v1/camera/search", {
+            unit_id: data.id,
         });
         return response.data;
     }

package/dist/device_filter.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deviceFilter = void 0;
-class deviceFilter {
+exports.DeviceFilter = void 0;
+class DeviceFilter {
     // private getDetail!: (info: T, id: number, context: Shzx) => Promise<any> | null
     // axios: MyAxiosInstance;
     // user: UserGateway;
@@ -250,4 +250,4 @@ class deviceFilter {
         });
     }
 }
-exports.deviceFilter = deviceFilter;
+exports.DeviceFilter = DeviceFilter;

package/dist/device_types/electricmeter.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElectricMeterGateway = void 0;
 const device_filter_1 = require("../device_filter");
-class ElectricMeterGateway extends device_filter_1.deviceFilter {
+class ElectricMeterGateway extends device_filter_1.DeviceFilter {
     // Add properties and methods specific to the FeedTower type here
     get deviceType() {
         return "Electric";

package/dist/device_types/feedtower.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FeedTowerGateway = void 0;
 const device_filter_1 = require("../device_filter");
-class FeedTowerGateway extends device_filter_1.deviceFilter {
+class FeedTowerGateway extends device_filter_1.DeviceFilter {
     // Add properties and methods specific to the FeedTower type here
     get deviceType() {
         return 'FeedTower';

package/dist/device_types/normal_type.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NormalGateway = void 0;
 const device_filter_1 = require("../device_filter");
 //适配常见设备类型
-class NormalGateway extends device_filter_1.deviceFilter {
+class NormalGateway extends device_filter_1.DeviceFilter {
     get deviceType() {
         return null;
     }

package/dist/energy_types/electric_meter_gateway.js

@@ -1,10 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ElectricMeterGateway = void 0;
-const __1 = __importDefault(require(".."));
 //消息助手网关，获取消息助手的信息
 class ElectricMeterGateway extends Object {
     constructor(context) {
@@ -13,7 +9,7 @@ class ElectricMeterGateway extends Object {
     }
     //返回峰谷平电表的阶梯区间
     getRates() {
-        return (0, __1.default)().ready.then((axios) => {
+        return this.context.ready.then((axios) => {
             return axios.get('/api/v1/energy/electricRange').then((res) => {
                 if (res.data.code !== 200) {
                     throw res.data.message;