修改

ant-design-pro-vue3/src/views/front/develop/Communication/Message.ts

@@ -1,18 +1,62 @@
 import { ref, reactive } from 'vue'
-import { PlatformSettings } from './PlatformSettings'
-import { PlatformLogger } from './PlatformLogger'
-import { BitMapInstance } from './BitMapInstance'
-
+//import { PlatformSettings } from '../../platfrom/common/RunningParameters/PlatformSettings'
+//import { PlatformLogger } from './PlatformLogger'
+//import { BitMapInstance } from './BitMapInstance'
+import { MsgBitMap } from '../../develop/Communication/MessageHelper/MsgBitMap'
+import { TransitType } from './MessageHelper/TransitType'
 /**
  * 报文通讯域定义，交易调用
  */
-export class Message {
+
+export enum BitMap {
+    /// <summary>
+    /// 核心定义
+    /// </summary>
+    Server,
+    /// <summary>
+    /// 渠道定义
+    /// </summary>
+    Agn,
+    /// <summary>
+    /// 二代支付定义
+    /// </summary>
+    Cnaps2
+}
+export default class Message {
+
+    InitGateway2CBS(txCode: string, arg1: string, arg2: string, predicate2retCode: (code: string) => boolean) {
+        throw new Error("Method not implemented.")
+    }
+    InitHfmsApp(url: string, predicate2retCode: (code: string) => boolean) {
+        throw new Error("Method not implemented.")
+    }
+    DoTransit(): boolean {
+        throw new Error("Method not implemented.")
+    }
+    /// <summary>
+    /// 创建Message对象
+    /// </summary>
+    /// <param name="type"></param>
+    Message(type?: BitMap) {
+        this.IsMainTrade = false;
+        if (type === undefined) {
+            this.TransitNode = TransitType.CallServer;
+            this.Init(BitMap.Server);
+        } else {
+            this.Init(type);
+        }
+    }
     // 交易附件数据
     private _fileData = ref<string>('')
     private _filename = ref<string>('')
     private _fdDict = reactive<Record<string, Uint8Array>>({})
     private _BigFds_: Record<string, any> = {}
-
+    BitMapType: BitMap
+    static BitMap: any
+    _transitNode: TransitType
+    TransitName: string
+    CustomizeTransitEntry: null
+    IsMainTrade = false;
     /**
      * 交易文件附件传送标志
      */
@@ -22,6 +66,13 @@ export class Message {
     set fileFlag(value: boolean) {
         if (!value) this._fileData.value = ''
     }
+    // public Message() {
+    //     this.IsMainTrade = false;
+    //     this.TransitNode = TransitType.CallServer;
+    //     this.Init(BitMap.Server);
+    // }
+
+
 
     /**
      * 传入的文件名
@@ -50,23 +101,26 @@ export class Message {
         let result = ''
         if (this._fdDict[fdName]) {
             const decoder = new TextDecoder()
-            result = BitMapInstance.FdBitMap[fdName].RealValue(decoder.decode(this._fdDict[fdName]))
+            //result = BitMapInstance.FdBitMap[fdName].RealValue(decoder.decode(this._fdDict[fdName])) //hulei先注销
         }
         return result
     }
 
     /**
-     * 获取参数指定域的组包数据
-     */
-    internal getFdFormatValue(fdName: string): string {
-        let result = ''
+  * 获取参数指定域的组包数据
+  * @param fdName - 域名称
+  * @returns 指定域的组包数据
+  */
+    public getFdFormatValue(fdName: string): string {
+        let result = '';
         if (this._fdDict[fdName]) {
-            const decoder = new TextDecoder()
-            result = decoder.decode(this._fdDict[fdName])
+            const decoder = new TextDecoder();
+            result = decoder.decode(this._fdDict[fdName]);
         }
-        return result
+        return result;
     }
 
+
     /**
      * 设置Fd域值
      */
@@ -74,31 +128,81 @@ export class Message {
         this.setFdFormatValue(fdName, value)
         if (!fdName.endsWith('0')) {
             const bigFdName = `${fdName.substring(0, 3)}0`
-            const fds = BitMapInstance.FdBitMap[bigFdName]
-            delete this._BigFds_[fds.Code]
-            
-            for (const fd of fds.Children) {
-                if (fd.Code === fdName) break
-                if (!this._fdDict[fd.Code]) {
-                    this.setFdFormatValue(fd.Code, null)
-                }
-            }
+            //const fds = this.BitMapInstance.FdBitMap[bigFdName]
+            // delete this._BigFds_[fds.Code]
+
+            // for (const fd of fds.Children) {
+            //     if (fd.Code === fdName) break
+            //     if (!this._fdDict[fd.Code]) {
+            //         this.setFdFormatValue(fd.Code, null)
+            //     }
+            // }
+        }
+    }
+    //private MsgBitMap BitMapInstance(BitMapType) {
+    // private BitMapInstance(BitMapType: any): MsgBitMap {
+    //     switch (BitMapType) {
+    //         case BitMap.Server:
+    //             return MsgBitMap.Instance_Server;
+    //         case BitMap.Agn:
+    //             return MsgBitMap.Instance_Agn;
+    //         case BitMap.Cnaps2:
+    //             return MsgBitMap.Instance_Cnaps2;
+    //         default:
+    //             return MsgBitMap.Instance_Server;
+    //     }
+
+    // }
+    private BitMapInstance(BitMapType): MsgBitMap {
+        switch (BitMapType) {
+            case BitMap.Server:
+                return MsgBitMap.Instance_Server;
+            case BitMap.Agn:
+                return MsgBitMap.Instance_Agn;
+            case BitMap.Cnaps2:
+                return MsgBitMap.Instance_Cnaps2;
+            default:
+                return MsgBitMap.Instance_Server;
         }
     }
-
     /**
      * 根据域类型格式化输入数据
      */
     private setFdFormatValue(fdName: string, value: any): void {
-        if (BitMapInstance.FdBitMap[fdName]) {
-            const item = BitMapInstance.FdBitMap[fdName]
-            const encoder = new TextEncoder()
-            const formatValue = encoder.encode(item.FormatValue(value))
-            
-            this._fdDict[fdName] = formatValue
+        // if (this.BitMapInstance.FdBitMap[fdName]) {
+        //     // const item = this.BitMapInstance.FdBitMap[fdName]
+        //     const encoder = new TextEncoder()
+        //     const formatValue = encoder.encode()//item.FormatValue(value)
+
+        //     this._fdDict[fdName] = formatValue
+        // }
+        //hulei 报错了需要处理
+    }
+
+    /**
+    * 初始化，清空所有域和附件
+    * @param type 位图类型
+    */
+    public Init(type?: BitMap): void {
+        if (type === undefined) {
+            // _fdDict.Clear();
+            // _fileData = string.Empty;
+            // //TransitNode = TransitType.CallServer; //初始化默认为CallServer
+            // //BitMapType = type;
+            // CustomizeTransitEntry = null;
+            // Extra = new Dictionary<string, object>();
+        } else {
+            // this._fdDict = {};
+            // this._fileData = '';
+            // this.TransitNode = TransitType.CallServer; // 初始化默认为 CallServer
+            this.BitMapType = type;
+
+
         }
+
     }
 
+
     // 以下是各域的定义，保持与C#代码相同的命名规范
     get Fd1(): string { return this.getFdVaule('0010').toString() }
     set Fd1(value: string) { this.setFdValue('0010', value) }
@@ -236,7 +340,132 @@ export class Message {
 
     get Fd20(): string { return this.getFdVaule('0200').toString() }
     set Fd20(value: string) { this.setFdValue('0200', value) }
+    get Fd21(): string { return this.getFdVaule('0210').toString() }
+    set Fd21(value: string) { this.setFdValue('0210', value) }
+    get Fd22(): string { return this.getFdVaule('0220').toString() }
+    set Fd22(value: string) { this.setFdValue('0220', value) }
+
+
+    get Fd30(): string { return this.getFdVaule('0300').toString() }
+    set Fd30(value: string) { this.setFdValue('0300', value) }
+    get Fd66(): string { return this.getFdVaule('0660').toString() }
+    set Fd66(value: string) { this.setFdValue('0660', value) }
+
+    get Fd23(): string { return this.getFdVaule('0100').toString() }
+    set Fd23(value: string) { this.setFdValue('0100', value) }
+
+    get Fd24(): string { return this.getFdVaule('0100').toString() }
+    set Fd24(value: string) { this.setFdValue('0100', value) }
+
+    get Fd25(): string { return this.getFdVaule('0100').toString() }
+    set Fd25(value: string) { this.setFdValue('0100', value) }
 
+    get Fd26(): string { return this.getFdVaule('0100').toString() }
+    set Fd26(value: string) { this.setFdValue('0100', value) }
+
+    get Fd27(): string { return this.getFdVaule('0100').toString() }
+    set Fd27(value: string) { this.setFdValue('0100', value) }
+
+    get Fd28(): string { return this.getFdVaule('0100').toString() }
+    set Fd28(value: string) { this.setFdValue('0100', value) }
+    get Fd29(): string { return this.getFdVaule('0100').toString() }
+    set Fd29(value: string) { this.setFdValue('0100', value) }
+
+    get Fd31(): string { return this.getFdVaule('0100').toString() }
+    set Fd31(value: string) { this.setFdValue('0100', value) }
+
+    get Fd32(): string { return this.getFdVaule('0100').toString() }
+    set Fd32(value: string) { this.setFdValue('0100', value) }
+
+    get Fd33(): string { return this.getFdVaule('0100').toString() }
+    set Fd33(value: string) { this.setFdValue('0100', value) }
+    get Fd34(): string { return this.getFdVaule('0100').toString() }
+    set Fd34(value: string) { this.setFdValue('0100', value) }
+    get Fd35(): string { return this.getFdVaule('0100').toString() }
+    set Fd35(value: string) { this.setFdValue('0100', value) }
+    get Fd36(): string { return this.getFdVaule('0100').toString() }
+    set Fd36(value: string) { this.setFdValue('0100', value) }
+
+    get Fd37(): string { return this.getFdVaule('0100').toString() }
+    set Fd37(value: string) { this.setFdValue('0100', value) }
+
+    get Fd38(): string { return this.getFdVaule('0100').toString() }
+    set Fd38(value: string) { this.setFdValue('0100', value) }
+
+    get Fd39(): string { return this.getFdVaule('0100').toString() }
+    set Fd39(value: string) { this.setFdValue('0100', value) }
+
+    get Fd40(): string { return this.getFdVaule('0100').toString() }
+    set Fd40(value: string) { this.setFdValue('0100', value) }
+
+    get Fd41(): string { return this.getFdVaule('0100').toString() }
+    set Fd41(value: string) { this.setFdValue('0100', value) }
+
+    get Fd42(): string { return this.getFdVaule('0100').toString() }
+    set Fd42(value: string) { this.setFdValue('0100', value) }
+
+    get Fd43(): string { return this.getFdVaule('0100').toString() }
+    set Fd43(value: string) { this.setFdValue('0100', value) }
+
+    get Fd44(): string { return this.getFdVaule('0100').toString() }
+    set Fd44(value: string) { this.setFdValue('0100', value) }
+
+    get Fd45(): string { return this.getFdVaule('0100').toString() }
+    set Fd45(value: string) { this.setFdValue('0100', value) }
+
+    get Fd46(): string { return this.getFdVaule('0100').toString() }
+    set Fd46(value: string) { this.setFdValue('0100', value) }
+
+    get Fd47(): string { return this.getFdVaule('0100').toString() }
+    set Fd47(value: string) { this.setFdValue('0100', value) }
+
+    get Fd48(): string { return this.getFdVaule('0100').toString() }
+    set Fd48(value: string) { this.setFdValue('0100', value) }
+
+    get Fd49(): string { return this.getFdVaule('0100').toString() }
+    set Fd49(value: string) { this.setFdValue('0100', value) }
+
+    get Fd50(): string { return this.getFdVaule('0100').toString() }
+    set Fd50(value: string) { this.setFdValue('0100', value) }
+
+    get Fd51(): string { return this.getFdVaule('0100').toString() }
+    set Fd51(value: string) { this.setFdValue('0100', value) }
+
+    get Fd52(): string { return this.getFdVaule('0100').toString() }
+    set Fd52(value: string) { this.setFdValue('0100', value) }
+
+    get Fd53(): string { return this.getFdVaule('0100').toString() }
+    set Fd53(value: string) { this.setFdValue('0100', value) }
+
+    get Fd54(): string { return this.getFdVaule('0100').toString() }
+    set Fd54(value: string) { this.setFdValue('0100', value) }
+
+    get Fd55(): string { return this.getFdVaule('0100').toString() }
+    set Fd55(value: string) { this.setFdValue('0100', value) }
+    get Fd56(): string { return this.getFdVaule('0100').toString() }
+    set Fd56(value: string) { this.setFdValue('0100', value) }
+
+    get Fd57(): string { return this.getFdVaule('0100').toString() }
+    set Fd57(value: string) { this.setFdValue('0100', value) }
+    get Fd58(): string { return this.getFdVaule('0100').toString() }
+    set Fd58(value: string) { this.setFdValue('0100', value) }
+    get Fd59(): string { return this.getFdVaule('0100').toString() }
+    set Fd59(value: string) { this.setFdValue('0100', value) }
+    get Fd92(): string { return this.getFdVaule('0100').toString() }
+    set Fd92(value: string) { this.setFdValue('0100', value) }
+    get Fd98(): string { return this.getFdVaule('0100').toString() }
+    set Fd98(value: string) { this.setFdValue('0100', value) }
+    /**
+  * 通讯外端
+  */
+    get TransitNode(): TransitType {
+        return this._transitNode;
+    }
+
+    set TransitNode(value: TransitType) {
+        this._transitNode = value;
+        this.TransitName = value.toString();
+    }
     // 实现剩余所有域...
     // 按照相同模式实现Fd21到Fd47的所有域
-}
+}

ant-design-pro-vue3/src/views/front/develop/Communication/MessageHelper/MsgBitMap.ts

@@ -1,187 +1,193 @@
-import { TradeHandle } from './TradeHandle'
+import TradeHandle from '../../ServiceProxy.Ext/ServiceHelper/TradeHandle'
 
 export class FdItem {
-  Code: string = ''
-  Type: string = ''
-  Length: number = 0
-  DotLength: number = 0
-  Description: string = ''
-  FieldType: string = ''
-  MaxLength: number = 0
-  Children: FdItem[] = []
-  MetaData: Record<string, any> = {}
-
-  private static charType = ['0', '5', '6']
-  private static numberType = ['1', '2', '4']
-
-  getItemType(): 'string' | 'number' | null {
-    if (FdItem.charType.includes(this.Type)) return 'string'
-    if (FdItem.numberType.includes(this.Type)) return 'number'
-    return null
-  }
-
-  formatValue(value: any): string {
-    if (this.Children && this.Children.length > 0) {
-      throw new Error(`域[${this.Code}]存在子域，不允许执行formatValue方法！`)
+    Code: string = ''
+    Type: string = ''
+    Length: number = 0
+    DotLength: number = 0
+    Description: string = ''
+    FieldType: string = ''
+    MaxLength: number = 0
+    Children: FdItem[] = []
+    MetaData: Record<string, any> = {}
+
+    private static charType = ['0', '5', '6']
+    private static numberType = ['1', '2', '4']
+
+    getItemType(): 'string' | 'number' | null {
+        if (FdItem.charType.includes(this.Type)) return 'string'
+        if (FdItem.numberType.includes(this.Type)) return 'number'
+        return null
     }
 
-    let result = ''
-    switch (this.FieldType) {
-      case '-1':
-        // 该域被禁用
-        break
-      case '0':
-        // 定长域
-        if (FdItem.charType.includes(this.Type)) {
-          // 字符型域
-          const data = new Uint8Array(this.Length).fill(' '.charCodeAt(0))
-          const source = new TextEncoder().encode(value?.toString() || '')
-          const copyLength = Math.min(source.length, data.length)
-          data.set(source.subarray(0, copyLength))
-          result = new TextDecoder().decode(data)
-        } else if (FdItem.numberType.includes(this.Type)) {
-          // 数字型域
-          const data = new Uint8Array(this.Length).fill('0'.charCodeAt(0))
-          let newValue = parseFloat(value?.toString() || '0') || 0
-          
-          // 处理负数
-          if (newValue < 0) data[0] = '-'.charCodeAt(0)
-          
-          // 处理小数位
-          newValue = newValue * Math.pow(10, this.DotLength)
-          newValue = Math.abs(Math.trunc(newValue))
-          
-          const source = new TextEncoder().encode(newValue.toString())
-          const len = source.length - data.length
-          
-          if (len < 0) {
-            data.set(source, -len)
-          } else {
-            data.set(source.subarray(len))
-          }
-          result = new TextDecoder().decode(data)
+    formatValue(value: any): string {
+        if (this.Children && this.Children.length > 0) {
+            throw new Error(`域[${this.Code}]存在子域，不允许执行formatValue方法！`)
         }
-        break
-      default:
-        // 变长域
-        if (FdItem.charType.includes(this.Type)) {
-          // 字符型域
-          const source = new TextEncoder().encode(value?.toString() || '')
-          const data = source.subarray(0, Math.min(source.length, this.MaxLength))
-          result = new TextDecoder().decode(data)
-        } else if (FdItem.numberType.includes(this.Type)) {
-          // 数字型域
-          let newValue = parseFloat(value?.toString() || '0') || 0
-          newValue = newValue * Math.pow(10, this.DotLength)
-          const source = new TextEncoder().encode(newValue.toString())
-          const data = source.subarray(0, Math.min(source.length, this.MaxLength))
-          result = new TextDecoder().decode(data)
+
+        let result = ''
+        switch (this.FieldType) {
+            case '-1':
+                // 该域被禁用
+                break
+            case '0':
+                // 定长域
+                if (FdItem.charType.includes(this.Type)) {
+                    // 字符型域
+                    const data = new Uint8Array(this.Length).fill(' '.charCodeAt(0))
+                    const source = new TextEncoder().encode(value?.toString() || '')
+                    const copyLength = Math.min(source.length, data.length)
+                    data.set(source.subarray(0, copyLength))
+                    result = new TextDecoder().decode(data)
+                } else if (FdItem.numberType.includes(this.Type)) {
+                    // 数字型域
+                    const data = new Uint8Array(this.Length).fill('0'.charCodeAt(0))
+                    let newValue = parseFloat(value?.toString() || '0') || 0
+
+                    // 处理负数
+                    if (newValue < 0) data[0] = '-'.charCodeAt(0)
+
+                    // 处理小数位
+                    newValue = newValue * Math.pow(10, this.DotLength)
+                    newValue = Math.abs(Math.trunc(newValue))
+
+                    const source = new TextEncoder().encode(newValue.toString())
+                    const len = source.length - data.length
+
+                    if (len < 0) {
+                        data.set(source, -len)
+                    } else {
+                        data.set(source.subarray(len))
+                    }
+                    result = new TextDecoder().decode(data)
+                }
+                break
+            default:
+                // 变长域
+                if (FdItem.charType.includes(this.Type)) {
+                    // 字符型域
+                    const source = new TextEncoder().encode(value?.toString() || '')
+                    const data = source.subarray(0, Math.min(source.length, this.MaxLength))
+                    result = new TextDecoder().decode(data)
+                } else if (FdItem.numberType.includes(this.Type)) {
+                    // 数字型域
+                    let newValue = parseFloat(value?.toString() || '0') || 0
+                    newValue = newValue * Math.pow(10, this.DotLength)
+                    const source = new TextEncoder().encode(newValue.toString())
+                    const data = source.subarray(0, Math.min(source.length, this.MaxLength))
+                    result = new TextDecoder().decode(data)
+                }
+                break
         }
-        break
+        return result
     }
-    return result
-  }
 }
 
 export class MsgBitMap {
-  private static _instance_Server: MsgBitMap
-  private static _instance_Agn: MsgBitMap
-  private static _instance_Cnaps2: MsgBitMap
+    private static _instance_Server: MsgBitMap
+    private static _instance_Agn: MsgBitMap
+    private static _instance_Cnaps2: MsgBitMap
 
-  FdBitMap: Record<string, FdItem> = {}
+    FdBitMap: Record<string, FdItem> = {}
 
-  private constructor() {}
+    private constructor() { }
 
-  static get Instance_Server(): MsgBitMap {
-    if (!this._instance_Server) {
-      this._instance_Server = new MsgBitMap()
-      this._instance_Server.FdBitMap = this.InitFdBitMap('Server')
+    static get Instance_Server(): MsgBitMap {
+        if (!this._instance_Server) {
+            this._instance_Server = new MsgBitMap()
+            this.InitFdBitMap('Server').then((data: Record<string, FdItem>) => {
+                this._instance_Server.FdBitMap = data // 在这里使用 data
+            });
+        }
+        return this._instance_Server
     }
-    return this._instance_Server
-  }
 
-  static get Instance_Agn(): MsgBitMap {
-    if (!this._instance_Agn) {
-      this._instance_Agn = new MsgBitMap()
-      this._instance_Agn.FdBitMap = this.InitFdBitMap('Agn')
+    static get Instance_Agn(): MsgBitMap {
+        if (!this._instance_Agn) {
+            this._instance_Agn = new MsgBitMap()
+            this.InitFdBitMap('Agn').then((data: Record<string, FdItem>) => {
+                this._instance_Agn.FdBitMap = data // 在这里使用 data
+            });
+        }
+        return this._instance_Agn
     }
-    return this._instance_Agn
-  }
 
-  static get Instance_Cnaps2(): MsgBitMap {
-    if (!this._instance_Cnaps2) {
-      this._instance_Cnaps2 = new MsgBitMap()
-      this._instance_Cnaps2.FdBitMap = this.InitFdBitMap('Cnaps2')
-    }
-    return this._instance_Cnaps2
-  }
-
-  private static async InitFdBitMap(type: string): Promise<Record<string, FdItem>> {
-    const dict: Record<string, FdItem> = {}
-    const data = await TradeHandle.GetFdItemMap(type)
-
-    data.forEach((item: any) => {
-      const fdItem = new FdItem()
-      fdItem.Code = item.Code
-      fdItem.Type = item.Type
-      fdItem.Length = parseInt(item.Length)
-      fdItem.DotLength = parseInt(item.DotLength)
-      fdItem.Description = item.Description
-      fdItem.FieldType = item.FieldType
-      fdItem.MaxLength = parseInt(item.MaxLength)
-      fdItem.Children = []
-      fdItem.MetaData = {}
-
-      dict[fdItem.Code] = fdItem
-      if (!fdItem.Code.endsWith('0')) {
-        const code = fdItem.Code.substring(0, 3) + '0'
-        if (dict[code]) {
-          dict[code].Children.push(fdItem)
+    static get Instance_Cnaps2(): MsgBitMap {
+        if (!this._instance_Cnaps2) {
+            this._instance_Cnaps2 = new MsgBitMap()
+            this.InitFdBitMap('Cnaps2').then((data: Record<string, FdItem>) => {
+                this._instance_Cnaps2.FdBitMap = data // 在这里使用 data
+            });
         }
-      }
-    })
-
-    return dict
-  }
-
-  static async CreateMessageCode(): Promise<string> {
-    const fdInfo: string[] = []
-    const fds = Object.values(MsgBitMap.Instance_Server.FdBitMap)
-
-    for (const item of fds) {
-      if (!item.Children || item.Children.length === 0) {
-        fdInfo.push(this.CreateFdCode(item))
-      } else {
-        fdInfo.push(`#region ${item.Code}域定义`)
-        for (const child of item.Children) {
-          fdInfo.push(this.CreateFdCode(child))
+        return this._instance_Cnaps2
+    }
+
+    private static async InitFdBitMap(type: string): Promise<Record<string, FdItem>> {
+        const dict: Record<string, FdItem> = {}
+        const data = await TradeHandle.GetFdItemMap(type)
+
+        data.forEach((item: any) => {
+            const fdItem = new FdItem()
+            fdItem.Code = item.Code
+            fdItem.Type = item.Type
+            fdItem.Length = parseInt(item.Length)
+            fdItem.DotLength = parseInt(item.DotLength)
+            fdItem.Description = item.Description
+            fdItem.FieldType = item.FieldType
+            fdItem.MaxLength = parseInt(item.MaxLength)
+            fdItem.Children = []
+            fdItem.MetaData = {}
+
+            dict[fdItem.Code] = fdItem
+            if (!fdItem.Code.endsWith('0')) {
+                const code = fdItem.Code.substring(0, 3) + '0'
+                if (dict[code]) {
+                    dict[code].Children.push(fdItem)
+                }
+            }
+        })
+
+        return dict
+    }
+
+    static async CreateMessageCode(): Promise<string> {
+        const fdInfo: string[] = []
+        const fds = Object.values(MsgBitMap.Instance_Server.FdBitMap)
+
+        for (const item of fds) {
+            if (!item.Children || item.Children.length === 0) {
+                fdInfo.push(this.CreateFdCode(item))
+            } else {
+                fdInfo.push(`#region ${item.Code}域定义`)
+                for (const child of item.Children) {
+                    fdInfo.push(this.CreateFdCode(child))
+                }
+                fdInfo.push('#endregion\n')
+            }
         }
-        fdInfo.push('#endregion\n')
-      }
+
+        return fdInfo.join('\n')
     }
 
-    return fdInfo.join('\n')
-  }
-
-  private static CreateFdCode(fdItem: FdItem): string {
-    const fdNo = fdItem.Code.replace(/^0+/, '').slice(0, -1)
-    const fdIndex = fdItem.Code.slice(-1)
-    const isParent = fdIndex === '0'
-
-    const codeLines: string[] = []
-    codeLines.push(`#region ${fdItem.Code}域定义`)
-    codeLines.push('/**')
-    codeLines.push(` * ${isParent ? `第${fdNo}域` : `第${fdNo}域${fdIndex}子域`}`)
-    codeLines.push(' */')
-    codeLines.push(`public get ${isParent ? `Fd${fdNo}` : `Fd${fdNo}_${fdIndex}`}(): string {`)
-    codeLines.push(`  return this.GetFdVaule("${fdItem.Code}").toString()`)
-    codeLines.push('}')
-    codeLines.push('')
-    codeLines.push(`public set ${isParent ? `Fd${fdNo}` : `Fd${fdNo}_${fdIndex}`}(value: string) {`)
-    codeLines.push(`  this.SetFdValue("${fdItem.Code}", value)`)
-    codeLines.push('}')
-    codeLines.push('#endregion')
-    
-    return codeLines.join('\n')
-  }
-}
+    private static CreateFdCode(fdItem: FdItem): string {
+        const fdNo = fdItem.Code.replace(/^0+/, '').slice(0, -1)
+        const fdIndex = fdItem.Code.slice(-1)
+        const isParent = fdIndex === '0'
+
+        const codeLines: string[] = []
+        codeLines.push(`#region ${fdItem.Code}域定义`)
+        codeLines.push('/**')
+        codeLines.push(` * ${isParent ? `第${fdNo}域` : `第${fdNo}域${fdIndex}子域`}`)
+        codeLines.push(' */')
+        codeLines.push(`public get ${isParent ? `Fd${fdNo}` : `Fd${fdNo}_${fdIndex}`}(): string {`)
+        codeLines.push(`  return this.GetFdVaule("${fdItem.Code}").toString()`)
+        codeLines.push('}')
+        codeLines.push('')
+        codeLines.push(`public set ${isParent ? `Fd${fdNo}` : `Fd${fdNo}_${fdIndex}`}(value: string) {`)
+        codeLines.push(`  this.SetFdValue("${fdItem.Code}", value)`)
+        codeLines.push('}')
+        codeLines.push('#endregion')
+
+        return codeLines.join('\n')
+    }
+}

ant-design-pro-vue3/src/views/front/develop/Communication/MessageHelper/TransitErrorCodeMap.ts

@@ -1,130 +1,129 @@
-import { ref } from 'vue'
 import * as fs from 'fs'
 import * as path from 'path'
-import { FilesHandle } from './FilesHandle'
-import { ServiceSettings } from './ServiceSettings'
+import FilesHandle from '../../../platfrom/serviceproxy/ServiceHelper/FilesHandle'
+import { ServiceSettings } from '../../ServiceProxy.Ext/ServiceSettings'
 
 type ErrorMapValue = {
-  description: string
-  codes: Map<string, string>
+    description: string
+    codes: Map<string, string>
 }
 
-export class TransitErrorCodeMap {
-  private static instance: TransitErrorCodeMap
-  private _errorMap = new Map<string, ErrorMapValue>()
+export default class TransitErrorCodeMap {
+    private static instance: TransitErrorCodeMap
+    private _errorMap = new Map<string, ErrorMapValue>()
 
-  public static GetInstance(): TransitErrorCodeMap {
-    if (!this.instance) {
-      this.instance = new TransitErrorCodeMap()
-    }
-    return this.instance
-  }
-
-  private constructor() {
-    this.initErrorMap()
-  }
-
-  private async initErrorMap() {
-    const localFile = path.join(process.cwd(), 'errorMap.xml')
-    const serverPath = path.join(ServiceSettings.ConfigFilePath, 'errorMap.xml')
-
-    // 检查文件是否需要更新
-    if (!fs.existsSync(localFile) || !(await FilesHandle.CheckMD5(localFile, serverPath))) {
-      try {
-        // 更新文件
-        if (fs.existsSync(localFile)) {
-          fs.unlinkSync(localFile)
+    public static GetInstance(): TransitErrorCodeMap {
+        if (!this.instance) {
+            this.instance = new TransitErrorCodeMap()
         }
-        const data = await FilesHandle.GetFileData(serverPath)
-        fs.writeFileSync(localFile, data)
-      } catch (e) {
-        console.error('更新错误码映射文件失败:', e)
-      }
+        return this.instance
+    }
+
+    private constructor() {
+        this.initErrorMap()
     }
 
-    // 读取配置文件
-    try {
-      const xmlData = fs.readFileSync(localFile, 'utf-8')
-      const parser = new DOMParser()
-      const document = parser.parseFromString(xmlData, 'text/xml')
-
-      if (document.documentElement) {
-        // 分类配置文件
-        const categories = document.documentElement.getElementsByTagName('category')
-        for (let i = 0; i < categories.length; i++) {
-          const node = categories[i]
-          const type = node.getAttribute('name')
-          if (!type || this._errorMap.has(type)) continue
-
-          const desc = node.getAttribute('value') || ''
-          const codeMap = new Map<string, string>()
-
-          const errors = node.getElementsByTagName('error')
-          for (let j = 0; j < errors.length; j++) {
-            const error = errors[j]
-            const code = error.getAttribute('name')
-            const value = error.getAttribute('value')
-            if (code && value && !codeMap.has(code)) {
-              codeMap.set(code, value)
+    private async initErrorMap() {
+        const localFile = path.join(process.cwd(), 'errorMap.xml')
+        const serverPath = path.join(ServiceSettings.ConfigFilePath, 'errorMap.xml')
+
+        // 检查文件是否需要更新
+        if (!fs.existsSync(localFile) || !(await FilesHandle.CheckMD5(localFile, serverPath))) {
+            try {
+                // 更新文件
+                if (fs.existsSync(localFile)) {
+                    fs.unlinkSync(localFile)
+                }
+                const data = await FilesHandle.GetFileData(serverPath)
+                fs.writeFileSync(localFile, data)
+            } catch (e) {
+                console.error('更新错误码映射文件失败:', e)
             }
-          }
+        }
 
-          this._errorMap.set(type, {
-            description: desc,
-            codes: codeMap
-          })
+        // 读取配置文件
+        try {
+            const xmlData = fs.readFileSync(localFile, 'utf-8')
+            const parser = new DOMParser()
+            const document = parser.parseFromString(xmlData, 'text/xml')
+
+            if (document.documentElement) {
+                // 分类配置文件
+                const categories = document.documentElement.getElementsByTagName('category')
+                for (let i = 0; i < categories.length; i++) {
+                    const node = categories[i]
+                    const type = node.getAttribute('name')
+                    if (!type || this._errorMap.has(type)) continue
+
+                    const desc = node.getAttribute('value') || ''
+                    const codeMap = new Map<string, string>()
+
+                    const errors = node.getElementsByTagName('error')
+                    for (let j = 0; j < errors.length; j++) {
+                        const error = errors[j]
+                        const code = error.getAttribute('name')
+                        const value = error.getAttribute('value')
+                        if (code && value && !codeMap.has(code)) {
+                            codeMap.set(code, value)
+                        }
+                    }
+
+                    this._errorMap.set(type, {
+                        description: desc,
+                        codes: codeMap
+                    })
+                }
+            }
+        } catch (e) {
+            console.error('解析错误码映射文件失败:', e)
         }
-      }
-    } catch (e) {
-      console.error('解析错误码映射文件失败:', e)
-    }
-  }
-
-  /**
-   * 获取错误代码指代的错误信息
-   */
-  public GetErrorMessage(errorCode: string, type?: string): string {
-    const errorType = type || 'default'
-    const dict = this._errorMap.get(errorType)
-    
-    if (!dict) {
-      return `[${errorType}-${errorCode}]未知的错误代码类型`
     }
 
-    let msg = dict.codes.get(errorCode) || '未知的错误代码'
-    
-    // 若找不到错误码，从default中再找一遍
-    if (msg === '未知的错误代码' && errorType === 'agn') {
-      const defaultDict = this._errorMap.get('default')
-      if (defaultDict && defaultDict.codes.has(errorCode)) {
-        msg = defaultDict.codes.get(errorCode)!
-      }
-    }
+    /**
+     * 获取错误代码指代的错误信息
+     */
+    public GetErrorMessage(errorCode: string, type?: string): string {
+        const errorType = type || 'default'
+        const dict = this._errorMap.get(errorType)
 
-    return `[${dict.description}-${errorCode}]${msg}`
-  }
-
-  /**
-   * 获取带域信息的错误代码指代的错误信息
-   */
-  public GetErrorMessageWithField(errorCode: string, errorFd: string, type?: string): string {
-    const errorType = type || 'default'
-    const dict = this._errorMap.get(errorType)
-    
-    if (!dict) {
-      return `[${errorType}-${errorCode}]未知的错误代码类型(${errorFd})`
-    }
+        if (!dict) {
+            return `[${errorType}-${errorCode}]未知的错误代码类型`
+        }
+
+        let msg = dict.codes.get(errorCode) || '未知的错误代码'
+
+        // 若找不到错误码，从default中再找一遍
+        if (msg === '未知的错误代码' && errorType === 'agn') {
+            const defaultDict = this._errorMap.get('default')
+            if (defaultDict && defaultDict.codes.has(errorCode)) {
+                msg = defaultDict.codes.get(errorCode)!
+            }
+        }
 
-    let msg = dict.codes.get(errorCode) || '未知的错误代码'
-    
-    // 若找不到错误码，从default中再找一遍
-    if (msg === '未知的错误代码' && errorType === 'agn') {
-      const defaultDict = this._errorMap.get('default')
-      if (defaultDict && defaultDict.codes.has(errorCode)) {
-        msg = defaultDict.codes.get(errorCode)!
-      }
+        return `[${dict.description}-${errorCode}]${msg}`
     }
 
-    return `[${dict.description}-${errorCode}]${msg}(${errorFd})`
-  }
-}
+    /**
+     * 获取带域信息的错误代码指代的错误信息
+     */
+    public GetErrorMessageWithField(errorCode: string, errorFd: string, type?: string): string {
+        const errorType = type || 'default'
+        const dict = this._errorMap.get(errorType)
+
+        if (!dict) {
+            return `[${errorType}-${errorCode}]未知的错误代码类型(${errorFd})`
+        }
+
+        let msg = dict.codes.get(errorCode) || '未知的错误代码'
+
+        // 若找不到错误码，从default中再找一遍
+        if (msg === '未知的错误代码' && errorType === 'agn') {
+            const defaultDict = this._errorMap.get('default')
+            if (defaultDict && defaultDict.codes.has(errorCode)) {
+                msg = defaultDict.codes.get(errorCode)!
+            }
+        }
+
+        return `[${dict.description}-${errorCode}]${msg}(${errorFd})`
+    }
+}

ant-design-pro-vue3/src/views/front/develop/Communication/MessageHelper/TransitType.ts

@@ -6,17 +6,17 @@ export enum TransitType {
      * 未知外端
      */
     Unknown = 0,
-    
+
     /**
      * 核心后台
      */
     CallServer = 1,
-    
+
     /**
      * 平台渠道
      */
     CallAgn = 2,
-    
+
     CallMobileBanking = 3,
     CallAgnCIS = 4,
     CallAgnCard = 5,
@@ -41,102 +41,102 @@ export enum TransitType {
     CallAgnHeat03 = 24,
     CallAgnWater = 25,
     CallAgnIDC = 26,
-    
+
     /**
      * 超级网银
      */
     CallAgnIBPS = 27,
-    
+
     CallAgnOrder = 28,
     CallAgnTips = 29,
     CallAgnRun = 30,
-    
+
     // 村镇银行网银
     CallAgn_CZYYSW = 31,
-    
+
     // 二代货币/反假币
     CallNoFileSys = 32,
-    
+
     // 青隆易缴费
     CallAgn_EasyPay = 33,
-    
+
     /**
      * 阳光燃气费代交
      */
     CallAgn_GasFee = 34,
-    
+
     /**
      * 山东一窗通
      */
     CallAgn_SDYCT = 35,
-    
+
     /**
      * 中牟存量房监管
      */
     CallAgnCLFJG = 36,
-    
+
     /**
      * 农金通
      */
     CallAgn_NJT = 37,
-    
+
     /**
      * 青隆房管局网签
      */
     CallAgn_FGJWQ = 38,
-    
+
     /**
      * 阳光电子汇票
      */
     CallAgn_Ebill = 39,
-    
+
     /**
      * 农信银网联
      */
     CallAgnNew_WL = 40,
-    
+
     /**
      * 境外卡渠道
      */
     CallAgn_JWK = 85001,
-    
+
     /**
      * 青隆房管局网签 黄骅市
      */
     CallAgn_FGJWQ_HH = 30201,
-    
+
     /**
      * 扶沟 农民工工资代发
      */
     CallAgn_DF = 13201,
-    
+
     /**
      * 固始公积金
      */
     CallAgn_GGJ = 10801,
-    
+
     /**
      * 中牟超网
      */
     CallAgn_CW = 10201,
-    
+
     /**
      * 中牟资金监管
      */
     CallAgn_ZJJG = 10202,
-    
+
     /**
      * 中牟查控系统
      */
     CallAgn_CKXT = 10203,
-    
+
     /**
      * 核心前置通讯
      */
     CallGateway2CBS = 10204,
-    
+
     /**
      * 浚县房屋资金维修
      */
     CallHfmsApp = 16201
-}
+}

ant-design-pro-vue3/src/views/front/develop/Communication/TransitSettings.ts

@@ -1,14 +1,15 @@
-import { ConfigManager } from './ConfigManager'
-import { ConfigType } from './ConfigType'
+// import { ConfigManager } from './ConfigManager'
+// import { ConfigType } from './ConfigType'
 
-/**
- * 通讯设置类
- */
-export class TransitSettings {
-    /**
-     * 通讯采用的加密方式
-     */
-    public static get KeyStr(): string {
-        return ConfigManager.getInstance().getConfigValue('KeyStr', ConfigType.System)
-    }
-}
+// /**
+//  * 通讯设置类
+//  */
+// export class TransitSettings {
+//     /**
+//      * 通讯采用的加密方式
+//      */
+//     public static get KeyStr(): string {
+//         return ConfigManager.getInstance().getConfigValue('KeyStr', ConfigType.System)
+//     }
+// }
+//hulei 原项目中被排除了

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/EntryBase.cs

@@ -1,71 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using TellerSystem.Communication;
-
-namespace TellerSystem.Contract.ContractBase
-{
-    /// <summary>
-    /// 入口基类，包括Message和PageBase
-    /// </summary>
-    public class EntryBase : ITradeHelper
-    {
-        #region 数据属性
-        public Message MessageData { get; private set; }
-        public PageBase PageData { get; private set; }
-        #endregion
-
-        /// <summary>
-        /// 加载数据
-        /// </summary>
-        /// <param name="page"></param>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        public bool LoadData(PageBase page, Message message)
-        {
-            var flag = true;
-            //检测参数变化
-            if (page != null && page == PageData)
-            {
-                if (message == MessageData || (message.FileData == MessageData.FileData && message.GetAllFds().Except(MessageData.GetAllFds()).Count() == 0))//KeyValuePair是结构体，会对比下辖所有值
-                    flag = false;//参数与历史登记一致，未作修改
-            }
-            PageData = page;
-            MessageData = message;
-            return OnLoadData(flag);
-        }
-
-        /// <summary>
-        /// 加载数据时触发
-        /// </summary>
-        /// <param name="changed">标识数据是否发生改变</param>
-        /// <returns></returns>
-        protected virtual bool OnLoadData(bool changed)
-        {
-            return true;
-        }
-
-        #region ITradeHelper
-        public TradeBusHelper TradeBus
-        {
-            get { return PageData.TradeBus; }
-        }
-
-        public TradeInfoHelper TradeInfo
-        {
-            get { return PageData.TradeInfo; }
-        }
-
-        public TradeAPIsHelper TradeAPIs
-        {
-            get { return PageData.TradeAPIs; }
-        }
-
-        public TradeResourcesHelper TradeResources
-        {
-            get { return PageData.TradeResources; }
-        }
-        #endregion
-    }
-}

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/EntryBase.ts

@@ -1,4 +1,4 @@
-import type { Message } from './Message'
+import type { Message } from '../../Communication/Message'
 import type { PageBase } from './PageBase'
 import type { ITradeHelper } from './ITradeHelper'
 import type { TradeBusHelper } from './TradeBusHelper'
@@ -10,7 +10,7 @@ import type { TradeResourcesHelper } from './TradeResourcesHelper'
  * 入口基类，包括Message和PageBase
  */
 export class EntryBase implements ITradeHelper {
-    #region 数据属性
+    //#region 数据属性
     private _messageData: Message | null = null
     private _pageData: PageBase | null = null
 
@@ -37,16 +37,16 @@ export class EntryBase implements ITradeHelper {
      */
     public LoadData(page: PageBase, message: Message): boolean {
         let flag = true
-        
+
         // 检测参数变化
         if (page !== null && page === this.PageData) {
-            if (message === this.MessageData || 
-                (message.FileData === this.MessageData?.FileData && 
-                 this.getDiffFields(message, this.MessageData).length === 0)) {
+            if (message === this.MessageData ||
+                (message.FileData === this.MessageData?.FileData &&
+                    this.getDiffFields(message, this.MessageData).length === 0)) {
                 flag = false // 参数与历史登记一致，未作修改
             }
         }
-        
+
         this.PageData = page
         this.MessageData = message
         return this.OnLoadData(flag)
@@ -96,4 +96,4 @@ export const useEntryBase = () => {
         EntryBase,
         createEntry: () => reactive(new EntryBase())
     }
-}
+}

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/HomePageBase.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-
-namespace TellerSystem.Contract.ContractBase
-{
-    /// <summary>
-    /// 主界面框架基础
-    /// </summary>
-    public abstract class HomePageBase : PageBase
-    {
-        public HomePageBase()
-        {
-        }
-
-        public void LoadTradeHost(UIElement host)
-        {
-        }
-    }
-}

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/ITradeHelper.cs

@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace TellerSystem.Contract.ContractBase
-{
-    /// <summary>
-    /// 交易帮助接口
-    /// </summary>
-    public interface ITradeHelper
-    { 
-        /// <summary>
-        /// 业务总线
-        /// </summary>
-        TradeBusHelper TradeBus { get; }
-
-        /// <summary>
-        /// 交易信息
-        /// </summary>
-        TradeInfoHelper TradeInfo { get; }
-
-        /// <summary>
-        /// 操作接口
-        /// </summary> 
-        TradeAPIsHelper TradeAPIs { get; }
-
-        /// <summary>
-        /// 资源集合
-        /// </summary>
-        TradeResourcesHelper TradeResources { get; }
-    }
-}

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/PageBase.cs

@@ -1,252 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Platform.Presentation.PageFunctions;
-using System.Windows.Documents;
-using System.Windows;
-using System.Windows.Media;
-using System.ComponentModel;
-using System.IO;
-using System.Reflection;
-using Platform.Common.RunningParameters;
-using TellerSystem.Library.Ext.Function;
-using Platform.Presentation.FocusManagers;
-using TellerSystem.ServiceProxy.Ext;
-using TellerSystem.Contract.Entry;
-using Platform.Common.LogSystem;
-using TellerSystem.PrintTemplate.Extension;
-using TellerSystem.ServiceProxy.Ext.ServiceHelper;
-
-namespace TellerSystem.Contract.ContractBase
-{
-    /// <summary>
-    /// 页面基类，填充通用的业务接口API
-    /// 注意:该对象需要支持序列化/反序列化
-    /// </summary>
-    public abstract class PageBase : TradePage, ITradeHelper
-    {
-        #region InitPage
-        /// <summary>
-        /// 银行标签
-        /// </summary>
-        public string BankFlag
-        {
-            get
-            {
-                return ServiceSettings.BankFlag;
-            }
-        }
-
-        /// <summary>
-        /// 密封
-        /// </summary>
-        protected sealed override void OnTradePageLoaded()
-        {
-            var flag = false;
-            try
-            {
-                base.OnTradePageLoaded();
-                //加载页面初始化
-                flag = InitPage();
-                if (flag)
-                    this.Dispatcher.BeginInvoke(new Action(() =>
-                    {
-                        if (FocusManager.GetEnableFocusControl(this))
-                        {
-                            //若焦点控件不存在，则认为初始化焦点失败
-                            var fm = FocusManager.GetManagerInstance(this);
-                            if (fm != null && fm.CurrentFocusedElement == null)
-                            {
-                                fm.Refresh();
-                                fm.ReSetFocus();
-                            }
-                            //将交易打开的时间登记到bus
-                            try {
-                                if (string.IsNullOrEmpty(TradeBus["__StartTime__"]))
-                                    this.TradeBus["__StartTime__"] = DateTime.Now.ToString("yyyyMMddHHmmss");
-                            }
-                            catch (Exception ex)
-                            {
-                                TradeHandle.WriteImportantLog("获取交易打开时间异常", ex.Message, "StartTime");
-                                return;
-                            }
-                        }
-                    }), System.Windows.Threading.DispatcherPriority.SystemIdle, null);
-            }
-            catch (Exception e)
-            {
-                Platform.Common.LogSystem.PlatformLogger.TradeErrorInfo("调用InitPage失败！", e, TradeModel.Code);
-            }
-            if (!flag)
-            {
-                this.OwnerContainer.ClosePage();
-                //this.Dispatcher.BeginInvoke(new Action(() => { this.OwnerContainer.ClosePage(); }), System.Windows.Threading.DispatcherPriority.Loaded);
-            }
-        }
-
-        /// <summary>
-        /// 初始化页面
-        /// </summary>
-        /// <returns></returns>
-        public virtual bool InitPage()
-        {
-            return true;
-        }
-
-        public class PagePrintedEventArgs : EventArgs
-        {
-            public PagePrintedEventArgs(PrintAttributes attr)
-            {
-                PrintAttr = attr;
-            }
-            public PrintAttributes PrintAttr { get; private set; }
-        }
-
-        public event EventHandler<PagePrintedEventArgs> PagePrinted;
-
-        public void Log2PagePrinted(string log)
-        {
-            try
-            {
-                PlatformLogger.SystemInfo("Log2PagePrinted:start 【" + log + "】=>" + this.PagePrinted);
-                if (this.PagePrinted == null) return;
-                var list = this.PagePrinted.GetInvocationList();
-                if (list == null) return;
-                PlatformLogger.SystemInfo("Log2PagePrinted:list length=>" + list.Length + ",data=>"
-                    + string.Join(",", list.ToList().Where(x => x != null).Select(d => d.Method.ToString()).ToList()));
-            }
-            catch { }
-        }
-
-        /// <summary>
-        /// 触发打印后事件
-        /// </summary>
-        public void OnPagePrinted(PrintAttributes attr)
-        {
-            PlatformLogger.SystemInfo("OnPagePrinted:触发事件=>" + this.PagePrinted);
-            if (this.PagePrinted != null)
-            {
-                Log2PagePrinted("OnPagePrinted.start");
-                this.PagePrinted(this, new PagePrintedEventArgs(attr));
-                Log2PagePrinted("OnPagePrinted.end");
-            }
-        }
-        #endregion
-
-        #region 访问接口
-        #region 业务总线TradeBus
-        private TradeBusHelper _tradeBus;
-        /// <summary>
-        /// 业务总线
-        /// </summary>
-        public TradeBusHelper TradeBus
-        {
-            get
-            {
-                if (_tradeBus == null)
-                    _tradeBus = new TradeBusHelper(this);
-                return _tradeBus;
-            }
-        }
-        #endregion
-
-        #region 交易信息TradeInfo
-        private TradeInfoHelper _tradeInfo;
-        /// <summary>
-        /// 交易信息
-        /// </summary>
-        public TradeInfoHelper TradeInfo
-        {
-            get
-            {
-                if (_tradeInfo == null)
-                    _tradeInfo = new TradeInfoHelper(this);
-                return _tradeInfo;
-            }
-        }
-        #endregion
-
-        #region 操作接口TradeAPIs
-
-        private TradeAPIsHelper _tradeAPIs;
-        /// <summary>
-        /// 操作接口
-        /// </summary>
-        public TradeAPIsHelper TradeAPIs
-        {
-            get
-            {
-                if (_tradeAPIs == null)
-                    _tradeAPIs = new TradeAPIsHelper(this);
-                return _tradeAPIs;
-            }
-        }
-
-        #endregion
-
-        #region 资源集合TradeResources
-        private TradeResourcesHelper _tradeResources;
-        /// <summary>
-        /// 资源集合
-        /// </summary>
-        public TradeResourcesHelper TradeResources
-        {
-            get
-            {
-                if (_tradeResources == null)
-                    _tradeResources = new TradeResourcesHelper(this);
-                return _tradeResources;
-            }
-        }
-
-        #endregion
-
-        #region Paperless
-        private PaperlessEntry paperless;
-        /// <summary>
-        /// 无纸化对象
-        /// </summary>
-        public PaperlessEntry Paperless
-        {
-            get
-            {
-                if (paperless == null)
-                    paperless = new PaperlessEntry();
-                return paperless;
-            }
-        }
-        #endregion
-
-        #region CashCode
-        private CashCodeEntry cashCode;
-        /// <summary>
-        /// 冠字号对象
-        /// </summary>
-        public CashCodeEntry CashCode
-        {
-            get
-            {
-                if (cashCode == null)
-                    cashCode = new CashCodeEntry();
-                return cashCode;
-            }
-        }
-        #endregion
-        #endregion
-
-        #region 清理
-        /// <summary>
-        /// 清理缓存数据
-        /// </summary>
-        public void Clear()
-        {
-            this.paperless = null;
-            this._tradeAPIs = null;
-            this._tradeBus = null;
-            this._tradeInfo = null;
-            this._tradeResources = null;
-        }
-        #endregion
-    }
-}

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/TradeInfoHelper.cs

@@ -1,89 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using TellerSystem.Library.Ext.TradeExtension;
-using System.Windows.Media;
-
-namespace TellerSystem.Contract.ContractBase
-{
-    /// <summary>
-    /// 交易基础信息的访问辅助类
-    /// </summary>
-    public class TradeInfoHelper
-    {
-        #region ctor & Property
-        public TradeInfoHelper(PageBase page)
-        {
-            Page = page;
-            _tradeInfoData = TradeInfoData.GetTradeInfo(Page);
-        }
-        public PageBase Page { get; private set; }
-        private TradeInfoData _tradeInfoData;
-        #endregion
-
-        #region 交易属性
-        /// <summary>
-        /// 柜员前端流水号
-        /// </summary>
-        public string SerialNumber
-        {
-            get { return _tradeInfoData.SerialNumber; }
-        }
-        /// <summary>
-        /// 系统前端流水号
-        /// </summary>
-        public string SystemSerialNumber
-        {
-            get { return _tradeInfoData.SystemSerialNumber; }
-        }
-
-        /// <summary>
-        /// 打印票号
-        /// </summary>
-        public string PrintNum
-        {
-            get { return _tradeInfoData.PrintNum; }
-        }
-        /// <summary>
-        /// 交易号，指代一个完整的业务流程
-        /// </summary>
-        public string TradeCode
-        {
-            get { return _tradeInfoData.TradeCode; }
-        }
-        /// <summary>
-        /// 交易名称，指代一个完整的业务流程
-        /// </summary>
-        public string TradeName
-        {
-            get { return _tradeInfoData.TradeName; }
-        }
-        /// <summary>
-        /// 交易截图 modify by hulei  20190116
-        /// </summary>
-        public Dictionary<string, List<ImageSource>> TradeScreens
-        {
-            set
-            {
-                _tradeInfoData.TradeScreens = value;
-            }
-            get { return _tradeInfoData.TradeScreens; }
-        }
-        /// <summary>
-        /// 主交易提交代码
-        /// </summary>
-        public string MainCode
-        {
-            get
-            {
-                return _tradeInfoData.TradeBus["MainCode"];
-            }
-            set
-            {
-                _tradeInfoData.TradeBus["MainCode"] = value;
-            }
-        }
-        #endregion
-    }
-}

ant-design-pro-vue3/src/views/front/develop/Constract/ContractBase/TradeResourcesHelper.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace TellerSystem.Contract.ContractBase
-{
-    /// <summary>
-    /// 业务资源的访问辅助类
-    /// </summary>
-    public class TradeResourcesHelper
-    {
-        #region ctor & Property
-        public TradeResourcesHelper(PageBase page)
-        {
-            Page = page;
-        }
-        public PageBase Page { get; private set; }
-        #endregion
-
-        #region 资源属性
-        public string ButtonStyle { get; set; }
-        #endregion
-    }
-}

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/ServiceHelper/TradeHandle.ts

@@ -1,283 +1,285 @@
 import { ref } from 'vue'
 import { message } from 'ant-design-vue'
-import { ServiceManager } from './ServiceManager'
+import ServiceManager from "@/views/front/platfrom/serviceproxy/ServiceHelper/TradeHandle";
 import { TransitEntity, AttachFile } from './ServiceEntitys'
-import { Platform } from './Platform'
+import CommonFunction from "@/views/front/platfrom/serviceproxy/CommonFunction";
+import { ServiceSettings } from "@/views/front/develop/ServiceProxy.Ext/ServiceSettings"
+import FilesHandle from '@/views/front/platfrom/serviceproxy/ServiceHelper/FilesHandle';
 
 export enum Transit {
-  CallServer = 'CallServer',
-  CallAgn = 'CallAgn',
-  CallTips = 'CallTips',
-  CallAgnPay = 'CallAgnPay',
-  CallAgnTIPS = 'CallAgnTIPS',
-  CallAgnSecdistruct = 'CallAgnSecdistruct',
-  CallAgnMobileBanking = 'CallAgnMobileBanking'
+    CallServer = 'CallServer',
+    CallAgn = 'CallAgn',
+    CallTips = 'CallTips',
+    CallAgnPay = 'CallAgnPay',
+    CallAgnTIPS = 'CallAgnTIPS',
+    CallAgnSecdistruct = 'CallAgnSecdistruct',
+    CallAgnMobileBanking = 'CallAgnMobileBanking'
 }
 
-export class TradeHandle {
-  /**
-   * 获取8583域定义
-   */
-  static async GetFdItemMap(type: string): Promise<any> {
-    const table = {
-      Code: '',
-      Type: '',
-      Length: '',
-      DotLength: '',
-      Description: '',
-      FieldType: '',
-      MaxLength: ''
-    }
+export default class TradeHandle {
+    /**
+     * 获取8583域定义
+     */
+    static async GetFdItemMap(type: string): Promise<any> {
+        const table = {
+            Code: '',
+            Type: '',
+            Length: '',
+            DotLength: '',
+            Description: '',
+            FieldType: '',
+            MaxLength: ''
+        }
 
-    const entity = new TransitEntity()
-    entity.ServiceName = 'TradeService'
-    entity.FuncName = 'GetFdItemMap'
-    entity.Parameters = { '1': type }
+        const entity = new TransitEntity()
+        entity.ServiceName = 'TradeService'
+        entity.FuncName = 'GetFdItemMap'
+        entity.Parameters = { '1': type }
 
-    const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-    let data = null
-    if (tmpresult && tmpresult.length === 1) {
-      data = tmpresult[0].AttachValue as string
-    }
-    
-    if (data) {
-      const lines = data.split('\n')
-      return lines.map(line => {
-        const rows = line.split('|')
-        return {
-          ...table,
-          Code: rows[0],
-          Type: rows[1],
-          Length: rows[2],
-          DotLength: rows[3],
-          Description: rows[4],
-          FieldType: rows[5],
-          MaxLength: rows[6]
+        const tmpresult = await ServiceManager.GetInstance().Commit(entity)
+        let data = null
+        if (tmpresult && tmpresult.length === 1) {
+            data = tmpresult[0].AttachValue as string
+        }
+
+        if (data) {
+            const lines = data.split('\n')
+            return lines.map(line => {
+                const rows = line.split('|')
+                return {
+                    ...table,
+                    Code: rows[0],
+                    Type: rows[1],
+                    Length: rows[2],
+                    DotLength: rows[3],
+                    Description: rows[4],
+                    FieldType: rows[5],
+                    MaxLength: rows[6]
+                }
+            })
         }
-      })
+        return []
     }
-    return []
-  }
 
-  /**
-   * 按照参数指示与外端进行通讯交互
-   */
-  static async DoTrade(
-    transit: string, 
-    integrateData: Uint8Array, 
-    kinBrno: string, 
-    fileName: string,
-    fileData: Uint8Array, 
-    args: any[], 
-    serialNo: string
-  ): Promise<Uint8Array[]> {
-    const result: Uint8Array[] = []
-    try {
-      const entity = new TransitEntity()
-      entity.ServiceName = 'TradeService'
-      entity.FuncName = 'DoTradeByTransit'
-      entity.Parameters = { 
-        '1': transit, 
-        '3': kinBrno, 
-        '4': fileName, 
-        '6': '', 
-        '7': serialNo 
-      }
+    /**
+     * 按照参数指示与外端进行通讯交互
+     */
+    static async DoTrade(
+        transit: string,
+        integrateData: Uint8Array,
+        kinBrno: string,
+        fileName: string,
+        fileData: Uint8Array,
+        args: any[],
+        serialNo: string
+    ): Promise<Uint8Array[]> {
+        const result: Uint8Array[] = []
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'TradeService'
+            entity.FuncName = 'DoTradeByTransit'
+            entity.Parameters = {
+                '1': transit,
+                '3': kinBrno,
+                '4': fileName,
+                '6': '',
+                '7': serialNo
+            }
 
-      const data = new AttachFile()
-      data.AttachIndex = '2'
-      data.AttachType = 'ByteType'
-      data.AttachValue = integrateData
-      entity.AttachFiles.push(data)
+            const data = new AttachFile()
+            data.AttachIndex = '2'
+            data.AttachType = 'ByteType'
+            data.AttachValue = integrateData
+            entity.AttachFiles.push(data)
 
-      const data1 = new AttachFile()
-      data1.AttachIndex = '5'
-      data1.AttachType = 'ByteType'
-      data1.AttachValue = fileData
-      entity.AttachFiles.push(data1)
+            const data1 = new AttachFile()
+            data1.AttachIndex = '5'
+            data1.AttachType = 'ByteType'
+            data1.AttachValue = fileData
+            entity.AttachFiles.push(data1)
 
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-      if (tmpresult) {
-        tmpresult.forEach(attachFile => {
-          result.push(attachFile.AttachValue as Uint8Array)
-        })
-      }
-    } catch (e) {
-      throw e
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
+            if (tmpresult) {
+                tmpresult.forEach(attachFile => {
+                    result.push(attachFile.AttachValue as Uint8Array)
+                })
+            }
+        } catch (e) {
+            throw e
+        }
+        return result
     }
-    return result
-  }
 
-  /**
-   * 获取交易返回的附件信息数据
-   */
-  static async GetTradeFile(fileName: string): Promise<Uint8Array> {
-    const filePath = ServiceSettings.TempFilePath + fileName + 'dhcc'
-    return FilesHandle.GetFileData(filePath)
-  }
+    /**
+     * 获取交易返回的附件信息数据
+     */
+    static async GetTradeFile(fileName: string): Promise<Uint8Array> {
+        const filePath = ServiceSettings.TempFilePath + fileName + 'dhcc'
+        return FilesHandle.GetFileData(filePath)
+    }
 
-  /**
-   * 清空交易附件信息
-   */
-  static async ClearvFile(fileName: string): Promise<boolean> {
-    let result = false
-    try {
-      const entity = new TransitEntity()
-      entity.ServiceName = 'UtilService'
-      entity.FuncName = 'SaveFile'
-      entity.Parameters = { 
-        '1': fileName, 
-        '3': 'false' 
-      }
+    /**
+     * 清空交易附件信息
+     */
+    static async ClearvFile(fileName: string): Promise<boolean> {
+        let result = false
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'UtilService'
+            entity.FuncName = 'SaveFile'
+            entity.Parameters = {
+                '1': fileName,
+                '3': 'false'
+            }
 
-      const data = new AttachFile()
-      data.AttachIndex = '2'
-      data.AttachType = 'ByteType'
-      data.AttachValue = new Uint8Array(0)
-      entity.AttachFiles.push(data)
+            const data = new AttachFile()
+            data.AttachIndex = '2'
+            data.AttachType = 'ByteType'
+            data.AttachValue = new Uint8Array(0)
+            entity.AttachFiles.push(data)
 
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-      if (tmpresult && tmpresult.length === 1) {
-        result = tmpresult[0].AttachValue as boolean
-      }
-    } catch (e) {
-      throw e
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
+            if (tmpresult && tmpresult.length === 1) {
+                result = tmpresult[0].AttachValue as boolean
+            }
+        } catch (e) {
+            throw e
+        }
+        return result
     }
-    return result
-  }
 
-  /**
-   * 检查交易
-   */
-  static async Check(inf: CheckInfo): Promise<CheckResult | null> {
-    let result: CheckResult | null = null
-    try {
-      const entity = new TransitEntity()
-      entity.ServiceName = 'TradeService'
-      entity.FuncName = 'Check'
+    /**
+     * 检查交易
+     */
+    static async Check(inf: CheckInfo): Promise<CheckResult | null> {
+        let result: CheckResult | null = null
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'TradeService'
+            entity.FuncName = 'Check'
 
-      const data = new AttachFile()
-      data.AttachIndex = '1'
-      data.AttachType = 'TableType'
-      data.AttachValue = Platform.CommonFunction.ChangeEntityToTable([inf])
-      entity.AttachFiles.push(data)
+            const data = new AttachFile()
+            data.AttachIndex = '1'
+            data.AttachType = 'TableType'
+            data.AttachValue = CommonFunction.ChangeEntityToTable([inf])
+            entity.AttachFiles.push(data)
 
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-      if (tmpresult && tmpresult.length === 1) {
-        const rmpresult = Platform.CommonFunction.ChangeTableToEntitys<CheckResult>(
-          tmpresult[0].AttachValue as DataTable
-        )
-        if (rmpresult.length > 0) {
-          result = rmpresult[0]
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
+            if (tmpresult && tmpresult.length === 1) {
+                const rmpresult = CommonFunction.ChangeTableToEntitys<CheckResult>(
+                    tmpresult[0].AttachValue as DataTable
+                )
+                if (rmpresult.length > 0) {
+                    result = rmpresult[0]
+                }
+            }
+        } catch (e) {
+            throw e
         }
-      }
-    } catch (e) {
-      throw e
+        return result
     }
-    return result
-  }
 
-  /**
-   * 复核操作
-   */
-  static async Super(
-    serialId: string, 
-    SuperId: string, 
-    taskid: string, 
-    stat: number, 
-    TellerNo: string, 
-    tradedata: Record<string, string>, 
-    pagedata: Uint8Array,
-    refuseReason: string
-  ): Promise<boolean> {
-    let result = false
-    try {
-      const entity = new TransitEntity()
-      entity.ServiceName = 'TradeService'
-      entity.FuncName = 'Super'
-      entity.Parameters = { 
-        '1': serialId, 
-        '2': SuperId, 
-        '3': taskid, 
-        '4': stat.toString(), 
-        '5': TellerNo, 
-        '6': Platform.CommonFunction.ChangeDicToStr(tradedata),
-        '8': refuseReason
-      }
+    /**
+     * 复核操作
+     */
+    static async Super(
+        serialId: string,
+        SuperId: string,
+        taskid: string,
+        stat: number,
+        TellerNo: string,
+        tradedata: Record<string, string>,
+        pagedata: Uint8Array,
+        refuseReason: string
+    ): Promise<boolean> {
+        let result = false
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'TradeService'
+            entity.FuncName = 'Super'
+            entity.Parameters = {
+                '1': serialId,
+                '2': SuperId,
+                '3': taskid,
+                '4': stat.toString(),
+                '5': TellerNo,
+                '6': CommonFunction.ChangeDicToStr(tradedata),
+                '8': refuseReason
+            }
 
-      const data = new AttachFile()
-      data.AttachIndex = '7'
-      data.AttachType = 'ByteType'
-      data.AttachValue = pagedata
-      entity.AttachFiles.push(data)
+            const data = new AttachFile()
+            data.AttachIndex = '7'
+            data.AttachType = 'ByteType'
+            data.AttachValue = pagedata
+            entity.AttachFiles.push(data)
 
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-      if (tmpresult && tmpresult.length === 1) {
-        result = tmpresult[0].AttachValue as boolean
-      }
-    } catch (e) {
-      throw e
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
+            if (tmpresult && tmpresult.length === 1) {
+                result = tmpresult[0].AttachValue as boolean
+            }
+        } catch (e) {
+            throw e
+        }
+        return result
     }
-    return result
-  }
 
-  /**
-   * 授权验证操作
-   */
-  static async DoAuth(auth: string, pwd: string, lvl: string | null): Promise<AuthResult | null> {
-    let result: AuthResult | null = null
-    try {
-      const entity = new TransitEntity()
-      entity.ServiceName = 'TradeService'
-      entity.FuncName = 'DoAuth'
-      entity.Parameters = { 
-        '1': auth, 
-        '2': pwd, 
-        '3': lvl || '' 
-      }
+    /**
+     * 授权验证操作
+     */
+    static async DoAuth(auth: string, pwd: string, lvl: string | null): Promise<AuthResult | null> {
+        let result: AuthResult | null = null
+        try {
+            const entity = new TransitEntity()
+            entity.ServiceName = 'TradeService'
+            entity.FuncName = 'DoAuth'
+            entity.Parameters = {
+                '1': auth,
+                '2': pwd,
+                '3': lvl || ''
+            }
 
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-      if (tmpresult && tmpresult.length === 1) {
-        const rmpresult = Platform.CommonFunction.ChangeTableToEntitys<AuthResult>(
-          tmpresult[0].AttachValue as DataTable
-        )
-        if (rmpresult.length > 0) {
-          result = rmpresult[0]
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
+            if (tmpresult && tmpresult.length === 1) {
+                const rmpresult = CommonFunction.ChangeTableToEntitys<AuthResult>(
+                    tmpresult[0].AttachValue as DataTable
+                )
+                if (rmpresult.length > 0) {
+                    result = rmpresult[0]
+                }
+            }
+        } catch (e) {
+            throw e
         }
-      }
-    } catch (e) {
-      throw e
+        return result
     }
-    return result
-  }
 }
 
 interface CheckInfo {
-  // ... 检查信息字段
+    // ... 检查信息字段
 }
 
 interface CheckResult {
-  // ... 检查结果字段
+    // ... 检查结果字段
 }
 
 interface AuthResult {
-  // ... 授权结果字段
+    // ... 授权结果字段
 }
 
 interface AskSuperInfo {
-  // ... 申请复核信息字段
+    // ... 申请复核信息字段
 }
 
 interface AskAuthInfo {
-  // ... 申请授权信息字段
+    // ... 申请授权信息字段
 }
 
 interface PageData {
-  datas: Uint8Array
-  dataslength: number
-  // ... 其他字段
+    datas: Uint8Array
+    dataslength: number
+    // ... 其他字段
 }
 
 interface AuthTransRecords {
-  // ... 授权交易记录字段
-}
+    // ... 授权交易记录字段
+}

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/ServiceSettings.ts

@@ -112,26 +112,39 @@ class ServiceSettings {
 
     private static _SysConfig_: TT_SysConfig[] = TradeManagerHandle.GetSysconfigList("");
 
-    /**
-     * 获取服务端配置项，TT_Sysconfig
-     */
-    static GetConfig(id: string, defV: string = ''): string {
-        // 设计时不执行
-        // 由于 TypeScript 环境没有类似 WPF 的设计时模式，这里暂时注释掉
-        // if (System.ComponentModel.DesignerProperties.GetIsInDesignMode(new System.Windows.DependencyObject())) return defV;
-        const item = this._SysConfig_.find(x => x.Configid === id || x.Configname === id);
-        // 找到配置项，返回
-        if (item) return item.Configvalue;
-        // 数据库未配置的情况，以 System 配置文件为准
-        const value = ConfigManager.GetInstance().GetConfigValue(id, ConfigType.System);
-        if (value) return value;
-        return defV;
+    // static _SysConfig_: { Configid: string; Configname: string; Configvalue: string }[] = [];
+    static GetConfig(id: string, defV: number): number;
+    static GetConfig(id: string, defV: boolean): boolean;
+    static GetConfig(id: string, defV: string): string;
+    static GetConfig<T>(id: string, defV?: T): T;
+
+    // 函数实现
+    static GetConfig<T>(id: string, defV?: T): T {
+        if (typeof defV === 'number') {
+            const value = this.GetConfig(id, '');
+            const v = parseInt(value, 10);
+            return isNaN(v) ? defV : v as unknown as T;
+        } else if (typeof defV === 'boolean') {
+            const value = this.GetConfig(id, '');
+            return value.toLowerCase() === 'true' ? true as unknown as T : false as unknown as T;
+        } else {
+            // 设计时不执行
+            // 由于 TypeScript 环境没有类似 WPF 的设计时模式，这里暂时注释掉 hulei
+            // if (System.ComponentModel.DesignerProperties.GetIsInDesignMode(new System.Windows.DependencyObject())) return defV;
+            const item = this._SysConfig_.find(x => x.Configid === id || x.Configname === id);
+            // 找到配置项，返回
+            if (item) return item.Configvalue as unknown as T;
+            // 数据库未配置的情况，以 System 配置文件为准
+            const value = ConfigManager.GetInstance().GetConfigValue(id, ConfigType.System);
+            if (value) return value as unknown as T;
+            return defV as T;
+        }
     }
 
     /**
      * 获取参数集合
      */
-    static GetConfigList(prefix: string): { [key: string]: string } {
+    static GetConfigList(prefix?: string): { [key: string]: string } {
         if (!prefix) return {};
         // 优先匹配 id
         const dict = this._SysConfig_.filter(x => x.Configid.startsWith(prefix)).reduce((acc, x) => {
@@ -145,20 +158,7 @@ class ServiceSettings {
         }, {} as { [key: string]: string });
     }
 
-    static GetConfig(id: string, defV: number): number;
-    static GetConfig(id: string, defV: boolean): boolean;
-    static GetConfig<T>(id: string, defV?: T): T {
-        if (typeof defV === 'number') {
-            const value = this.GetConfig(id, '');
-            const v = parseInt(value, 10);
-            return isNaN(v) ? defV : v as unknown as T;
-        } else if (typeof defV === 'boolean') {
-            const value = this.GetConfig(id, '');
-            return value.toLowerCase() === 'true' ? true : false as unknown as T;
-        } else {
-            return this.GetConfig(id, defV as string) as unknown as T;
-        }
-    }
+
 
     /**
      * 是否登记打印数据
@@ -175,4 +175,4 @@ class ServiceSettings {
     }
 }
 
-export { ServiceSettings };
+export { ServiceSettings };

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/AuthHandle.ts

@@ -1,11 +1,18 @@
 // 模拟导入相关模块，需要根据实际情况调整
-import { RestClient } from './RestClient'; // 假设 RestClient 定义在此路径
-import { ServiceSettings } from './ServiceSettings'; // 假设 ServiceSettings 定义在此路径
-import { LoginUserInfo } from './LoginUserInfo'; // 假设 LoginUserInfo 定义在此路径
-import { GetTokenReq, TokenResult, ElementInfoResult, ApplyInfoReq, RmAuthResult, FlawTradeListResult, AuthHistoryInfoResult, FlawInfoReq } from './AuthEntity'; // 假设这些实体定义在此路径
-import { RSAUtil } from './RSAUtil'; // 假设 RSAUtil 定义在此路径
-import { PlatformLogger } from './PlatformLogger'; // 假设 PlatformLogger 定义在此路径
-
+import { RestClient } from '@/views/front/develop/ServiceProxy.Ext/WebAPI/RestClient'; // 假设 RestClient 定义在此路径
+import { ServiceSettings } from "@/views/front/develop/ServiceProxy.Ext/ServiceSettings"
+import LoginUserInfo from "@/views/front/platfrom/common/RunningParameters/LoginUserInfo";
+//import { RmAuthResult, FlawTradeListResult, AuthHistoryInfoResult, FlawInfoReq } from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/"// 假设这些实体定义在此路径
+import { RSAUtil } from '@/views/front/develop/ServiceProxy.Ext/WebAPI/RSAUtil'; // 假设 RSAUtil 定义在此路径
+import PlatformLogger from "@/views/front/platfrom/common/LogSystem/PlatformLogger"; //定义在此路径 hulei 日志登记还没有
+import GetTokenReq from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/GetTokenReq"
+import { TokenResult } from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/TokenResult"
+import { ElementInfoResult } from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/ElementInfoResult"
+import { ApplyInfoReq } from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/ApplyInfoReq"
+import { RmAuthResult } from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/RmAuthResult"
+import FlawTradeListResult from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/FlawTradeListResult"
+import { AuthHistoryInfoResult } from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/AuthHistoryInfoResult"
+import FlawInfoReq from "@/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/FlawInfoReq"
 export class AuthHandle {
     private static restClient: RestClient = new RestClient(ServiceSettings.AuthServiceUri);
     private static authSystemName: string = ServiceSettings.AuthSystemName;
@@ -37,38 +44,64 @@ export class AuthHandle {
     private static GetToken(): string {
         const req: GetTokenReq = new GetTokenReq();
         req.sysName = this.authSystemName;
-        req.secret = new RSAUtil(this.GetPublicKey()).Encrypt(this.authSystemSecret);
-        const result: TokenResult = this.restClient.Post<TokenResult>("auth/getToken", req);
+        req.secret = new RSAUtil(this.GetPublicKey()).encrypt(this.authSystemSecret);
+        let result: TokenResult = null
+        this.restClient.Post<TokenResult>("auth/getToken", req).then(x => {
+            result = x
+
+        });
         return result.accessToken;
     }
 
     private static GetPublicKey(): string {
         const para: { [key: string]: string } = {};
+        let result = "";
         para["sysName"] = this.authSystemName;
-        return this.restClient.Get<string>("auth/getPublicKey", para);
+        this.restClient.Get<string>("auth/getPublicKey", para).then(x => {
+            result = x;
+        });
+        return result;
     }
 
     public static GetRmAuthElementByMenu(menuCode: string, menuNo: string = "0"): ElementInfoResult {
         const para: { [key: string]: string } = {};
         para["menuCode"] = menuCode;
         para["menuNo"] = menuNo;
-        return this.restClient.Get<ElementInfoResult>("client/getRmAuthElementByMenu", para, this.AuthToken);
+        let result: ElementInfoResult = null;
+        this.restClient.Get<ElementInfoResult>("client/getRmAuthElementByMenu", para, this.AuthToken).then(x => {
+            result = x;
+        });
+        return result;
     }
 
     public static ApplyRmAuth(applyInfoReq: ApplyInfoReq): string {
-        return this.restClient.Post<string>("client/applyRmAuth", applyInfoReq, this.AuthToken);
+        let result = "";
+        this.restClient.Post<string>("client/applyRmAuth", applyInfoReq, this.AuthToken).then(x => {
+            result = x
+        });
+        return result;
     }
 
     public static GetRmAuthResultByRecord(rmAuthRecord: string): RmAuthResult {
+        let result: RmAuthResult = null;
         const para: { [key: string]: string } = {};
         para["rmAuthRecord"] = rmAuthRecord;
-        return this.restClient.Get<RmAuthResult>("client/getRmAuthResultByRecord", para, this.AuthToken);
+        this.restClient.Get<RmAuthResult>("client/getRmAuthResultByRecord", para, this.AuthToken).then(x => {
+            result = x
+
+        });
+        return result;
     }
 
     public static UndoRmAuth(rmAuthRecord: string): string {
+        let result = "";
         const para: { [key: string]: string } = {};
         para["rmAuthRecord"] = rmAuthRecord;
-        return this.restClient.Get<string>("client/undoRmAuth", para, this.AuthToken);
+        this.restClient.Get<string>("client/undoRmAuth", para, this.AuthToken).then(x => {
+            result = x
+
+        });
+        return result;
     }
 
     public static UploadFile(fileName: string, fileByte: Uint8Array): string {
@@ -76,7 +109,10 @@ export class AuthHandle {
         try {
             const startime = new Date().toISOString().replace(/[^0-9]/g, '');
             PlatformLogger.SystemInfo(`--------------------------start--${startime}::${fileName}------------------------`);
-            resultUploadeFile = this.restClient.UploadFile<string>("file/upload", fileName, fileByte, this.AuthToken);
+            this.restClient.UploadFile<string>("file/upload", fileName, fileByte, this.AuthToken).then(x => {
+                resultUploadeFile = x;
+
+            });
         } catch (e) {
             // 原代码未处理异常，这里保持原样
         }
@@ -96,18 +132,29 @@ export class AuthHandle {
     }
 
     public static GetFlawTradeList(): FlawTradeListResult[] {
+        let result = null;
         const para: { [key: string]: string } = {};
         para["userCode"] = this.tellerNo;
-        return this.restClient.Get<FlawTradeListResult[]>("record/getFlawTradeList", para, this.AuthToken);
+        this.restClient.Get<FlawTradeListResult[]>("record/getFlawTradeList", para, this.AuthToken).then(x => {
+
+            result = x
+        });
+        return result
     }
 
     public static GetHistoryInfo(recordCode: string): AuthHistoryInfoResult {
         const para: { [key: string]: string } = {};
+        let result: AuthHistoryInfoResult = null;
         para["recordCode"] = recordCode;
-        return this.restClient.Get<AuthHistoryInfoResult>("/client/getHistoryInfo", para, this.AuthToken);
+        this.restClient.Get<AuthHistoryInfoResult>("/client/getHistoryInfo", para, this.AuthToken).then(x => {
+            result = x;
+        });
+        return result;
     }
 
     public static AdditionalRmauthInfo(flawInfoReq: FlawInfoReq): string {
-        return this.restClient.Post<string>("record/additionalRmauthInfo", flawInfoReq, this.AuthToken);
+        let result = null;
+        this.restClient.Post<string>("record/additionalRmauthInfo", flawInfoReq, this.AuthToken);
+        return result
     }
-}
+}

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/WebAPI/Auth/Entity/TokenResult.ts

@@ -12,4 +12,4 @@ export interface TokenResult {
      * 刷新令牌，用于在访问令牌过期时获取新的访问令牌
      */
     refreshToken: string;
-}
+}

ant-design-pro-vue3/src/views/front/develop/ServiceProxy.Ext/WebAPI/RestClient.ts

@@ -77,31 +77,33 @@ export class RestClient {
 
     // 基础文件上传请求
     private async uploadFileRequest(uri: string, fileName: string, fileByte: Uint8Array, token?: string): Promise<string> {
-        // 假设 ServiceSettings 存在，这里简单模拟
-        let serviceUrl = 'https://example.com/auth-file'; 
-        let formData = new FormData();
-        let blob = new Blob([fileByte], { type: 'application/octet-stream' });
-        formData.append('file', blob, fileName);
-
-        let config: AxiosRequestConfig = {
-            headers: {
-                'Content-Type': `multipart/form-data; boundary=${formData.getBoundary()}`
-            }
-        };
-
-        if (token) {
-            config.headers['Authorization'] = token;
-        }
-
-        try {
-            let response: AxiosResponse = await axios.post(serviceUrl, formData, config);
-            return response.data;
-        } catch (error) {
-            if (axios.isAxiosError(error) && error.code === 'ETIMEDOUT') {
-                throw new Error(error.message);
-            }
-            throw error;
-        }
+        // // 假设 ServiceSettings 存在，这里简单模拟
+        // let serviceUrl = 'https://example.com/auth-file'; 
+        // let formData = new FormData();
+        // let blob = new Blob([fileByte], { type: 'application/octet-stream' });
+        // formData.append('file', blob, fileName);
+
+        // let config: AxiosRequestConfig = {
+        //     headers: {
+        //         'Content-Type': `multipart/form-data; boundary=${formData.getBoundary()}`
+        //     }
+        // };
+
+        // if (token) {
+        //     config.headers['Authorization'] = token;
+        // }
+
+        // try {
+        //     let response: AxiosResponse = await axios.post(serviceUrl, formData, config);
+        //     return response.data;
+        // } catch (error) {
+        //     if (axios.isAxiosError(error) && error.code === 'ETIMEDOUT') {
+        //         throw new Error(error.message);
+        //     }
+        //     throw error;
+        // }
+        return "";
+        //hulei 与原文件实现逻辑不一样需要重写
     }
 
     // 结果处理
@@ -124,4 +126,4 @@ export class RestClient {
         }
         return url;
     }
-}
+}

ant-design-pro-vue3/src/views/front/platfrom/common/BasicFunctions/BaseClasses/EncrypDecryptHelper.ts

@@ -61,7 +61,7 @@ export default class EncrypDecryptHelper {
     private static _instance: EncrypDecryptHelper;
     private KEY = PlatformSettings.EncryptsKey;
     private defaultMode: Mode;
-    private publicKeyFileInfo = null;// new FileInfo('Devices/Cfca/Platform.PublicKey.sm2');//TODO:加密
+    private publicKeyFileInfo = null;// new FileInfo('Devices/Cfca/Platform.PublicKey.sm2');//hulei:加密
     private msgEncrypt: MsgEncryptionKitLib.CryptoAgent | null = null;
     private publicKey = '';
     private genSymKey = '';
@@ -111,7 +111,7 @@ export default class EncrypDecryptHelper {
         }
         return true;
     }
-    //TODO 加密方式
+    //hulei 加密方式
     static Encrypt(msgByte: Uint8Array<ArrayBuffer>, arg1: boolean): Uint8Array<ArrayBuffer> {
         throw new Error('Method not implemented.');
     }

ant-design-pro-vue3/src/views/front/platfrom/common/BasicFunctions/BaseClasses/EventAggregator.ts

@@ -1,8 +1,8 @@
-// 标记接口，用于标识实现了消息处理功能的类 TODO 注调了
+// 标记接口，用于标识实现了消息处理功能的类 hulei 注调了
 //interface IHandle {}
 
 // 泛型接口，用于处理特定类型的消息
-interface IHandle<TMessage> {//extends IHandle TODO 报错
+interface IHandle<TMessage> {//extends IHandle hulei 继承报错
     // 处理传入的消息
     Handle(message: TMessage): void;
 }
@@ -53,11 +53,11 @@ class EventAggregator implements IEventAggregator {
         }
     }
 
-    // 使用默认的线程调度器发布消息 TODO
+    // 使用默认的线程调度器发布消息 hulei
     public Publish(message: any): void {
         //this.Publish(message, this.PublicationThreadMarshaller);
     }
-    //TODO 线程消息发布订阅的模式是否ts中是否有其他的方式能实现
+    //hulei 线程消息发布订阅的模式是否ts中是否有其他的方式能实现
     //使用指定的线程调度器发布消息
     // public Publish(message: any, marshal: (action: () => void) => void): void {
     //     const toNotify = [...this.handlers];
@@ -82,11 +82,11 @@ class Handler {
 
     constructor(handler: any) {
         this.reference = new WeakRef(handler);
-        const handlerInfo = null;//(IHandle as any).prototype; TODO 这个IHandle
+        const handlerInfo = null;//(IHandle as any).prototype; hulei 这个IHandle
         const interfaces = Object.getPrototypeOf(handler).constructor
             .getInterfaces()
             .filter(x => x.prototype instanceof handlerInfo && x.typeParameters.length > 0);
-        // interfaces.forEach((@interface: any) => { TODO注掉了
+        // interfaces.forEach((@interface: any) => { hulei注掉了
         //     const type = @interface.typeParameters[0];
         //     const method = @interface.prototype.Handle;
         //     this.supportedHandlers.set(type, method.bind(handler));

ant-design-pro-vue3/src/views/front/platfrom/common/BasicFunctions/BaseClasses/ObservableObject.ts

@@ -46,7 +46,7 @@ class ObservableObject {
     }
 
     // 创建响应式对象
-    createReactive<T extends object>(obj: T): object {//TODO这里由T泛型改为 object
+    createReactive<T extends object>(obj: T): object {//hulei这里由T泛型改为 object
         const reactiveObj = reactive(obj);
         // 监听所有属性的变化
         watch(() => Object.values(reactiveObj), () => {

ant-design-pro-vue3/src/views/front/platfrom/common/BasicFunctions/Extensions/DependencyObjectExtensions.ts

@@ -82,7 +82,7 @@ function findVisualParent<T extends HTMLElement>(element: HTMLElement): T | null
         if (parent instanceof HTMLElement) {
             return parent as T;
         }
-        parent = null;//parent.parentElement;TODO VUE上有视觉树的概念吗？
+        parent = null;//parent.parentElement;hulei VUE上有视觉树的概念吗？
     }
     return null;
 }

ant-design-pro-vue3/src/views/front/platfrom/common/BasicFunctions/Handles/EncryptAndDecryptHandle.ts

@@ -4,5 +4,5 @@ namespace Platform.Common.BasicFunctions {
     }
 }
 
-// 示例使用 TODO报错暂时先注释调
+// 示例使用 hulei 报错暂时先注释调
 //const result = Platform.Common.BasicFunctions.EncryptAndDecryptHandle;

ant-design-pro-vue3/src/views/front/platfrom/common/LogSystem/LogWriter.ts

@@ -1,4 +1,4 @@
-//import { ILog, Level } from 'log4net'; // 假设 log4net 有对应的 TypeScript 定义//TODO日志信息可以先不登记
+//import { ILog, Level } from 'log4net'; // 假设 log4net 有对应的 TypeScript 定义//hulei 日志信息可以先不登记
 
 // 假设的 LoginUserInfo 类
 class LoginUserInfo {
@@ -24,8 +24,8 @@ class EncrypDecryptHelper {
 // 日志数据类
 class LogData {
     constructor(
-        //public LogObject: ILog,//TODO日志信息可以先不登记
-        //public LogLevel: Level,//TODO日志信息可以先不登记
+        //public LogObject: ILog,//hulei日志信息可以先不登记
+        //public LogLevel: Level,//hulei日志信息可以先不登记
         public Content: string,
         public TradeNo: string = null,
         public LogException: Error = null
@@ -34,13 +34,13 @@ class LogData {
         this.LogDate = new Date().toISOString().replace('T', ' ').substring(0, 19);
     }
 
-    //public LogObject: ILog;//TODO日志信息可以先不登记
-    //ublic LogLevel: Level;
+    //public LogObject: ILog;//hulei日志信息可以先不登记
+    // public LogLevel: Level;
     //public TradeNo: string;
     public LogDate: string;
     public TellerNo: string;
-    //public Content: string;
-    //public LogException: Error;
+    // public Content: string;
+    // public LogException: Error;
     public AttachData: any;
 }
 
@@ -94,11 +94,11 @@ class LogWriter {
             stringBuilder += msg;
             stringBuilder += 'End\n';
 
-            // this.SendToLog4net(target.LogObject, target.LogLevel, stringBuilder, null);//TODO日志信息可以先不登记
+            // this.SendToLog4net(target.LogObject, target.LogLevel, stringBuilder, null);//hulei 日志信息可以先不登记
         });
     }
 
-    private SendToLog4net(log: "", level: "", msg: any, exception: Error) {//TODO日志信息可以先不登记(log: ILog, level: Level, msg: any, exception: Error)
+    private SendToLog4net(log: "", level: "", msg: any, exception: Error) {//hulei日志信息可以先不登记(log: ILog, level: Level, msg: any, exception: Error)
         // switch (level.Name) {
         //     case 'DEBUG':
         //         log.Debug(msg, exception);

ant-design-pro-vue3/src/views/front/platfrom/common/LogSystem/PlatformLogger.ts

@@ -1,156 +1,181 @@
-import winston from './winston'; //TODO这里日志记录使用了log4net.dll需要解决对应的方案 可以使用vuejs-logger来代替
-import LoginUserInfo from '../RunningParameters/LoginUserInfo'; // 假设 LoginUserInfo 定义在该文件中TODO：缺用户模块
-
+import winston from './winston'; //hulei这里日志记录使用了log4net.dll需要解决对应的方案 可以使用vuejs-logger来代替
+import LoginUserInfo from '../RunningParameters/LoginUserInfo'; // 假设 LoginUserInfo 定义在该文件中hulei：缺用户模块
+import { LogWriter } from "@/views/front/platfrom/common/LogSystem/LogWriter"
 // 假设 LogWriter 类的实现
-class LogWriter {
-    private static instance: LogWriter;
-    private logData: any[] = [];
+// class LogWriter {
+//     private static instance: LogWriter;
+//     private logData: any[] = [];
 
-    private constructor() { }
+//     private constructor() { }
 
-    public static get Instance() {
-        return this.instance || (this.instance = new this());
-    }
+//     public static get Instance() {
+//         return this.instance || (this.instance = new this());
+//     }
 
-    public AddLogData(data: any) {
-        this.logData.push(data);
-    }
+//     public AddLogData(data: any) {
+//         this.logData.push(data);
+//     }
 
-    public SaveLog() {
-        // 实现保存日志的逻辑
-    }
+//     public SaveLog() {
+//         // 实现保存日志的逻辑
+//     }
+// }
+const enum Enum {
+    A = 1,
+    B = A * 2,
 }
-
-// 定义日志记录器
 const lg1 = winston.createLogger("lg1");
 const lg2 = winston.createLogger("lg2");
 const lg3 = winston.createLogger("lg3");
 const lg4 = winston.createLogger("lg4");
 const lg5 = winston.createLogger("lg5");
+export default class PlatformLogger {
 
-// 日志文件开关状态
-const dics: { [key: string]: string } = {
-    'System.log': 'on',
-    'Debug.log': 'on',
-    'Message.log': 'on',
-    'Error.log': 'on',
-};
-
-// 创建连接
-function CreateConnection(tellerNo: string, tradeDate: string) {
-    // 实现创建连接的逻辑
-}
+    private static instance: LogWriter;
+    //     private logData: any[] = [];
 
-// 关闭连接
-function CloseConnection() {
-    // 实现关闭连接的逻辑
-}
+    //     private constructor() { }
 
-// 系统正常运行的输出日志
-export function SystemInfo(logDetail: string) {
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-    LogWriter.Instance.AddLogData({ logger: lg1, level: 'debug', message: logDetail });
-    LogWriter.Instance.SaveLog();
-    CloseConnection();
-}
+    //     public static get Instance() {
+    //         return this.instance || (this.instance = new this());
+    //     }
 
-// 交易正常运行的输出日志
-export function TradeInfo(logDetail: string, tradeNum = '****') {
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-    LogWriter.Instance.AddLogData({ logger: lg2, level: 'debug', message: logDetail, tradeNum });
-    LogWriter.Instance.SaveLog();
-    CloseConnection();
-}
+    //     public AddLogData(data: any) {
+    //         this.logData.push(data);
+    //     }
 
-// 交易异常的输出日志
-export function TradeErrorInfo(errMsg: string, ex: Error, tradeNum = '****') {
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-    LogWriter.Instance.AddLogData({ logger: lg3, level: 'error', message: errMsg, tradeNum, ex });
-    LogWriter.Instance.SaveLog();
-    CloseConnection();
-}
+    //     public SaveLog() {
+    //         // 实现保存日志的逻辑
+    //     }
+    // 定义日志记录器
 
-// 普通异常(不属于交易异常)的输出日志
-export function SystemErrorInfo(errMsg: string, ex: Error) {
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-    LogWriter.Instance.AddLogData({ logger: lg5, level: 'error', message: errMsg, ex });
-    LogWriter.Instance.SaveLog();
-    CloseConnection();
-}
 
-// 通讯内容的输出日志
-export function CommunicationInfo(msg: string, tradeNum = '****') {
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-    LogWriter.Instance.AddLogData({ logger: lg4, level: 'debug', message: msg, tradeNum });
-    LogWriter.Instance.SaveLog();
-    CloseConnection();
-}
+    // 日志文件开关状态
+    // const dics: { [key: string]: string } = {
+    //     'System.log': 'on',
+    //     'Debug.log': 'on',
+    //     'Message.log': 'on',
+    //     'Error.log': 'on',
+    // };
+
+    // 创建连接
+    public static CreateConnection(tellerNo: string, tradeDate: string) {
+        // 实现创建连接的逻辑
+    }
+
+    // 关闭连接
+    public static CloseConnection() {
+        // 实现关闭连接的逻辑
+    }
+
+    // 系统正常运行的输出日志
+    public static SystemInfo(logDetail: string) {
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+        // LogWriter.Instance.AddLogData({ Content: "", TradeNo: 'debug', TellerNo: "" });//hulei 先排除
+        LogWriter.Instance.SaveLog();
+        this.CloseConnection();
+    }
+
+    // 交易正常运行的输出日志
+    public static TradeInfo(logDetail: string, tradeNum = '****') {
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+        // LogWriter.Instance.AddLogData({ logger: lg2, level: 'debug', message: logDetail, tradeNum });;//hulei 先排除
+        LogWriter.Instance.SaveLog();
+        this.CloseConnection();
+    }
+
+    // 交易异常的输出日志
+    public static TradeErrorInfo(errMsg: string, ex: Error, tradeNum = '****') {
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+        // LogWriter.Instance.AddLogData({ logger: lg3, level: 'error', message: errMsg, tradeNum, ex });;//hulei 先排除
+        LogWriter.Instance.SaveLog();
+        this.CloseConnection();
+    }
+
+    // 普通异常(不属于交易异常)的输出日志
+    public static SystemErrorInfo(errMsg: string, ex: Error) {
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+        // LogWriter.Instance.AddLogData({ logger: lg5, level: 'error', message: errMsg, ex });;//hulei 先排除
+        LogWriter.Instance.SaveLog();
+        this.CloseConnection();
+    }
 
-// 获取待上传的目录路径
-export function GetUploadDataPath(isChecked: boolean): string {
-    CloseConnection();
-    if (isChecked) {
-        if (CanbeSent(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate)) {
-            return GetBackUp();
+    // 通讯内容的输出日志
+    public static CommunicationInfo(msg: string, tradeNum = '****') {
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+        // LogWriter.Instance.AddLogData({ logger: lg4, level: 'debug', message: msg, tradeNum });;//hulei 先排除
+        LogWriter.Instance.SaveLog();
+        this.CloseConnection();
+    }
+
+    // 获取待上传的目录路径
+    public static GetUploadDataPath(isChecked: boolean): string {
+        this.CloseConnection();
+        if (isChecked) {
+            if (this.CanbeSent(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate)) {
+                return this.GetBackUp();
+            }
+        } else {
+            return this.GetBackUp();
         }
-    } else {
-        return GetBackUp();
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+        return '';
     }
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-    return '';
-}
+    static CanbeSent(TellerNo: string, TradeDate: string): boolean {
+        return false;
 
-// 更改输出配置
-export function ChangeOutput() {
-    CloseConnection();
-    CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
-}
+    }
 
-// 判断日志文件是否满足上传条件
-function CanbeSent(path: string, tradeDate: string): boolean {
-    // 实现判断逻辑
-    return false;
-}
+    // 更改输出配置
+    public static ChangeOutput() {
+        this.CloseConnection();
+        this.CreateConnection(LoginUserInfo.TellerNo, LoginUserInfo.TradeDate);
+    }
 
-// 检查日志文件是否能写入
-function CheckSwitchOfFile(logger: "", dic: { [key: string]: string }) {//TODO(logger: winston.Logger, dic: { [key: string]: string })
-    // 实现检查逻辑
-}
+    // 判断日志文件是否满足上传条件
+    public static static(path: string, tradeDate: string): boolean {
+        // 实现判断逻辑
+        return false;
+    }
 
-// 获取日志文件的最近上传时间
-function GetLastSentTime(fInfo: any): Date {
-    // 实现获取时间逻辑
-    return new Date();
-}
+    // 检查日志文件是否能写入
+    public static CheckSwitchOfFile(logger: "", dic: { [key: string]: string }) {//hulei(logger: winston.Logger, dic: { [key: string]: string })
+        // 实现检查逻辑
+    }
 
-// 获取日志文件的大小
-function GetSizeOfFile(fInfo: any): number {
-    // 实现获取大小逻辑
-    return 0;
-}
-const enum Enum {
-    A = 1,
-    B = A * 2,
-}
-// 为指定的日志记录器添加输出文件
-function SetAppender(logger: "", appender: any) {//TODO(logger: winston.Logger, appender: any)
-    // 实现添加输出文件逻辑
-}
+    // 获取日志文件的最近上传时间
+    public static GetLastSentTime(fInfo: any): Date {
+        // 实现获取时间逻辑
+        return new Date();
+    }
 
-// 创建输出文件
-function CreateAppender(tellerNo: string, fileName: string): any {
-    // 实现创建输出文件逻辑
-    return {};
-}
+    // 获取日志文件的大小
+    public static GetSizeOfFile(fInfo: any): number {
+        // 实现获取大小逻辑
+        return 0;
+    }
 
-// 截屏函数
-function CutScreen(): string {
-    // 实现截屏逻辑
-    return '';
-}
+    // 为指定的日志记录器添加输出文件
+    public static SetAppender(logger: "", appender: any) {//hulei(logger: winston.Logger, appender: any)
+        // 实现添加输出文件逻辑
+    }
+
+    // 创建输出文件
+    public static CreateAppender(tellerNo: string, fileName: string): any {
+        // 实现创建输出文件逻辑
+        return {};
+    }
+
+    // 截屏函数
+    public static CutScreen(): string {
+        // 实现截屏逻辑
+        return '';
+    }
+
+    // 对待上传的目录进行备份，并返回目录路径
+    public static GetBackUp(): string {
+        // 实现备份逻辑
+        return '';
+    }
 
-// 对待上传的目录进行备份，并返回目录路径
-function GetBackUp(): string {
-    // 实现备份逻辑
-    return '';
 }

ant-design-pro-vue3/src/views/front/platfrom/common/RunningParameters/LoginUserInfo.ts

@@ -38,7 +38,7 @@ export default class LoginUserInfo {
         return this.GetUserInfo<TradeModel[]>('TradeRight');
     }
 
-    // // 获取参数指定的缓存配置项 //TODO此处有两种方法 不能重载
+    // // 获取参数指定的缓存配置项 //hulei此处有两种方法 不能重载
     // static GetUserInfo(key: string): string {
     //     let ret = '';
     //     if (key && this._dict.hasOwnProperty(key)) {

ant-design-pro-vue3/src/views/front/platfrom/controls/ControlsHelper/GridHelper.ts

@@ -27,7 +27,7 @@ class GridHelper {
         el.dataset.gridLineBrush = value;
     }
 
-    // 模拟 GridLoaded 方法 TODO 这里Grid.rows 报错 需要重构
+    // 模拟 GridLoaded 方法 hulei 这里Grid.rows 报错 需要重构
     static gridLoaded(grid: HTMLElement) {
         const children = Array.from(grid.children) as HTMLElement[];
         const rowCount = 1;//grid.rows ? grid.rows.length : 1;

ant-design-pro-vue3/src/views/front/platfrom/controls/NumericContainer/CurrencyEditor.ts

@@ -10,7 +10,7 @@ interface CurrencyBase {
     onGotFocus?: (e: FocusEvent) => void;
     onLostFocus?: (e: FocusEvent) => void;
 }
-//TODO这里方法重复了需要处理
+// hulei这里方法重复了需要处理
 // 模拟 CurrencyBase 类
 class CurrencyBase {
     _initTxtLength: number = 0;

ant-design-pro-vue3/src/views/front/platfrom/controls/TableContainer/Menu/MultilevelMenu.ts

@@ -60,7 +60,7 @@ class MultilevelMenu {
     public onOpenItem(callback: (leaf: MultilevelMenuItemLeaf) => void) {
         this.openItemEvent.push(callback);
     }
-    //TODO 后续在处理
+    //hulei 后续在处理
     // internal  raiseOpenItemEvent(leaf: MultilevelMenuItemLeaf) {
     //     this.openItemEvent.forEach(callback => callback(leaf));
     // }

ant-design-pro-vue3/src/views/front/platfrom/controls/TableContainer/Menu/MultilevelMenuItemBase.ts

@@ -35,7 +35,7 @@ export class MultilevelMenuItemBase extends MenuItem {
 
     MultilevelMenu(): MultilevelMenu | null {
         let items: ItemsControl | null = this._parentItemsSource;
-        while (true) {//TODO 这里做了改动
+        while (true) {//hulei 这里做了改动
             // 这里无法完全模拟 ItemsControl.ItemsControlFromItemContainer 的逻辑
             // 简单假设 _parentItemsSource 已经指向上级 ItemsControl
             items = null;

ant-design-pro-vue3/src/views/front/platfrom/controls/TableContainer/Menu/MultilevelMenuItemLeaf.ts

@@ -36,7 +36,7 @@ class MultilevelMenuItemLeaf extends MultilevelMenuItemBase {
     }
 
     OnPreviewMouseLeftButtonDown(e: any) {
-        //TODO缺少方法 原始文件中没有这个方法 这个是微软系统自带的方法需要业务重写
+        //hulei缺少方法 原始文件中没有这个方法 这个是微软系统自带的方法需要业务重写
         //super.OnPreviewMouseLeftButtonDown && super.OnPreviewMouseLeftButtonDown(e);
         this.RaiseRoutedEvent(e.OriginalSource as HTMLElement, MultilevelMenu.MouseLeftClickItemEvent);
     }

ant-design-pro-vue3/src/views/front/platfrom/presentation/FocusCheck/Adorner/FocusAdorner.ts

@@ -38,7 +38,7 @@ class DrawingContext {
 }
 
 class Rect {
-    constructor(public size: { width: number, height: number }) { }//TODO 将height由0改为number
+    constructor(public size: { width: number, height: number }) { }//hulei 将height由0改为number
 
     get TopLeft() { return { x: 0, y: 0 }; }
     get TopRight() { return { x: this.size.width, y: 0 }; }

ant-design-pro-vue3/src/views/front/platfrom/presentation/FocusCheck/FieldPolicy/ShowTipPolicy.ts

@@ -68,7 +68,7 @@ export class ShowTipPolicy implements IFieldPolicy {
 
             element.addEventListener('blur', this.OnLostFocus.bind(this));
 
-            if (element.tagName === 'INPUT') {// && element.type === 'text' TODO报错暂时注掉
+            if (element.tagName === 'INPUT') {// && element.type === 'text' hulei 报错暂时注掉
                 (element as HTMLInputElement).select();
             }
         }

ant-design-pro-vue3/src/views/front/platfrom/presentation/FocusManagers/FocusManager.ts

@@ -5,7 +5,7 @@ import FocusList from "./FocusList";
 interface DependencyObject {
     // 可根据实际情况添加更多属性和方法
 }
-//微软系统框架 需要重新实现TODO
+//微软系统框架 需要重新实现 hulei
 interface FrameworkElement extends DependencyObject {
     // Focus(): boolean;
     // IsEnabled: boolean;
@@ -178,7 +178,7 @@ export default class FocusManager {
             // tmp.Ready -= this._target_Ready.bind(this);
         }
 
-        // this._focusList = FocusList.create(this._target);//TODO FrameworkElement 焦点控制先注释
+        // this._focusList = FocusList.create(this._target);//hulei FrameworkElement 焦点控制先注释
 
         if (!this._focusAdornerLayer) {
             this._focusAdornerLayer = {} as AdornerLayer;
@@ -202,7 +202,7 @@ export default class FocusManager {
         if (this._currentFocusedElement && (getAttachedProperty(this._target, "AutoFocus"))) {
             this.CurrentFocusedElement = this._currentFocusedElement;
         }
-        //TODO  || this._target.IsMouseOver) &&!this._target.IsKeyboardFocusWithin && this._currentFocusedElement.Focus() //TODO 没有FrameworkElement IsMouseOver方法
+        //hulei  || this._target.IsMouseOver) &&!this._target.IsKeyboardFocusWithin && this._currentFocusedElement.Focus() //hulei 没有FrameworkElement IsMouseOver方法
         // if (this._currentFocusedElement &&
         //     this._currentFocusedElement.IsFocused &&
         //     !this.IsEnableFocus(this._currentFocusedElement) &&
@@ -248,7 +248,7 @@ export default class FocusManager {
         } else {
             let targetElement = this._currentFocusedElement;
             if (this._focusList && targetElement) {
-                const index = 100;// this._focusList.IndexOf(targetElement);//TODO
+                const index = 100;// this._focusList.IndexOf(targetElement);//hulei 默认给100
                 switch (navigation) {
                     case FocusNavigation.Top:
                         this.ReSetFocus();

ant-design-pro-vue3/src/views/front/platfrom/presentation/Interfaces/Ipage.ts

@@ -4,10 +4,11 @@ interface Disposable {
 }
 
 // 假设 PageContainer 类型定义
-class PageContainer {}
+class PageContainer { }
 
 // 定义 IPage 接口
 export interface IPage extends Disposable {
+    GetTradeInfoData(): unknown;
     /**
      * 实例化ID
      */
@@ -39,4 +40,4 @@ export interface IPage extends Disposable {
      * 释放资源
      */
     dispose(): void;
-}
+}

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/CommonFunction.ts

@@ -1,9 +1,10 @@
 // 假设 IEntity 接口定义如下
-interface IEntity {
-    ChangeToTable(): string[];
-    ChangeFromTable(parms: any[]): void;
-}
-
+// interface IEntity {
+//     ChangeToTable(): string[];
+//     ChangeFromTable(parms: any[]): void;
+// }
+//IEntity
+import { IEntity } from "@/views/front/platfrom/serviceproxy/ServiceFunction/Interfaces/IEntity"
 class CommonFunction {
     static enqualSign = "&&"; // 行分隔符
     static splitSign = "##"; // 列分隔符
@@ -124,4 +125,4 @@ class CommonFunction {
     }
 }
 
-export default CommonFunction;
+export default CommonFunction;

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/ServiceFunction/MsgHandle/MessageHandle.ts

@@ -263,7 +263,7 @@ class MessageHandle {
                             //     const rowData = Array.from(fields).map(field => field.textContent);
                             //     dataTable.push(rowData);
                             // }
-                            //TODO报错了待解决
+                            // hulei报错了待解决
                         }
                         attachfile.AttachValue = dataTable;
                     }

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/ServiceHelper/FilesHandle.ts

@@ -139,7 +139,7 @@ export default class FilesHandle {
                     let i = 0;
                     for (const tmp of tradeReturn) {
                         tmp.Filedata = new Array(tmp.FiledataLength);
-                        // tmp.Filedata.set(tmpresult[1].AttachValue.slice(i, i + tmp.FiledataLength));TODO
+                        // tmp.Filedata.set(tmpresult[1].AttachValue.slice(i, i + tmp.FiledataLength));hulei 报错
                         i += tmp.FiledataLength;
                     }
                 }
@@ -164,7 +164,7 @@ export default class FilesHandle {
             if (tmpresult && tmpresult.length === 1) {
                 const serverMd5 = tmpresult[0].AttachValue as string;
                 const fileInfo = new FileHandle();
-                const localMd5 = "";// fileInfo.GetFileMD5(localFilePath);//微软自带的fileInfo TODO
+                const localMd5 = "";// fileInfo.GetFileMD5(localFilePath);//微软自带的fileInfo hulei
                 result = localMd5.toUpperCase() === serverMd5.toUpperCase();
             }
         } catch (e) {
@@ -188,7 +188,7 @@ export default class FilesHandle {
             if (localFile) {
                 const files = await this.GetUsedFilesInfo(`/${PlatformSettings.PagesDirectory}`, fileName, '1');
                 if (files.length === 1) {
-                    const localMd5 = "";// localFile.GetFileMD5(localFilePath);////微软自带的fileInfo TODO
+                    const localMd5 = "";// localFile.GetFileMD5(localFilePath);////微软自带的fileInfo hulei
                     const serverMd5 = files[0].Md5;
                     if (localMd5.toUpperCase() === serverMd5.toUpperCase()) {
                         this.UpdateAssemblys[actionName] = false;
@@ -202,7 +202,7 @@ export default class FilesHandle {
 
             const data = await this.GetDllFile(fileName, `/${PlatformSettings.PagesDirectory}`);
             if (data) {
-                result = true;// localFile.SaveFile(localFilePath, data, false);//localFile TODO
+                result = true;// localFile.SaveFile(localFilePath, data, false);//localFile hulei报错了
                 this.UpdateAssemblys[actionName] = true;
             }
         } catch (e) {
@@ -326,7 +326,7 @@ export default class FilesHandle {
                 while (offset < len) {
                     const lens = len - offset > size ? size : len - offset;
                     const result = await this.GetFileBlock(serverFilePath, offset, lens);
-                    //tradeReturn.set(result, offset);TODO
+                    //tradeReturn.set(result, offset);hulei 报错了
                     offset += size;
                 }
             }

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/ServiceHelper/InitializeHandle.ts

@@ -6,7 +6,7 @@ import FilesHandle from '../ServiceHelper/FilesHandle'
 
 //import { CommonParames, TradeParames } from '../../Common/RunningParameters/CommonParames';
 
-// 假设这些类型和方法在其他文件中定义 TODO 
+// 假设这些类型和方法在其他文件中定义 hulei 
 // interface TransitEntity {
 //     ServiceName: string;
 //     FuncName: string;
@@ -37,7 +37,7 @@ namespace TradeParames {
 export class InitializeHandle {
     static async InitMsgFormat() {
         if (!TradeParames.MsgFormat) {
-            // TradeParames.MsgFormat = await this.GetMessageFormatMap();//TODO
+            // TradeParames.MsgFormat = await this.GetMessageFormatMap();//hulei
         }
     }
 

ant-design-pro-vue3/src/views/front/platfrom/serviceproxy/ServiceHelper/TradeHandle.ts

@@ -3,15 +3,15 @@ import axios from 'axios';
 // 假设这些类型在其他文件中定义
 type Transit = string;
 type AttachFile = {
-  AttachIndex: string;
-  AttachType: string;
-  AttachValue: any;
+    AttachIndex: string;
+    AttachType: string;
+    AttachValue: any;
 };
 type TransitEntity = {
-  ServiceName: string;
-  FuncName: string;
-  Parameters: { [key: string]: string };
-  AttachFiles: AttachFile[];
+    ServiceName: string;
+    FuncName: string;
+    Parameters: { [key: string]: string };
+    AttachFiles: AttachFile[];
 };
 type TradeInfo = any;
 type IsAuthResult = any;
@@ -19,355 +19,355 @@ type AuthResult = any;
 type AuthCondInf = any;
 
 // 假设 ServiceManager 封装了 HTTP 请求逻辑
-class ServiceManager {
-  private static instance: ServiceManager;
+export default class ServiceManager {
+    private static instance: ServiceManager;
 
-  private constructor() {}
+    private constructor() { }
 
-  public static GetInstance(): ServiceManager {
-    if (!this.instance) {
-      this.instance = new ServiceManager();
+    public static GetInstance(): ServiceManager {
+        if (!this.instance) {
+            this.instance = new ServiceManager();
+        }
+        return this.instance;
     }
-    return this.instance;
-  }
 
-  public async Commit(entity: TransitEntity): Promise<AttachFile[]> {
-    try {
-      const response = await axios.post('/api/service', entity);
-      return response.data as AttachFile[];
-    } catch (error) {
-      throw error;
+    public async Commit(entity: TransitEntity): Promise<AttachFile[]> {
+        try {
+            const response = await axios.post('/api/service', entity);
+            return response.data as AttachFile[];
+        } catch (error) {
+            throw error;
+        }
     }
-  }
 }
 
 // 假设这些常量和函数在其他文件中定义
 const CommonParames = {
-  TempFilePath: '',
-  Coding: 'utf-8'
+    TempFilePath: '',
+    Coding: 'utf-8'
 };
 const FilesHandle = {
-  GetFileData: async (filePath: string): Promise<Uint8Array> => {
-    try {
-      const response = await axios.get(filePath, { responseType: 'arraybuffer' });
-      return new Uint8Array(response.data);
-    } catch (error) {
-      throw error;
+    GetFileData: async (filePath: string): Promise<Uint8Array> => {
+        try {
+            const response = await axios.get(filePath, { responseType: 'arraybuffer' });
+            return new Uint8Array(response.data);
+        } catch (error) {
+            throw error;
+        }
     }
-  }
 };
 const CommonFunction = {
-  ChangeEntityTable: <TIn, TOut>(input: TIn): TOut => {
-    // 这里需要根据实际逻辑实现转换
-    return {} as TOut;
-  },
-  ChangStrToArray: (str: string): string[] => {
-    return str.split(',');
-  }
+    ChangeEntityTable: <TIn, TOut>(input: TIn): TOut => {
+        // 这里需要根据实际逻辑实现转换
+        return {} as TOut;
+    },
+    ChangStrToArray: (str: string): string[] => {
+        return str.split(',');
+    }
 };
 
 export class TradeHandle {
-  public static async DoTrade(
-    transit: Transit,
-    integrateData: Uint8Array,
-    kinBrno: string,
-    fileName: string,
-    fileFlag: boolean,
-    args: any[]
-  ): Promise<Uint8Array | null> {
-    let result: Uint8Array | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'DoTradeByTransit',
-        Parameters: {
-          '1': transit.toString(),
-          '3': kinBrno,
-          '4': fileName,
-          '5': fileFlag.toString(),
-          '6': ''
-        },
-        AttachFiles: []
-      };
-      const data: AttachFile = {
-        AttachIndex: '2',
-        AttachType: 'ByteType',
-        AttachValue: integrateData
-      };
-      entity.AttachFiles.push(data);
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = tmpresult[0].AttachValue as Uint8Array;
-      }
-    } catch (error) {
-      throw error;
+    public static async DoTrade(
+        transit: Transit,
+        integrateData: Uint8Array,
+        kinBrno: string,
+        fileName: string,
+        fileFlag: boolean,
+        args: any[]
+    ): Promise<Uint8Array | null> {
+        let result: Uint8Array | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'DoTradeByTransit',
+                Parameters: {
+                    '1': transit.toString(),
+                    '3': kinBrno,
+                    '4': fileName,
+                    '5': fileFlag.toString(),
+                    '6': ''
+                },
+                AttachFiles: []
+            };
+            const data: AttachFile = {
+                AttachIndex: '2',
+                AttachType: 'ByteType',
+                AttachValue: integrateData
+            };
+            entity.AttachFiles.push(data);
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = tmpresult[0].AttachValue as Uint8Array;
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async GetTradeFile(fileName: string): Promise<Uint8Array | null> {
-    const filePath = CommonParames.TempFilePath + fileName + 'dhcc';
-    try {
-      return await FilesHandle.GetFileData(filePath);
-    } catch (error) {
-      throw error;
+    public static async GetTradeFile(fileName: string): Promise<Uint8Array | null> {
+        const filePath = CommonParames.TempFilePath + fileName + 'dhcc';
+        try {
+            return await FilesHandle.GetFileData(filePath);
+        } catch (error) {
+            throw error;
+        }
     }
-  }
 
-  public static async ClearvFile(fileName: string): Promise<boolean> {
-    const vfileName = CommonParames.TempFilePath + fileName;
-    let result = false;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'UtilService',
-        FuncName: 'SaveFile',
-        Parameters: {
-          '1': fileName,
-          '3': false.toString()
-        },
-        AttachFiles: []
-      };
-      const data: AttachFile = {
-        AttachIndex: '2',
-        AttachType: 'ByteType',
-        AttachValue: new Uint8Array()
-      };
-      entity.AttachFiles.push(data);
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = Boolean(tmpresult[0].AttachValue);
-      }
-    } catch (error) {
-      throw error;
+    public static async ClearvFile(fileName: string): Promise<boolean> {
+        const vfileName = CommonParames.TempFilePath + fileName;
+        let result = false;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'UtilService',
+                FuncName: 'SaveFile',
+                Parameters: {
+                    '1': fileName,
+                    '3': false.toString()
+                },
+                AttachFiles: []
+            };
+            const data: AttachFile = {
+                AttachIndex: '2',
+                AttachType: 'ByteType',
+                AttachValue: new Uint8Array()
+            };
+            entity.AttachFiles.push(data);
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = Boolean(tmpresult[0].AttachValue);
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async Addvfile(fileName: string, fileContent: string): Promise<boolean> {
-    const vfileName = CommonParames.TempFilePath + fileName;
-    const data = new TextEncoder().encode(fileContent);
-    let result = false;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'UtilService',
-        FuncName: 'SaveFile',
-        Parameters: {
-          '1': vfileName,
-          '3': true.toString()
-        },
-        AttachFiles: []
-      };
-      const attachdata: AttachFile = {
-        AttachIndex: '2',
-        AttachType: 'ByteType',
-        AttachValue: data
-      };
-      entity.AttachFiles.push(attachdata);
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = Boolean(tmpresult[0].AttachValue);
-      }
-    } catch (error) {
-      throw error;
+    public static async Addvfile(fileName: string, fileContent: string): Promise<boolean> {
+        const vfileName = CommonParames.TempFilePath + fileName;
+        const data = new TextEncoder().encode(fileContent);
+        let result = false;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'UtilService',
+                FuncName: 'SaveFile',
+                Parameters: {
+                    '1': vfileName,
+                    '3': true.toString()
+                },
+                AttachFiles: []
+            };
+            const attachdata: AttachFile = {
+                AttachIndex: '2',
+                AttachType: 'ByteType',
+                AttachValue: data
+            };
+            entity.AttachFiles.push(attachdata);
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = Boolean(tmpresult[0].AttachValue);
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async CheckAuth(inf: TradeInfo): Promise<IsAuthResult | null> {
-    let result: IsAuthResult | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'CheckAuth',
-        Parameters: {},
-        AttachFiles: []
-      };
-      const data: AttachFile = {
-        AttachIndex: '1',
-        AttachType: 'TableType',
-        AttachValue: CommonFunction.ChangeEntityTable<TradeInfo[], any>([inf])
-      };
-      entity.AttachFiles.push(data);
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        const rmpresult = CommonFunction.ChangeEntityTable<any, IsAuthResult[]>(
-          tmpresult[0].AttachValue as any
-        );
-        result = rmpresult[0];
-      }
-    } catch (error) {
-      throw error;
+    public static async CheckAuth(inf: TradeInfo): Promise<IsAuthResult | null> {
+        let result: IsAuthResult | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'CheckAuth',
+                Parameters: {},
+                AttachFiles: []
+            };
+            const data: AttachFile = {
+                AttachIndex: '1',
+                AttachType: 'TableType',
+                AttachValue: CommonFunction.ChangeEntityTable<TradeInfo[], any>([inf])
+            };
+            entity.AttachFiles.push(data);
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                const rmpresult = CommonFunction.ChangeEntityTable<any, IsAuthResult[]>(
+                    tmpresult[0].AttachValue as any
+                );
+                result = rmpresult[0];
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async DoAuthByAuthno(authno: string): Promise<AuthResult | null> {
-    let result: AuthResult | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'DoAuthByAuthno',
-        Parameters: {
-          '1': authno
-        },
-        AttachFiles: []
-      };
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        const rmpresult = CommonFunction.ChangeEntityTable<any, AuthResult[]>(
-          tmpresult[0].AttachValue as any
-        );
-        result = rmpresult[0];
-      }
-    } catch (error) {
-      throw error;
+    public static async DoAuthByAuthno(authno: string): Promise<AuthResult | null> {
+        let result: AuthResult | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'DoAuthByAuthno',
+                Parameters: {
+                    '1': authno
+                },
+                AttachFiles: []
+            };
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                const rmpresult = CommonFunction.ChangeEntityTable<any, AuthResult[]>(
+                    tmpresult[0].AttachValue as any
+                );
+                result = rmpresult[0];
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async DoAuthByAuth(
-    auth: string,
-    pwd: string,
-    lvl: string | null,
-    records: string
-  ): Promise<AuthResult | null> {
-    let result: AuthResult | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'DoAuthByAuth',
-        Parameters: {
-          '1': auth,
-          '2': pwd,
-          '3': lvl || '',
-          '4': records
-        },
-        AttachFiles: []
-      };
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        const rmpresult = CommonFunction.ChangeEntityTable<any, AuthResult[]>(
-          tmpresult[0].AttachValue as any
-        );
-        result = rmpresult[0];
-      }
-    } catch (error) {
-      throw error;
+    public static async DoAuthByAuth(
+        auth: string,
+        pwd: string,
+        lvl: string | null,
+        records: string
+    ): Promise<AuthResult | null> {
+        let result: AuthResult | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'DoAuthByAuth',
+                Parameters: {
+                    '1': auth,
+                    '2': pwd,
+                    '3': lvl || '',
+                    '4': records
+                },
+                AttachFiles: []
+            };
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                const rmpresult = CommonFunction.ChangeEntityTable<any, AuthResult[]>(
+                    tmpresult[0].AttachValue as any
+                );
+                result = rmpresult[0];
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async CheckAuthBytxno(txno: string): Promise<number> {
-    let result = 0;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'CheckAuthBytxno',
-        Parameters: {
-          '1': txno
-        },
-        AttachFiles: []
-      };
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = Number(tmpresult[0].AttachValue);
-      }
-    } catch (error) {
-      throw error;
+    public static async CheckAuthBytxno(txno: string): Promise<number> {
+        let result = 0;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'CheckAuthBytxno',
+                Parameters: {
+                    '1': txno
+                },
+                AttachFiles: []
+            };
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = Number(tmpresult[0].AttachValue);
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async Getuserlvl(txno: string): Promise<string | null> {
-    let result: string | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'Getuserlvl',
-        Parameters: {
-          '1': txno
-        },
-        AttachFiles: []
-      };
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = tmpresult[0].AttachValue as string;
-      }
-    } catch (error) {
-      throw error;
+    public static async Getuserlvl(txno: string): Promise<string | null> {
+        let result: string | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'Getuserlvl',
+                Parameters: {
+                    '1': txno
+                },
+                AttachFiles: []
+            };
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = tmpresult[0].AttachValue as string;
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async AddAuthCond(
-    txcode: string,
-    authcondinf: AuthCondInf[]
-  ): Promise<boolean> {
-    let result = false;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'AddAuthCond',
-        Parameters: {
-          '1': txcode
-        },
-        AttachFiles: []
-      };
-      const data: AttachFile = {
-        AttachIndex: '2',
-        AttachType: 'TableType',
-        AttachValue: CommonFunction.ChangeEntityTable<AuthCondInf[], any>(authcondinf)
-      };
-      entity.AttachFiles.push(data);
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = Boolean(tmpresult[0].AttachValue);
-      }
-    } catch (error) {
-      throw error;
+    public static async AddAuthCond(
+        txcode: string,
+        authcondinf: AuthCondInf[]
+    ): Promise<boolean> {
+        let result = false;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'AddAuthCond',
+                Parameters: {
+                    '1': txcode
+                },
+                AttachFiles: []
+            };
+            const data: AttachFile = {
+                AttachIndex: '2',
+                AttachType: 'TableType',
+                AttachValue: CommonFunction.ChangeEntityTable<AuthCondInf[], any>(authcondinf)
+            };
+            entity.AttachFiles.push(data);
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = Boolean(tmpresult[0].AttachValue);
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async GetAuthCondByTradecode(txcode: string): Promise<AuthCondInf[] | null> {
-    let result: AuthCondInf[] | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'GetAuthCondByTradecode',
-        Parameters: {
-          '1': txcode
-        },
-        AttachFiles: []
-      };
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = CommonFunction.ChangeEntityTable<any, AuthCondInf[]>(
-          tmpresult[0].AttachValue as any
-        );
-      }
-    } catch (error) {
-      throw error;
+    public static async GetAuthCondByTradecode(txcode: string): Promise<AuthCondInf[] | null> {
+        let result: AuthCondInf[] | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'GetAuthCondByTradecode',
+                Parameters: {
+                    '1': txcode
+                },
+                AttachFiles: []
+            };
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = CommonFunction.ChangeEntityTable<any, AuthCondInf[]>(
+                    tmpresult[0].AttachValue as any
+                );
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
 
-  public static async GetAuthLvls(): Promise<string[] | null> {
-    let result: string[] | null = null;
-    try {
-      const entity: TransitEntity = {
-        ServiceName: 'TradeService',
-        FuncName: 'GetAuthLvls',
-        Parameters: {},
-        AttachFiles: []
-      };
-      const tmpresult = await ServiceManager.GetInstance().Commit(entity);
-      if (tmpresult && tmpresult.length === 1) {
-        result = CommonFunction.ChangStrToArray(tmpresult[0].AttachValue as string);
-      }
-    } catch (error) {
-      throw error;
+    public static async GetAuthLvls(): Promise<string[] | null> {
+        let result: string[] | null = null;
+        try {
+            const entity: TransitEntity = {
+                ServiceName: 'TradeService',
+                FuncName: 'GetAuthLvls',
+                Parameters: {},
+                AttachFiles: []
+            };
+            const tmpresult = await ServiceManager.GetInstance().Commit(entity);
+            if (tmpresult && tmpresult.length === 1) {
+                result = CommonFunction.ChangStrToArray(tmpresult[0].AttachValue as string);
+            }
+        } catch (error) {
+            throw error;
+        }
+        return result;
     }
-    return result;
-  }
-}
+}

ant-design-pro-vue3/src/views/front/serviceManager/TradeHandle.ts

@@ -1,283 +0,0 @@
-import { ref } from 'vue'
-import { message } from 'ant-design-vue'
-//import { ServiceManager } from './ServiceManager'
-//import { TransitEntity, AttachFile } from './ServiceEntitys'
-//import { Platform } from './Platform'
-
-export enum Transit {
-    CallServer = 'CallServer',
-    CallAgn = 'CallAgn',
-    CallTips = 'CallTips',
-    CallAgnPay = 'CallAgnPay',
-    CallAgnTIPS = 'CallAgnTIPS',
-    CallAgnSecdistruct = 'CallAgnSecdistruct',
-    CallAgnMobileBanking = 'CallAgnMobileBanking'
-}
-
-export class TradeHandle {
-    /**
-     * 获取8583域定义
-     */
-    static async GetFdItemMap(type: string): Promise<any> {
-        const table = {
-            Code: '',
-            Type: '',
-            Length: '',
-            DotLength: '',
-            Description: '',
-            FieldType: '',
-            MaxLength: ''
-        }
-
-        const entity = new TransitEntity()
-        entity.ServiceName = 'TradeService'
-        entity.FuncName = 'GetFdItemMap'
-        entity.Parameters = { '1': type }
-
-        const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-        let data = null
-        if (tmpresult && tmpresult.length === 1) {
-            data = tmpresult[0].AttachValue as string
-        }
-
-        if (data) {
-            const lines = data.split('\n')
-            return lines.map(line => {
-                const rows = line.split('|')
-                return {
-                    ...table,
-                    Code: rows[0],
-                    Type: rows[1],
-                    Length: rows[2],
-                    DotLength: rows[3],
-                    Description: rows[4],
-                    FieldType: rows[5],
-                    MaxLength: rows[6]
-                }
-            })
-        }
-        return []
-    }
-
-    /**
-     * 按照参数指示与外端进行通讯交互
-     */
-    static async DoTrade(
-        transit: string,
-        integrateData: Uint8Array,
-        kinBrno: string,
-        fileName: string,
-        fileData: Uint8Array,
-        args: any[],
-        serialNo: string
-    ): Promise<Uint8Array[]> {
-        const result: Uint8Array[] = []
-        try {
-            const entity = new TransitEntity()
-            entity.ServiceName = 'TradeService'
-            entity.FuncName = 'DoTradeByTransit'
-            entity.Parameters = {
-                '1': transit,
-                '3': kinBrno,
-                '4': fileName,
-                '6': '',
-                '7': serialNo
-            }
-
-            const data = new AttachFile()
-            data.AttachIndex = '2'
-            data.AttachType = 'ByteType'
-            data.AttachValue = integrateData
-            entity.AttachFiles.push(data)
-
-            const data1 = new AttachFile()
-            data1.AttachIndex = '5'
-            data1.AttachType = 'ByteType'
-            data1.AttachValue = fileData
-            entity.AttachFiles.push(data1)
-
-            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-            if (tmpresult) {
-                tmpresult.forEach(attachFile => {
-                    result.push(attachFile.AttachValue as Uint8Array)
-                })
-            }
-        } catch (e) {
-            throw e
-        }
-        return result
-    }
-
-    /**
-     * 获取交易返回的附件信息数据
-     */
-    static async GetTradeFile(fileName: string): Promise<Uint8Array> {
-        const filePath = ServiceSettings.TempFilePath + fileName + 'dhcc'
-        return FilesHandle.GetFileData(filePath)
-    }
-
-    /**
-     * 清空交易附件信息
-     */
-    static async ClearvFile(fileName: string): Promise<boolean> {
-        let result = false
-        try {
-            const entity = new TransitEntity()
-            entity.ServiceName = 'UtilService'
-            entity.FuncName = 'SaveFile'
-            entity.Parameters = {
-                '1': fileName,
-                '3': 'false'
-            }
-
-            const data = new AttachFile()
-            data.AttachIndex = '2'
-            data.AttachType = 'ByteType'
-            data.AttachValue = new Uint8Array(0)
-            entity.AttachFiles.push(data)
-
-            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-            if (tmpresult && tmpresult.length === 1) {
-                result = tmpresult[0].AttachValue as boolean
-            }
-        } catch (e) {
-            throw e
-        }
-        return result
-    }
-
-    /**
-     * 检查交易
-     */
-    static async Check(inf: CheckInfo): Promise<CheckResult | null> {
-        let result: CheckResult | null = null
-        try {
-            const entity = new TransitEntity()
-            entity.ServiceName = 'TradeService'
-            entity.FuncName = 'Check'
-
-            const data = new AttachFile()
-            data.AttachIndex = '1'
-            data.AttachType = 'TableType'
-            data.AttachValue = Platform.CommonFunction.ChangeEntityToTable([inf])
-            entity.AttachFiles.push(data)
-
-            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-            if (tmpresult && tmpresult.length === 1) {
-                const rmpresult = Platform.CommonFunction.ChangeTableToEntitys<CheckResult>(
-                    tmpresult[0].AttachValue as DataTable
-                )
-                if (rmpresult.length > 0) {
-                    result = rmpresult[0]
-                }
-            }
-        } catch (e) {
-            throw e
-        }
-        return result
-    }
-
-    /**
-     * 复核操作
-     */
-    static async Super(
-        serialId: string,
-        SuperId: string,
-        taskid: string,
-        stat: number,
-        TellerNo: string,
-        tradedata: Record<string, string>,
-        pagedata: Uint8Array,
-        refuseReason: string
-    ): Promise<boolean> {
-        let result = false
-        try {
-            const entity = new TransitEntity()
-            entity.ServiceName = 'TradeService'
-            entity.FuncName = 'Super'
-            entity.Parameters = {
-                '1': serialId,
-                '2': SuperId,
-                '3': taskid,
-                '4': stat.toString(),
-                '5': TellerNo,
-                '6': Platform.CommonFunction.ChangeDicToStr(tradedata),
-                '8': refuseReason
-            }
-
-            const data = new AttachFile()
-            data.AttachIndex = '7'
-            data.AttachType = 'ByteType'
-            data.AttachValue = pagedata
-            entity.AttachFiles.push(data)
-
-            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-            if (tmpresult && tmpresult.length === 1) {
-                result = tmpresult[0].AttachValue as boolean
-            }
-        } catch (e) {
-            throw e
-        }
-        return result
-    }
-
-    /**
-     * 授权验证操作
-     */
-    static async DoAuth(auth: string, pwd: string, lvl: string | null): Promise<AuthResult | null> {
-        let result: AuthResult | null = null
-        try {
-            const entity = new TransitEntity()
-            entity.ServiceName = 'TradeService'
-            entity.FuncName = 'DoAuth'
-            entity.Parameters = {
-                '1': auth,
-                '2': pwd,
-                '3': lvl || ''
-            }
-
-            const tmpresult = await ServiceManager.GetInstance().Commit(entity)
-            if (tmpresult && tmpresult.length === 1) {
-                const rmpresult = Platform.CommonFunction.ChangeTableToEntitys<AuthResult>(
-                    tmpresult[0].AttachValue as DataTable
-                )
-                if (rmpresult.length > 0) {
-                    result = rmpresult[0]
-                }
-            }
-        } catch (e) {
-            throw e
-        }
-        return result
-    }
-}
-
-interface CheckInfo {
-    // ... 检查信息字段
-}
-
-interface CheckResult {
-    // ... 检查结果字段
-}
-
-interface AuthResult {
-    // ... 授权结果字段
-}
-
-interface AskSuperInfo {
-    // ... 申请复核信息字段
-}
-
-interface AskAuthInfo {
-    // ... 申请授权信息字段
-}
-
-interface PageData {
-    datas: Uint8Array
-    dataslength: number
-    // ... 其他字段
-}
-
-interface AuthTransRecords {
-    // ... 授权交易记录字段
-}