@ningboyz/apis 1.0.20 → 1.0.22

package/index.ts

@@ -13,9 +13,9 @@ 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 GztbRequest from "./packages/gztb";
+import AntvRequest from "./packages/antv";
+import NotiRequest from "./packages/noti";
 import { IAxiosConfig } from "./packages/axios";
 class Request {
   public static core: CoreRequest;
@@ -59,4 +59,5 @@ class Request {
   }
 }
 
-export default Request;
+export default Request;
+export * from "./packages";

package/package.json

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

package/packages/antv/index.ts

@@ -2,7 +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;
@@ -18,3 +18,4 @@ class AntvRequest {
 }
 
 export default AntvRequest;
+export * from "./type";

package/packages/axios.ts

@@ -1,4 +1,4 @@
-import type { AxiosInstance, AxiosResponse } from "axios";
+import type { AxiosInstance, AxiosResponse, InternalAxiosRequestConfig } from "axios";
 import axios from "axios";
 import _ from "lodash";
 import { type IResponse, type TStore } from "@ningboyz/types";
@@ -8,6 +8,8 @@ export interface IAxiosConfig {
   baseURL: string;
   timeout?: number;
   getUserInfo?: () => ISessionUserInfo;
+  interceptorsRequest?: (request: InternalAxiosRequestConfig<any>) => InternalAxiosRequestConfig<any>;
+  interceptorsResponse?: (response: AxiosResponse<any>) => AxiosResponse<any>;
 }
 
 const initUserInfo = {
@@ -23,26 +25,39 @@ class HttpRequest {
   private readonly METHOD_POST: string = "POST";
 
   constructor(config: IAxiosConfig) {
-    const { baseURL, timeout = 60000, getUserInfo } = config;
+    const { baseURL, timeout = 60000, getUserInfo, interceptorsRequest, interceptorsResponse } = config;
     this.instance = axios.create({
       baseURL,
       timeout
     });
-
-    this.instance.interceptors.request.use((request) => {
-      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
-      };
-      request.headers.usrtoken = userInfo.usrtoken;
-      request.headers.dbconfig = userInfo.dbConfig;
-      return request;
-    });
+    /**用户传了请求中间件 */
+    if (!_.isNil(interceptorsRequest)) {
+      this.instance.interceptors.request.use(interceptorsRequest);
+    } else {
+      this.instance.interceptors.request.use((request) => {
+        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
+        };
+        request.headers.usrtoken = userInfo.usrtoken;
+        request.headers.dbconfig = userInfo.dbConfig;
+        return request;
+      });
+    }
+    
+    /**用户传了响应中间件 */
+    if (!_.isNil(interceptorsResponse)) {
+      this.instance.interceptors.response.use(interceptorsResponse);
+    } else {
+      this.instance.interceptors.response.use((response) => {
+        return response;
+      });
+    }
   }
 
   getFormData(data: object) {

package/packages/card/index.ts

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

package/packages/cnfg/index.ts

@@ -11,3 +11,4 @@ class CnfgRequest {
 }
 
 export default CnfgRequest;
+export * from "./type"

package/packages/cnfg/type.ts

@@ -0,0 +1,4 @@
+/** ========== main ========== */
+export interface ICnfgMainSelectdbQuerys {}
+
+export class TCnfgMainSelectdbQuerys implements ICnfgMainSelectdbQuerys {}

package/packages/core/index.ts

@@ -13,7 +13,6 @@ import PathRequest from "./path";
 import SyskjndRequest from "./syskjnd";
 import LaidRequest from "./laid";
 import SysTravelRequest from "./systravel";
-export * from "./types";
 
 class CoreRequest {
   public type: TypeRequest;
@@ -51,3 +50,4 @@ class CoreRequest {
 }
 
 export default CoreRequest;
+export * from "./types";

package/packages/expd/index.ts

@@ -1,6 +1,5 @@
 import { createRequest, IAxiosConfig } from "../axios";
 import MainRequest from "./main";
-export * from "./type";
 
 class ExpdRequest {
   public main: MainRequest;
@@ -12,3 +11,4 @@ class ExpdRequest {
 }
 
 export default ExpdRequest;
+export * from "./type";

package/packages/flow/duty.ts

@@ -1,6 +1,6 @@
 import type { TFlow } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
-import { IFlowDutyInsertdbQuerys, IFlowDutySelectdbQuerys } from "./type";
+import { IFlowDutyDetaildbQuerys, IFlowDutyInsertdbQuerys, IFlowDutySelectdbQuerys, IFlowDutyUpdatedbQuerys } from "./type";
 
 class DutyRequest {
   private httpRequest: HttpRequest;
@@ -19,6 +19,9 @@ class DutyRequest {
 
   /**
    * 根据flowmain添加审核要素
+   * @param querys
+   * @param params
+   * @returns
    */
   insertdb(querys: IFlowDutyInsertdbQuerys, params: object) {
     return this.httpRequest.post<TFlow.IFlowDutyResponse[]>(`/flow/tduty/insertdb`, querys, params);
@@ -26,29 +29,28 @@ class DutyRequest {
 
   /**
    * 根据flowmain修改审核要素
+   * @param querys 
+   * @param params 
+   * @returns 
    */
-  updatedb(flowmain: number, data: object) {
-    const params = {
-      flowmain
-    };
-    return this.httpRequest.post<TFlow.IFlowDutyResponse[]>(`/flow/tduty/updatedb`, data, params);
+  updatedb(querys: IFlowDutyUpdatedbQuerys, params: object) {
+    return this.httpRequest.post<TFlow.IFlowDutyResponse[]>(`/flow/tduty/updatedb`, querys, params);
   }
 
   /**
    * 根据flowmain查找审核要素详情
    */
-  detaildb(flowmain: number) {
-    const params = {
-      flowmain
-    };
-    return this.httpRequest.post<TFlow.IFlowDutyResponse[]>("/flow/tduty/detaildb", undefined, params);
+  detaildb(querys: IFlowDutyDetaildbQuerys) {
+    return this.httpRequest.post<TFlow.IFlowDutyResponse[]>("/flow/tduty/detaildb", querys, undefined);
   }
 
   /**
    * 根据flowmain删除审核要素
+   * @param params 
+   * @returns 
    */
-  deletedb(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowDutyResponse[]>("/flow/tduty/deletedb", formData);
+  deletedb(params: object) {
+    return this.httpRequest.post<TFlow.IFlowDutyResponse[]>("/flow/tduty/deletedb", params);
   }
 }
 

package/packages/flow/flow.ts

@@ -1,5 +1,6 @@
 import type { TCore, TFlow } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IFlowFlowLastUserQuerys, IFlowFlowListDeptQuerys, IFlowFlowListUserQuerys, IFlowFlowNextNodeQuerys } from "./type";
 
 class FlowRequest {
   private httpRequest: HttpRequest;
@@ -9,90 +10,87 @@ class FlowRequest {
 
   /**
    * 送审、审核
-   * @param sysclasc
-   * @param cnfgmain
-   * @param diddoubt
-   * @param doinsert
-   * @param formData
+   * @param querys
+   * @param params
+   * @returns
    */
-  nextnode(sysclasc: number, cnfgmain: number, diddoubt: number, doinsert: number, formData: FormData) {
-    const params = {
-      sysclasc,
-      cnfgmain,
-      diddoubt,
-      doinsert
-    };
-    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/nextnode", formData, params);
+  nextnode(querys: IFlowFlowNextNodeQuerys, params: object) {
+    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/nextnode", querys, params);
   }
 
   /**
    * 终审撤消
+   * @param params
+   * @returns
    */
-  redonode(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/redonode", formData, undefined);
+  redonode(params: object) {
+    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/redonode", undefined, params);
   }
 
   /**
    * 撤消送审、撤销审核
+   * @param params
+   * @returns
    */
-  cancelnd(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/cancelnd", formData, undefined);
+  cancelnd(params: object) {
+    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/cancelnd", undefined, params);
   }
 
   /**
    * 退回
+   * @param params
+   * @returns
    */
-  undonode(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/undonode", formData, undefined);
+  undonode(params: object) {
+    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/undonode", undefined, params);
   }
 
   /**
    * 获取下一岗节点
+   * @param params
+   * @returns
    */
-  get4next(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tflow/get4next", formData, undefined);
+  get4next(params: object) {
+    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tflow/get4next", undefined, params);
   }
 
   /**
    * 获取下一岗节点审核人员
+   * @param querys
+   * @param params
+   * @returns
    */
-  listuser(nextNode: number, formData: FormData) {
-    const params = {
-      nextnode: nextNode
-    };
-    return this.httpRequest.post<TCore.IUserResponse[]>("/flow/tflow/listuser", formData, params);
+  listuser(querys: IFlowFlowListUserQuerys, params: object) {
+    return this.httpRequest.post<TCore.IUserResponse[]>("/flow/tflow/listuser", querys, params);
   }
 
   /**
    * 是否最近送审
-   * @param flowStat
-   * @param formData
+   * @param querys
+   * @param params
    * @returns
    */
-  lastuser(flowStat: number, formData: FormData) {
-    const params = {
-      flowstat: flowStat
-    };
-    return this.httpRequest.post<TCore.ICoreValidResponse[]>("/flow/tflow/lastuser", formData, params);
+  lastuser(querys: IFlowFlowLastUserQuerys, params: object) {
+    return this.httpRequest.post<TCore.ICoreValidResponse[]>("/flow/tflow/lastuser", querys, params);
   }
 
   /**
    * 获取下一岗节点审核部门
+   * @param querys
+   * @param params
+   * @returns
    */
-  listdept(sysClasc: number, cnfgMain: number, nextNode: number, formData: FormData) {
-    const params = {
-      sysclasc: sysClasc,
-      cnfgmain: cnfgMain,
-      nextnode: nextNode
-    };
-    return this.httpRequest.post<TCore.IDeptResponse[]>("/flow/tflow/listdept", formData, params);
+  listdept(querys: IFlowFlowListDeptQuerys, params: object) {
+    return this.httpRequest.post<TCore.IDeptResponse[]>("/flow/tflow/listdept", querys, params);
   }
 
   /**
    * 获取审核历史
+   * @param params
+   * @returns
    */
-  formerly(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/formerly", formData, undefined);
+  formerly(params: object) {
+    return this.httpRequest.post<TFlow.IFlowDataResponse[]>("/flow/tflow/formerly", undefined, params);
   }
 }
 

package/packages/flow/index.ts

@@ -20,3 +20,4 @@ class FlowRequest {
 }
 
 export default FlowRequest;
+export * from "./type";

package/packages/flow/main.ts

@@ -1,5 +1,6 @@
 import type { TFlow } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IFlowMainSelectdbQuerys } from "./type";
 
 class MainRequest {
   private httpRequest: HttpRequest;
@@ -8,18 +9,12 @@ class MainRequest {
   }
 
   /**
-   * 审批流程详情
-   * @param sysclasc
-   * @param useruuid
-   * @param unitmain
+   * 审批流程列表
+   * @param querys
+   * @returns
    */
-  selectdb(sysclasc: number, useruuid: string, unitmain: number) {
-    const params = {
-      sysclasc,
-      useruuid,
-      unitmain
-    };
-    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/selectdb", undefined, params);
+  selectdb(querys: IFlowMainSelectdbQuerys) {
+    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/selectdb", querys, undefined);
   }
 
   /**
@@ -27,28 +22,31 @@ class MainRequest {
    * @param params
    */
   detaildb(params: object) {
-    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/detaildb", params);
+    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/detaildb", undefined, params);
   }
 
   /**
    * 添加审批流程
+   * @param params
    */
-  insertdb(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/insertdb", formData);
+  insertdb(params: object) {
+    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/insertdb", undefined, params);
   }
 
   /**
    * 修改审核流程
+   * @param params
    */
-  updatedb(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/updatedb", formData);
+  updatedb(params: object) {
+    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/updatedb", undefined, params);
   }
 
   /**
    * 删除审核流程
+   * @param params
    */
-  deletedb(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/deletedb", formData);
+  deletedb(params: object) {
+    return this.httpRequest.post<TFlow.IFlowMainResponse[]>("/flow/tmain/deletedb", undefined, params);
   }
 }
 

package/packages/flow/node.ts

@@ -1,5 +1,6 @@
 import type { TFlow } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IFlowNodeDetaildbQuerys, IFlowNodeInsertdbQuerys, IFlowNodeSelectdbQuerys, IFlowNodeUpdatedbQuerys } from "./type";
 
 class NodeRequest {
   private httpRequest: HttpRequest;
@@ -9,49 +10,47 @@ class NodeRequest {
 
   /**
    * 根据flowmain查找审核节点
+   * @param querys
+   * @returns
    */
-  selectdb(params: object) {
-    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tnode/selectdb", undefined, params);
+  selectdb(querys: IFlowNodeSelectdbQuerys) {
+    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tnode/selectdb", querys, undefined);
   }
 
   /**
-   * 根据wtuiview查看页面定义详情
-   * @param flowMain
-   * @param flowNode
+   * 获取节点详情
+   * @param querys
+   * @returns
    */
-  detaildb(flowMain: number, flowNode: number) {
-    const params = {
-      flowmain: flowMain,
-      flownode: flowNode
-    };
-    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tnode/detaildb", undefined, params);
+  detaildb(querys: IFlowNodeDetaildbQuerys) {
+    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tnode/detaildb", querys, undefined);
   }
 
   /**
-   *  添加审核节点
+   * 添加审核节点
+   * @param querys
+   * @param params
+   * @returns
    */
-  insertdb(flowmain: number, data: object) {
-    const params = {
-      flowmain
-    };
-    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>(`/flow/tnode/insertdb`, data, params);
+  insertdb(querys: IFlowNodeInsertdbQuerys, params: object) {
+    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>(`/flow/tnode/insertdb`, querys, params);
   }
 
   /**
    * 根据flowmain修改审核节点
+   * @param querys
+   * @param params
+   * @returns
    */
-  updatedb(flowmain: number, data: object) {
-    const params = {
-      flowmain
-    };
-    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>(`/flow/tnode/updatedb`, data, params);
+  updatedb(querys: IFlowNodeUpdatedbQuerys, params: object) {
+    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>(`/flow/tnode/updatedb`, querys, params);
   }
 
   /**
    * 根据flowmain删除审核节点
    */
-  deletedb(formData: FormData) {
-    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tnode/deletedb", formData);
+  deletedb(params: object) {
+    return this.httpRequest.post<TFlow.IFlowNodeResponse[]>("/flow/tnode/deletedb", undefined, params);
   }
 }
 

package/packages/flow/type.ts

@@ -1,3 +1,4 @@
+/** ========== duty ========== */
 export interface IFlowDutySelectdbQuerys {
   flowmain: number;
 }
@@ -7,10 +8,116 @@ export class TFlowDutySelectdbQuerys implements IFlowDutySelectdbQuerys {
 }
 
 export interface IFlowDutyInsertdbQuerys {
-    flowmain: number;
-  }
-  
-  export class TFlowDutyInsertdbQuerys implements IFlowDutyInsertdbQuerys {
-    flowmain: number = -1;
-  }
-  
+  flowmain: number;
+}
+
+export class TFlowDutyInsertdbQuerys implements IFlowDutyInsertdbQuerys {
+  flowmain: number = -1;
+}
+
+export interface IFlowDutyUpdatedbQuerys {
+  flowmain: number;
+}
+
+export class TFlowDutyUpdatedbQuerys implements IFlowDutyUpdatedbQuerys {
+  flowmain: number = -1;
+}
+
+export interface IFlowDutyDetaildbQuerys {
+  flowmain: number;
+}
+
+export class TFlowDutyDetaildbQuerys implements IFlowDutyDetaildbQuerys {
+  flowmain: number = -1;
+}
+
+/** ========== flow ========== */
+export interface IFlowFlowNextNodeQuerys {
+  sysclasc: number;
+  cnfgmain: number;
+  diddoubt: number;
+  doinsert: number;
+}
+
+export class TFlowFlowNextNodeQuerys implements IFlowFlowNextNodeQuerys {
+  sysclasc: number = -1;
+  cnfgmain: number = -1;
+  diddoubt: number = -1;
+  doinsert: number = -1;
+}
+
+export interface IFlowFlowListUserQuerys {
+  nextnode: number;
+}
+
+export class TFlowFlowListUserQuerys implements IFlowFlowListUserQuerys {
+  nextnode: number = -1;
+}
+
+export interface IFlowFlowLastUserQuerys {
+  flowstat: number;
+}
+
+export class TFlowFlowLastUserQuerys implements IFlowFlowLastUserQuerys {
+  flowstat: number = -1;
+}
+
+export interface IFlowFlowListDeptQuerys {
+  sysclasc: number;
+  cnfgmain: number;
+  nextnode: number;
+}
+
+export class TFlowFlowListDeptQuerys implements IFlowFlowListDeptQuerys {
+  sysclasc: number = -1;
+  cnfgmain: number = -1;
+  nextnode: number = -1;
+}
+
+/** ======== main ======== */
+export interface IFlowMainSelectdbQuerys {
+  sysclasc: number;
+  unitmain: number;
+  useruuid: string;
+}
+
+export class TFlowMainSelectdbQuerys implements IFlowMainSelectdbQuerys {
+  sysclasc: number = -1;
+  unitmain: number = -1;
+  useruuid: string = "";
+}
+
+/** ========== node ======== */
+export interface IFlowNodeSelectdbQuerys{
+  flowmain: number;
+}
+
+export class TFlowNodeSelectdbQuerys implements IFlowNodeSelectdbQuerys{
+  flowmain: number = -1;
+}
+
+export interface IFlowNodeDetaildbQuerys{
+  flowmain: number;
+  flownode: number;
+}
+
+export class TFlowNodeDetaildbQuerys implements IFlowNodeDetaildbQuerys{
+  flowmain: number = -1;
+  flownode: number = -1;
+}
+
+export interface IFlowNodeInsertdbQuerys{
+  flowmain: number;
+}
+
+export class TFlowNodeInsertdbQuerys implements IFlowNodeInsertdbQuerys{
+  flowmain: number = -1;
+}
+
+export interface IFlowNodeUpdatedbQuerys{
+  flowmain: number;
+}
+
+export class TFlowNodeUpdatedbQuerys implements IFlowNodeUpdatedbQuerys{
+  flowmain: number = -1;
+}

package/packages/gams/cnfg.ts

@@ -1,5 +1,6 @@
 import type { TGams } from "@ningboyz/types";
 import type { HttpRequest } from "../axios";
+import { IGamsCnfgSelectdbQuerys } from "./type";
 
 class CnfgRequest {
   private httpRequest: HttpRequest;
@@ -7,8 +8,8 @@ class CnfgRequest {
     this.httpRequest = httpRequest;
   }
 
-  selectdb(params: object) {
-    return this.httpRequest.post<TGams.IGamsCnfgResponse>("/gams/tcnfg/selectdb", undefined, params);
+  selectdb(querys: IGamsCnfgSelectdbQuerys) {
+    return this.httpRequest.post<TGams.IGamsCnfgResponse>("/gams/tcnfg/selectdb", querys, undefined);
   }
 }
 

package/packages/gams/index.ts

@@ -11,3 +11,4 @@ class GamsRequest {
 }
 
 export default GamsRequest;
+export * from "./type";