@ningboyz/apis 1.0.16 → 1.0.18

package/index.ts

@@ -1,23 +1,22 @@
-import CoreRequest from "./src/core";
-import FLowRequest from "./src/flow";
-import WtuiRequest from "./src/wtui";
-import PzptRequest from "./src/pzpt";
-import ExpdRequest from "./src/expd";
-import GamsRequest from "./src/gams";
-import WldyRequest from "./src/wldy";
-import GzjgRequest from "./src/gzjg";
-import TablRequest from "./src/tabl";
-import CardRequest from "./src/card";
-import CnfgRequest from "./src/cnfg";
-import LoadRequest from "./src/load";
-import OcriRequest from "./src/ocri";
-import GrowRequest from "./src/grow";
-import TaskRequest from "./src/task";
-import GztbRequest from "./src/gztb/index";
-import AntvRequest from "./src/antv/index";
-import NotiRequest from "./src/noti/index";
-import { IAxiosConfig } from "./src/axios";
-
+import CoreRequest from "./packages/core";
+import FLowRequest from "./packages/flow";
+import WtuiRequest from "./packages/wtui";
+import PzptRequest from "./packages/pzpt";
+import ExpdRequest from "./packages/expd";
+import GamsRequest from "./packages/gams";
+import WldyRequest from "./packages/wldy";
+import GzjgRequest from "./packages/gzjg";
+import TablRequest from "./packages/tabl";
+import CardRequest from "./packages/card";
+import CnfgRequest from "./packages/cnfg";
+import LoadRequest from "./packages/load";
+import OcriRequest from "./packages/ocri";
+import GrowRequest from "./packages/grow";
+import TaskRequest from "./packages/task";
+import GztbRequest from "./packages/gztb/index";
+import AntvRequest from "./packages/antv/index";
+import NotiRequest from "./packages/noti/index";
+import { IAxiosConfig } from "./packages/axios";
 class Request {
   public static core: CoreRequest;
   public static flow: FLowRequest;
@@ -60,4 +59,4 @@ class Request {
   }
 }
 
-export default Request;
+export default Request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ningboyz/apis",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "private": false,
   "description": "宁波甬政请求库",
   "author": "",

package/{src → packages}/antv/cnfg.ts

@@ -1,7 +1,8 @@
 import { TAntv } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IAntvCnfgDetaildbQuerys, IAntvCnfgSelectdbQuerys } from "./type";
 
-class ParaRequest {
+class CnfgRequest {
   private httpRequest: HttpRequest;
   constructor(httpRequest: HttpRequest) {
     this.httpRequest = httpRequest;
@@ -10,43 +11,37 @@ class ParaRequest {
   /**
    * 获取数字提取列表
    */
-  selectdb(antvmain: number) {
-    const params = {
-      antvmain
-    };
-    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/selectdb", undefined, params);
+  selectdb(querys: IAntvCnfgSelectdbQuerys) {
+    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/selectdb", querys, undefined);
   }
 
   /**
    * 新增数字提取列表
    */
-  insertdb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/insertdb", data, undefined);
+  insertdb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/insertdb", undefined, Querys);
   }
 
   /**
    * 修改数字提取列表
    */
-  updatedb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/updatedb", data, undefined);
+  updatedb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/updatedb", undefined, Querys);
   }
 
   /**
    * 删除数字提取列表
    */
-  deletedb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/deletedb", data, undefined);
+  deletedb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/deletedb", undefined, Querys);
   }
 
   /**
    * 获取数字提取详情列表
    */
-  detaildb(antvmain: number) {
-    const params = {
-      antvmain
-    };
-    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/detaildb", undefined, params);
+  detaildb(querys: IAntvCnfgDetaildbQuerys) {
+    return this.httpRequest.post<TAntv.IAntvCnfgResponse[]>("/antv/tcnfg/detaildb", querys, undefined);
   }
 }
 
-export default ParaRequest;
+export default CnfgRequest;

package/{src → packages}/antv/index.ts

@@ -2,6 +2,7 @@ import { createRequest, IAxiosConfig } from "../axios";
 import MainRequest from "./main";
 import CnfgRequest from "./cnfg";
 import ParaRequest from "./para";
+export * from "./type";
 
 class AntvRequest {
   public main: MainRequest;

package/{src → packages}/antv/main.ts

@@ -1,7 +1,8 @@
 import { TAntv } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IAntvMainDetaildbQuerys, IAntvMainGet5DataQuerys } from "./type";
 
-class ParaRequest {
+class MainRequest {
   private httpRequest: HttpRequest;
   constructor(httpRequest: HttpRequest) {
     this.httpRequest = httpRequest;
@@ -17,46 +18,37 @@ class ParaRequest {
   /**
    * 新增数字提取类型列表
    */
-  insertdb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/insertdb", data, undefined);
+  insertdb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/insertdb", undefined, Querys);
   }
 
   /**
    * 修改数字提取类型列表
    */
-  updatedb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/updatedb", data, undefined);
+  updatedb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/updatedb", undefined, Querys);
   }
 
   /**
    * 删除数字提取类型列表
    */
-  deletedb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/deletedb", data, undefined);
+  deletedb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/deletedb", undefined, Querys);
   }
 
   /**
-   * 删除数字提取类型列表
+   * 详情数字提取类型列表
    */
-  detaildb(antvmain: number) {
-    const params = {
-      antvmain
-    };
-    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/detaildb", undefined, params);
+  detaildb(querys: IAntvMainDetaildbQuerys) {
+    return this.httpRequest.post<TAntv.IAntvMainResponse[]>("/antv/tmain/detaildb", querys, undefined);
   }
 
   /**
    * 动态取数
    */
-  get5data(antvname: string, cnfgname: string, unitTypeText: string, cnfgPara?: any) {
-    const params = {
-      antvname,
-      cnfgname,
-      unitTypeText,
-      ...cnfgPara
-    };
-    return this.httpRequest.post<any>("/gapi/antv/tmain/get5data", undefined, params);
+  get5data(querys: IAntvMainGet5DataQuerys) {
+    return this.httpRequest.post<any>("/gapi/antv/tmain/get5data", querys, undefined);
   }
 }
 
-export default ParaRequest;
+export default MainRequest;

package/{src → packages}/antv/para.ts

@@ -1,5 +1,6 @@
 import { TAntv } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IAntvParaDetaildbQuerys, IAntvParaSelectdbQuerys } from "./type";
 
 class ParaRequest {
   private httpRequest: HttpRequest;
@@ -10,43 +11,36 @@ class ParaRequest {
   /**
    * 获取数字提取参数列表
    */
-  selectdb(antvmain: number, antvcnfg: number) {
-    const params = {
-      antvmain,
-      antvcnfg
-    };
-    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/selectdb", undefined, params);
+  selectdb(querys: IAntvParaSelectdbQuerys) {
+    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/selectdb", querys, undefined);
   }
 
   /**
    * 新增数字提取参数列表
    */
-  insertdb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/insertdb", data, undefined);
+  insertdb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/insertdb", undefined, Querys);
   }
 
   /**
    * 修改数字提取参数列表
    */
-  updatedb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/updatedb", data, undefined);
+  updatedb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/updatedb", undefined, Querys);
   }
 
   /**
    * 删除数字提取参数列表
    */
-  deletedb(data: object) {
-    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/deletedb", data, undefined);
+  deletedb(Querys: object) {
+    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/deletedb", undefined, Querys);
   }
 
   /**
    * 获取数字提取参数详情列表
    */
-  detaildb(antvmain: number) {
-    const params = {
-      antvmain
-    };
-    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/detaildb", undefined, params);
+  detaildb(querys: IAntvParaDetaildbQuerys) {
+    return this.httpRequest.post<TAntv.IAntvParaResponse[]>("/antv/tpara/detaildb", querys, undefined);
   }
 }
 

package/packages/antv/type.ts

@@ -0,0 +1,56 @@
+/** cnfg */
+export interface IAntvCnfgSelectdbQuerys {
+  antvmain: number;
+}
+
+export class TAntvCnfgSelectdbQuerys implements IAntvCnfgSelectdbQuerys {
+  antvmain: number = -1;
+}
+
+export interface IAntvCnfgDetaildbQuerys {
+  antvmain: number;
+}
+
+export class TAntvCnfgDetaildbQuerys implements IAntvCnfgDetaildbQuerys {
+  antvmain: number = -1;
+}
+
+/** main */
+export interface IAntvMainDetaildbQuerys {
+  antvmain: number;
+}
+
+export class TAntvMainDetaildbQuerys implements IAntvMainDetaildbQuerys {
+  antvmain: number = -1;
+}
+
+export interface IAntvMainGet5DataQuerys {
+  antvname: string;
+  cnfgname: string;
+  unittypetext: string;
+}
+
+export class TAntvMainGet5DataQuerys implements IAntvMainGet5DataQuerys {
+  antvname: string = "";
+  cnfgname: string = "";
+  unittypetext: string = "";
+}
+
+/** para */
+export interface IAntvParaSelectdbQuerys {
+  antvmain: number;
+  antvcnfg: number;
+}
+
+export class TAntvParaSelectdbQuerys implements IAntvParaSelectdbQuerys {
+  antvmain: number = -1;
+  antvcnfg: number = -1;
+}
+
+export interface IAntvParaDetaildbQuerys {
+  antvmain: number;
+}
+
+export class TAntvParaDetaildbQuerys implements IAntvParaDetaildbQuerys {
+  antvmain: number = -1;
+}

package/{src → packages}/axios.ts

@@ -14,7 +14,7 @@ const initUserInfo = {
   whobuild: 0,
   userindx: 0,
   usrtoken: "",
-  dbconfig: "",
+  dbconfig: ""
 };
 
 class HttpRequest {
@@ -26,20 +26,18 @@ class HttpRequest {
     const { baseURL, timeout = 60000, getUserInfo } = config;
     this.instance = axios.create({
       baseURL,
-      timeout,
+      timeout
     });
 
     this.instance.interceptors.request.use((request) => {
-      const userInfo = !_.isNil(getUserInfo)
-        ? getUserInfo()
-        : new TSessionUserInfo();
+      const userInfo = !_.isNil(getUserInfo) ? getUserInfo() : new TSessionUserInfo();
       /** 添加随机数，防止浏览器接口缓存 */
       const time = new Date().getTime() + Math.round(Math.random() * 1000);
       request.params = {
         whobuild: userInfo.whobuild !== 0 ? userInfo.whobuild : undefined,
         userindx: userInfo.userIndx !== 0 ? userInfo.userIndx : undefined,
         ...request.params,
-        r: time,
+        r: time
       };
       request.headers.usrtoken = userInfo.usrtoken;
       request.headers.dbconfig = userInfo.dbConfig;
@@ -47,13 +45,22 @@ class HttpRequest {
     });
   }
 
-  get<T>(url: string, params?: object): Promise<IResponse<T>> {
+  getFormData(data: object) {
+    if (data instanceof FormData) {
+      return data;
+    }
+    const formData = new FormData();
+    formData.append("params", JSON.stringify(data));
+    return formData;
+  }
+
+  get<T>(url: string, querys?: object): Promise<IResponse<T>> {
     return new Promise((resolve, reject) => {
       this.instance
         .request<T>({
           method: this.METHOD_GET,
           url,
-          params,
+          params: querys
         })
         .then((res: AxiosResponse) => {
           resolve(res.data as IResponse<T>);
@@ -64,22 +71,18 @@ class HttpRequest {
     });
   }
 
-  post<T>(
-    url: string,
-    data?: object,
-    params?: object,
-    headers?: object
-  ): Promise<IResponse<T>> {
+  post<T>(url: string, querys?: object, params?: object, headers?: object): Promise<IResponse<T>> {
     return new Promise((resolve, reject) => {
+      const data = !_.isNil(params) ? this.getFormData(params) : void 0;
       this.instance
         .request<T>({
           method: this.METHOD_POST,
           url,
-          params,
+          params: querys,
           data,
           headers: {
-            ...headers,
-          },
+            ...headers
+          }
         })
         .then((res: AxiosResponse) => {
           resolve(res.data as IResponse<T>);
@@ -90,21 +93,18 @@ class HttpRequest {
     });
   }
 
-  postFile<T>(
-    url: string,
-    data?: object,
-    params?: object
-  ): Promise<IResponse<T>> {
+  postFile<T>(url: string, querys?: object, params?: object): Promise<IResponse<T>> {
     return new Promise((resolve, reject) => {
+      const data = !_.isNil(params) ? this.getFormData(params) : void 0;
       this.instance
         .request({
           url,
           method: this.METHOD_POST,
-          params,
+          params: querys,
           data,
           headers: {
-            "Content-Type": `multipart/form-data;boundary=${new Date().getTime()}`,
-          },
+            "Content-Type": `multipart/form-data;boundary=${new Date().getTime()}`
+          }
         })
         .then((res: AxiosResponse) => {
           resolve(res.data as IResponse<T>);

package/{src → packages}/card/gblb.ts

@@ -1,5 +1,6 @@
 import { TCard } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { ICardGblbCheckzclbQuerys, ICardGblbDetaildbQuerys, ICardGblbGet4zclbQuerys, ICardGblbNextYearQuerys, ICardGblbSelectdbQuerys, ICardGblbUploaddbQuerys } from "./type";
 
 class GblbRequest {
   private httpRequest: HttpRequest;
@@ -9,86 +10,83 @@ class GblbRequest {
 
   /**
    * 获取国标类别
+   * @param querys
+   * @returns
    */
-  selectdb(sourcend: number) {
-    const params = {
-      sourcend
-    };
-    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/selectdb", undefined, params);
+  selectdb(querys: ICardGblbSelectdbQuerys) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/selectdb", querys, undefined);
   }
 
   /**
    * 添加国标类别
+   * @param params
+   * @returns
    */
-  insertdb(data: object) {
-    return this.httpRequest.post<TCard.IGblbResponse[]>(`/gapi/card/tgblb/insertdb`, data, undefined);
+  insertdb(params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>(`/gapi/card/tgblb/insertdb`, undefined, params);
   }
 
   /**
    * 编辑国标类别
-   * @param data
+   * @param params
    */
-  updatedb(data: object) {
-    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/updatedb", data, undefined);
+  updatedb(params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/updatedb", undefined, params);
   }
 
   /**
    * 删除国标类别
-   * @param data
+   * @param params
    */
-  deletedb(data: object) {
-    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/deletedb", data, undefined);
+  deletedb(params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/deletedb", undefined, params);
   }
 
   /**
    * 国标类别详情
-   * @param gblbmain
-   * @param data
-   * @param sourcend
+   * @param querys
+   * @param params
+   * @returns
    */
-  detaildb(gblbmain: number, data: object, sourcend: number) {
-    const params = {
-      gblbmain,
-      sourcend
-    };
-    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/detaildb", data, params);
+  detaildb(querys: ICardGblbDetaildbQuerys, params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/detaildb", querys, params);
   }
 
   /**
    * 导入国标类别
+   * @param querys
+   * @param params
+   * @returns
    */
-  uploaddb(data: object, params: object) {
-    return this.httpRequest.post<TCard.IGblbResponse[]>(`/gapi/card/tgblb/uploaddb`, data, params);
+  uploaddb(querys: ICardGblbUploaddbQuerys, params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>(`/gapi/card/tgblb/uploaddb`, querys, params);
   }
 
   /**
    * 判断国标类别关联资产卡片
    * @param data
    */
-  judgedb(data: object) {
-    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/judgedb", data, undefined);
+  judgedb(params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>("/gapi/card/tgblb/judgedb", undefined, params);
   }
 
   /**
    * 根据国标类别获取资产类别
+   * @param querys
+   * @returns
    */
-  get4zclb(gblbmain: number, sourcend: number) {
-    const params = {
-      gblbmain,
-      sourcend
-    };
-    return this.httpRequest.post<TCard.IZclbResponse[]>(`/gapi/card/tgblb/get4zclb`, undefined, params);
+  get4zclb(querys: ICardGblbGet4zclbQuerys) {
+    return this.httpRequest.post<TCard.IZclbResponse[]>(`/gapi/card/tgblb/get4zclb`, querys, undefined);
   }
 
   /**
    * 检查国标类别对应资产类别
+   * @param querys
+   * @param params
+   * @returns
    */
-  checkzclb(data: object, zclbtype: number, sourcend: number) {
-    const params = {
-      zclbtype,
-      sourcend
-    };
-    return this.httpRequest.post<TCard.IGblbResponse[]>(`/gapi/card/tgblb/checkzclb`, data, params);
+  checkzclb(querys: ICardGblbCheckzclbQuerys, params: object) {
+    return this.httpRequest.post<TCard.IGblbResponse[]>(`/gapi/card/tgblb/checkzclb`, querys, params);
   }
 
   /**
@@ -96,11 +94,8 @@ class GblbRequest {
    * 结账时，调用该接口，将结账的那条年度传入sourcend
    * 如果跨年度，则调用该接口
    */
-  nextYear(sourcend: number) {
-    const params = {
-      sourcend
-    };
-    return this.httpRequest.post<TCard.IZclbResponse[]>(`/gapi/card/tgblb/nextyear`, undefined, params);
+  nextYear(querys: ICardGblbNextYearQuerys) {
+    return this.httpRequest.post<TCard.IZclbResponse[]>(`/gapi/card/tgblb/nextyear`, querys, undefined);
   }
 }
 

package/{src → packages}/card/index.ts

@@ -10,6 +10,7 @@ import FormRequest from "./form";
 import ZczjRequest from "./zczj";
 import P4pzRequest from "./p4pz";
 import ZczjPropRequest from "./zczjProp";
+export * from "./type";
 
 class CardRequest {
   public gblb: GblbRequest;