@cpzxrobot/sdk 1.0.4 → 1.0.5

package/transport_gateway.ts

@@ -1,10 +1,12 @@
+import { Cpzxrobot, FodderOrder } from ".";
+
 export class TransportGateway extends Object {
-  _selectedFarm: string = ''
-  context: Shzx
+  _selectedFarm: string = "";
+  context: Cpzxrobot;
 
-  constructor(context: Shzx) {
-    super()
-    this.context = context
+  constructor(context: Cpzxrobot) {
+    super();
+    this.context = context;
   }
 
   get fodder() {
@@ -13,55 +15,70 @@ export class TransportGateway extends Object {
       getData: (
         id: number | undefined = undefined,
         page: {
-          current: number
-          pageSize: number
-          deviceId: number | undefined
+          current: number;
+          pageSize: number;
+          deviceId: number | undefined;
         } = {
-            current: 1,
-            pageSize: 10,
-            deviceId: id
-          }
+          current: 1,
+          pageSize: 10,
+          deviceId: id,
+        }
       ): Promise<FodderOrder[]> => {
         return this.context.ready.then(() => {
           return this.context.axios
-            .get('/api/v1/pigfarm/device/fodder', {
-              params: page
+            .get("/api/v1/pigfarm/device/fodder", {
+              params: page,
             })
             .then((res) => {
               if (res.data.code != 200) {
-                throw res.data.message
+                throw res.data.message;
               }
-              return res.data.data.list
+              return res.data.data.list;
+            });
+        });
+      },
+      //获取设备打料数据
+      getDetail: (ids: Array<number>, date: string): Promise<any> => {
+        return this.context.ready.then(() => {
+          return this.context.axios
+            .post("/api/v1/pigfarm/device/fodderTower/detailDeviceLoad", {
+              ids,
+              date,
             })
-        })
+            .then((res) => {
+              return res.data;
+            });
+        });
       },
       create: (data: FodderOrder) => {
         return this.context.ready.then(() => {
-          return this.context.axios.post('/api/v1/pigfarm/device/fodder/add', data).then((res) => {
-            if (res.data.code != 200) {
-              throw res.data.message
-            }
-            return res.data.data
-          })
-        })
+          return this.context.axios
+            .post("/api/v1/pigfarm/device/fodder/add", data)
+            .then((res) => {
+              if (res.data.code != 200) {
+                throw res.data.message;
+              }
+              return res.data.data;
+            });
+        });
       },
       bind: (data: {
-        deviceIds: number[]
-        fodderType: string //料塔类型
-        fodderAmount: number //料塔容量
-        fodderId: number //料塔id,类 ZC2023  用于绑定料塔
+        deviceIds: number[];
+        fodderType: string; //料塔类型
+        fodderAmount: number; //料塔容量
+        fodderId: number; //料塔id,类 ZC2023  用于绑定料塔
       }) => {
         return this.context.ready.then(() => {
           return this.context.axios
-            .post('/api/v1/pigfarm/device/fodderTower/addList', data)
+            .post("/api/v1/pigfarm/device/fodderTower/addList", data)
             .then((res) => {
               if (res.data.code != 200) {
-                throw res.data.message
+                throw res.data.message;
               }
-              return res.data.data
-            })
-        })
-      }
-    }
+              return res.data.data;
+            });
+        });
+      },
+    };
   }
 }

package/types.d.ts

@@ -1,102 +1,182 @@
-
+import { DeviceGateway } from "@cpzxrobot/sdk/device_gateway";
+import { FactoryGateway } from "@cpzxrobot/sdk/factory_gateway";
+import { TransportGateway } from "@cpzxrobot/sdk/transport_gateway";
+import { UserGateway } from "@cpzxrobot/sdk/user_gateway";
 
 type Device = {
-  id: number
-  deviceId: string
-  name: string
-  type: number
-  typeCode:string
-  currentAmount: number
-  location: string
-  supplier?: string
-  data?: number[]
-  typeCode: string
-}
+  id: number;
+  deviceId: string;
+  name: string;
+  type: number;
+  typeCode: string;
+  currentAmount: number;
+  location: string;
+  supplier?: string;
+  data?: number[];
+  typeCode: string;
+};
 
-type FeedTowerExtraInfo = {
-  currentAmount: number
-  loadAmount: number
-  feedTowerAmount: number
-  feedTowerCode: string
-  id: number
-  surplus_amount: number
-}
+export type FeedTowerExtraInfo = {
+  currentAmount: number;
+  loadAmount: number;
+  feedTowerAmount: number;
+  feedTowerCode: string;
+  id: number;
+  surplus_amount: number;
+};
 
-type FodderOrder = {
-  id?: number
-  fodderId?: string
-  fodderAmount: number
-  fodderCode: string
-  createTime: string
-  status: string
-  fodderUnit: string
-  truckCode?: string
-  date?: string
-  type?: string
-}
-//录入
-type FodderAdd = {
-  car: string //车牌号
-  date: string //日期
-  source: string //来源
-  factoryCode: string //当前工厂编号
-  results: FodderUpdate[]
-}
-type FodderUpdate = {
-  farm: string //工厂名称
-  fodderCode: string //料号
-  towers: Fodder[]
-}
+//FodderOrder 料单信息
+export type FodderOrder = {
+  id?: number;
+  fodderId?: string;
+  fodderAmount: number;
+  fodderCode: string;
+  createTime: string;
+  status: string;
+  fodderUnit: string;
+  truckCode?: string;
+  date?: string;
+  type?: string;
+};
+//
+export type FodderOrderList = {
+  car: string; //车牌号
+  date: string; //日期
+  source: string; //来源
+  factoryCode: string; //当前工厂编号
+  results: FodderOrderInFactory[];
+};
+type FodderOrderInFactory = {
+  farm: string; //工厂名称
+  fodderCode: string; //料号
+  towers: FodderOrderInTower[];
+};
 
-type Fodder = {
-  name: string //料塔名称
-  unit: string //单位
-  weight: number //重量
-}
+export type FodderOrderInTower = {
+  name: string; //料塔名称
+  unit: string; //单位
+  weight: number; //重量
+};
 
-type Shzx = {
-  user: UserGateway
-  ready: Promise<MyAxiosInstance>
-  axios: MyAxiosInstance
-  _getSelectedFarmFromMiniApp: () => Promise<Factory>
-  _getSelectedUnitFromMiniApp: () => Promise<Unit>
-  mode: string
-}
 type Assistant = {
-  info: String
-  status: String
-  name: String
-  id: Number
-}
-type Factory = {
-  code: string
-  name?: string
-  company_code: string
-  id?: number
-}
+  info: String;
+  status: String;
+  name: String;
+  id: Number;
+};
+export type Factory = {
+  code: string;
+  name?: string;
+  company_code: string;
+  id?: number;
+};
 type Unit = {
-  name?: string
-  id?: number
-  type?: string
-  workshopName?:string
-}
+  name?: string;
+  id?: number;
+  type?: string;
+  workshopName?: string;
+};
 
 type Electricity = {
-  deviceId: string
-  nextDeviceList: number[] | []
-  power: number
-}
+  deviceId: string;
+  nextDeviceList: number[] | [];
+  power: number;
+};
 
 type Camera = {
-  id: number
-  name: string
+  id: number;
+  name: string;
+};
+
+export type FeedTower = {
+  id: number;
+  name: string;
+  currentAmount: number;
+  lastZeroTime: string;
+  cycle?: number;
+  "pg.feedtower.status"?: string;
+  "pg.feedtower.near-zero"?: string;
+  deviation: number;
+  towerVolume: number;
+  unit: string;
+  unitId: number;
+  deviceId: number;
+  fodderUnit: string;
+  fodderCode: string;
+  diff: number;
+};
+
+export interface MyAxiosInstance {
+  get: (url: string, config?: any) => Promise<any>;
+  post: (url: string, data?: any, config?: any) => Promise<any>;
 }
 
-interface MyAxiosInstance {
-  get: (url: string, config?: any) => Promise<any>
-  post: (url: string, data?: any, config?: any) => Promise<any>
+export interface Assistant {
+  info: String;
+  status: Number;
+  name: String;
+  id: Number;
+}
+export interface ElectricMeter extends Device {
+  coefficient: number;
+  status: string;
+}
+
+export class Cpzxrobot {
+  transport: TransportGateway;
+  ready: Promise<MyAxiosInstance>;
+  factory: FactoryGateway;
+  user: UserGateway;
+  device: DeviceGateway;
+  mode: string;
+  axios: MyAxiosInstance;
+  _getSelectedFarmFromMiniApp: () => Promise<Factory>;
+  _getSelectedUnitFromMiniApp: () => Promise<Unit>;
 }
 
 declare global {
-  let getAuth: () => string
+  let getAuth: () => string;
+}
+
+declare module "@cpzxrobot/sdk" {
+  export default function (
+    args: {
+      devAuth: string;
+      baseURL: string;
+      appCode: string;
+      selectedFarm: Factory;
+      selectedUnit: Unit;
+    } = {
+      devAuth: "",
+      appCode: "",
+      baseURL: "https://www.cpzxrobot.com/",
+      selectedFarm: {
+        id: 0,
+        code: "",
+        name: "",
+        company_code: "",
+      },
+      selectedUnit: {
+        id: 0,
+        name: "",
+      },
+    }
+  ): Cpzxrobot;
+  export {
+    Cpzxrobot,
+    Factory,
+    Unit,
+    Device,
+    FeedTower,
+    FodderOrder,
+    FodderOrderList,
+    FodderOrderInFactory,
+    FodderOrderInTower,
+    MyAxiosInstance,
+    Assistant,
+    ElectricMeter,
+    Camera,
+    FeedTowerExtraInfo,
+    Electricity,
+  };
 }

package/user_gateway.ts

@@ -1,3 +1,5 @@
+import { Cpzxrobot, Factory, Unit } from "./types";
+
 export class UserGateway extends Object {
   _selectedFarm: Factory = {
     code: "",
@@ -5,19 +7,19 @@ export class UserGateway extends Object {
     company_code: "",
     id: 0,
   };
-  context: Shzx;
+  context: Cpzxrobot;
   _selectedUnit: Unit = {
     name: "",
     id: 0,
   };
 
-  constructor(context: Shzx) {
+  constructor(context: Cpzxrobot) {
     super();
     this.context = context;
   }
 
   //获得当前用户选择的工厂
-  getSelectedFarm() {
+  public getSelectedFarm(): Promise<Factory> {
     return new Promise<Factory>((resolve, reject) => {
       switch (this.context.mode) {
         case "dev":