调整报错逻辑

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

@@ -1,6 +1,6 @@
 import { ref, reactive } from 'vue'
 //import { PlatformSettings } from '../../platfrom/common/RunningParameters/PlatformSettings'
-//import { PlatformLogger } from './PlatformLogger'
+import PlatformLogger from "@/views/front/platfrom/common/LogSystem/PlatformLogger";
 //import { BitMapInstance } from './BitMapInstance'
 import { MsgBitMap } from '../../develop/Communication/MessageHelper/MsgBitMap'
 import { TransitType } from './MessageHelper/TransitType'
@@ -24,6 +24,13 @@ export enum BitMap {
 }
 export default class Message {
 
+    static cconv(fileData: string): string {
+        throw new Error("Method not implemented.");
+    }
+    integrateFd(bitMapByte: Uint8Array<ArrayBuffer>): Uint8Array<ArrayBufferLike> {
+        throw new Error("Method not implemented.");
+    }
+
     InitGateway2CBS(txCode: string, arg1: string, arg2: string, predicate2retCode: (code: string) => boolean) {
         throw new Error("Method not implemented.")
     }
@@ -46,10 +53,11 @@ export default class Message {
             this.Init(type);
         }
     }
+
     // 交易附件数据
     private _fileData = ref<string>('')
-    private _filename = ref<string>('')
-    private _fdDict = reactive<Record<string, Uint8Array>>({})
+    public _filename = ref<string>('')
+    private _fdDict: Record<string, string>
     private _BigFds_: Record<string, any> = {}
     BitMapType: BitMap
     static BitMap: any
@@ -101,7 +109,7 @@ export default class Message {
         let result = ''
         if (this._fdDict[fdName]) {
             const decoder = new TextDecoder()
-            //result = BitMapInstance.FdBitMap[fdName].RealValue(decoder.decode(this._fdDict[fdName])) //hulei先注销
+            //result = this.BitMapInstance.FdBitMap[fdName].RealValue(decoder.decode(this._fdDict[fdName])) //hulei先注销
         }
         return result
     }
@@ -139,7 +147,7 @@ export default class Message {
             // }
         }
     }
-    //private MsgBitMap BitMapInstance(BitMapType) {
+
     // private BitMapInstance(BitMapType: any): MsgBitMap {
     //     switch (BitMapType) {
     //         case BitMap.Server:
@@ -153,7 +161,7 @@ export default class Message {
     //     }
 
     // }
-    private BitMapInstance(BitMapType): MsgBitMap {
+    private static BitMapInstance(): MsgBitMap {
         switch (BitMapType) {
             case BitMap.Server:
                 return MsgBitMap.Instance_Server;
@@ -185,12 +193,12 @@ export default class Message {
     */
     public Init(type?: BitMap): void {
         if (type === undefined) {
-            // _fdDict.Clear();
-            // _fileData = string.Empty;
+            this._fdDict.Clear();
+            this._fileData = string.Empty;
             // //TransitNode = TransitType.CallServer; //初始化默认为CallServer
             // //BitMapType = type;
-            // CustomizeTransitEntry = null;
-            // Extra = new Dictionary<string, object>();
+            this.CustomizeTransitEntry = null;
+            Extra = new Dictionary<string, object>();
         } else {
             // this._fdDict = {};
             // this._fileData = '';
@@ -468,4 +476,129 @@ export default class Message {
     }
     // 实现剩余所有域...
     // 按照相同模式实现Fd21到Fd47的所有域
+
+
+
+    public static anilyzeFd(msgData: Uint8Array): boolean {
+        // 拆解位图，报文数据区格式为 5位报文类型+8/16位位图区域+有效数据区
+        // 标志位，是否采用128位位图
+        const isBitmap128 = msgData[5].toString(2).padStart(8, '0').startsWith('1');
+        let bitMap = '';
+        const msgBit = new Uint8Array(isBitmap128 ? 16 : 8);
+        msgBit.set(msgData.slice(5, 5 + msgBit.length));
+        // 扩展16位字符串转换为128位01格式的位图字符串
+        for (const bytes of msgBit) {
+            bitMap += bytes.toString(2).padStart(8, '0');
+        }
+        // 拆解数据部分
+        const startIndex = 5 + (isBitmap128 ? 16 : 8);
+        const data = new Uint8Array(msgData.length - startIndex);
+        data.set(msgData.slice(startIndex));
+        let curPosition = 0;
+        // 日志内容
+        const logInfo: string[] = [];
+        logInfo.push("解包数据:");
+        logInfo.push(`解包位图:[${bitMap}]`);
+        try {
+            // 循环解包
+            for (let i = 0; i < bitMap.length; i++) {
+                if (bitMap[i] === '1') {
+                    // 第一位为标志位
+                    if (i + 1 === 1) {
+                        continue;
+                    }
+                    const fdName = (i + 1).toString().padStart(3, '0') + "0";
+                    if (!this.BitMapInstance.FdBitMap[fdName]) {
+                        continue;
+                    }
+                    // 先清理组包数据,否则解析子域会产生数据交错
+                    clearFd(i + 1);
+                    const item = this.BitMapInstance.FdBitMap[fdName];
+                    let tmp: Uint8Array | null = null;
+                    switch (item.FieldType) {
+                        case "-1":
+                            break;
+                        case "0":
+                            // 定长域
+                            tmp = new Uint8Array(item.Length);
+                            // 截取数据区域，判定新位置
+                            tmp.set(data.slice(curPosition, curPosition + item.Length));
+                            curPosition += item.Length;
+                            break;
+                        default:
+                            // 变长域
+                            // 获取数据长度
+                            const len = parseInt(item.FieldType, 10);
+                            tmp = new Uint8Array(len);
+                            tmp.set(data.slice(curPosition, curPosition + len));
+                            curPosition += len;
+                            // 获取数据部分
+                            const length = parseInt(encodingToString(tmp), 10);
+                            tmp = new Uint8Array(length);
+                            tmp.set(data.slice(curPosition, curPosition + length));
+                            curPosition += length;
+                            break;
+                    }
+                    if (!tmp) continue;
+                    // 记录日志
+                    const value = encodingToString(tmp);
+                    logInfo.push(`第${(i + 1).toString().padStart(3, '0')}域:[${value}]`);
+                    if (!item.Children || item.Children.length === 0) {
+                        // // 生僻字处理，字符类型FD需要检查
+                        // if ("056".includes(item.Type) && hasCconvKey(value)) {
+                        //     const val = item.RealValue ? item.RealValue(value) : value;
+                        //     const newVal = item.FormatValue ? item.FormatValue(cconv(val as string, false)) : val;
+                        //     tmp = encodingGetBytes(newVal);
+                        // }//hulei 生僻字处理暂时放弃
+                        if (fdDict.hasOwnProperty(item.Code)) {
+                            fdDict[item.Code] = tmp;
+                        } else {
+                            fdDict[item.Code] = tmp;
+                        }
+                    } else {
+                        // 循环给子域赋值，子域暂时只存在定长域
+                        let index = 0;
+                        for (const child of item.Children) {
+                            if (index >= tmp.length) break;
+                            // 子域为定长
+                            const childLen = Math.min(index + child.Length, tmp.length) - index;
+                            const childData = new Uint8Array(childLen);
+                            childData.set(tmp.slice(index, index + childLen));
+                            index += childData.length;
+                            const chindValue = encodingToString(childData);
+                            // // 生僻字处理，字符类型FD需要检查
+                            // if ("056".includes(child.Type) && hasCconvKey(chindValue)) {
+                            //     const val = child.RealValue ? child.RealValue(chindValue) : chindValue;
+                            //     const newVal = child.FormatValue ? child.FormatValue(cconv(val as string, false)) : val;
+                            //     childData = encodingGetBytes(newVal);
+                            // }hulei 生僻字处理暂时放弃
+                            if (fdDict.hasOwnProperty(child.Code)) {
+                                fdDict[child.Code] = childData;
+                            } else {
+                                fdDict[child.Code] = childData;
+                            }
+                        }
+                    }
+                }
+            }
+            // 解包完成后将解析数据写入交易日志文件
+            communicationInfo(logInfo.join('\n'));
+            return true;
+        } catch (e) {
+            // 解包失败
+            logInfo.push(`解包出错:${(e as Error).message}`);
+            communicationInfo(logInfo.join('\n'));
+            return false;
+        }
+    }
+}
+function clearFd(arg0: number) {
+    throw new Error('Function not implemented.');
+}
+
+function encodingToString(tmp: Uint8Array<ArrayBufferLike>): string {
+    throw new Error('Function not implemented.');
+}
+function communicationInfo(arg0: string) {
+    throw new Error('Function not implemented.');
 }

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

@@ -1,10 +1,10 @@
-import { Message } from './Message'
+import Message from "@/views/front/develop/Communication/Message";
 import { PackageType } from './PackageType'
 import { TransitType } from './TransitType'
 import { MsgPackage } from './MsgPackage'
 import { BitMapInstance } from './BitMapInstance'
 import { PlatformSettings } from './PlatformSettings'
-import { PlatformLogger } from './PlatformLogger'
+import PlatformLogger from "@/views/front/platfrom/common/LogSystem/PlatformLogger";
 
 /**
  * Message的扩展方法集合
@@ -25,7 +25,7 @@ export class MessageExtension {
             default:
                 break
         }
-        
+
         if (message.CustomizeTransitEntry) {
             return message.CustomizeTransitEntry.process(message, packageType)
         }
@@ -45,7 +45,7 @@ export class MessageExtension {
     public static serializeForAuth(message: Message): string {
         const ret: Record<string, string> = {}
         const empty: string[] = []
-        
+
         for (const fd of Object.values(BitMapInstance.FdBitMap)) {
             const type = fd.getItemType()
             const key = fd.Code
@@ -79,13 +79,13 @@ export class MessageExtension {
      */
     public static getMsgBitMapTypes(message: Message): Record<string, string> {
         const result: Record<string, string> = {}
-        
+
         for (const item of Object.values(BitMapInstance.FdBitMap)) {
             const type = item.getItemType()
             const value = type === String ? '1' : '0'
             result[`FD${item.Code}`] = value
         }
-        
+
         return result
     }
 
@@ -96,11 +96,11 @@ export class MessageExtension {
         const msg = new Message()
         const packageType = PackageType[type as keyof typeof PackageType]
         const packageInstance = MsgPackage.packageList[packageType]
-        
+
         const totalData = new Uint8Array(returnData.length + fileData.length)
         totalData.set(returnData, 0)
         totalData.set(fileData, returnData.length)
-        
+
         const success = packageInstance.analyze(msg, totalData)
         return { success, msg }
     }
@@ -111,4 +111,4 @@ class MsgJson {
     code: string = ''
     type: string = ''
     values: string = ''
-}
+}

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

@@ -88,7 +88,7 @@ export class MsgBitMap {
     private static _instance_Agn: MsgBitMap
     private static _instance_Cnaps2: MsgBitMap
 
-    FdBitMap: Record<string, FdItem> = {}
+    public static FdBitMap: Record<string, FdItem> = {}
 
     private constructor() { }
 

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

@@ -1,4 +1,4 @@
-import { Message } from './Message'
+import Message from "@/views/front/develop/Communication/Message";
 
 /**
  * 报文打包解包接口
@@ -18,4 +18,4 @@ export interface IPackage {
      * @returns 是否解包成功
      */
     analyze(msg: Message, data: Uint8Array): boolean;
-}
+}

ant-design-pro-vue3/src/views/front/develop/Communication/Package/Msg858301.cs

@@ -1,423 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Platform.Common;
-using Platform.Common.RunningParameters;
-using Platform.Common.LogSystem;
-
-namespace TellerSystem.Communication.Package
-{
-    /// <summary>
-    /// 8583 128域类型报文，Tcp通讯方式的组包，解包处理。承德渠道
-    /// </summary>
-    class Msg858301 : IPackage
-    {
-        //定义静态实例
-        public static Msg858301 Instance;
-        /// <summary>
-        ///静态实例初始化函数
-        /// </summary>
-        static public Msg858301 GetInstance()
-        {
-            if (Instance == null)
-            {
-                Instance = new Msg858301();
-            }
-            return Instance;
-        }
-
-        /// <summary>
-        /// 组包操作
-        /// </summary>
-        /// <returns>报文数据包</returns>
-        public byte[] Integrate(Message msg)
-        {
-            byte[] returnData = null;
-
-            try
-            {
-                returnData = DoIntegrate(msg);
-            }
-            catch (Exception ex)
-            {
-                //写错误信息
-                PlatformLogger.SystemErrorInfo("组包发生异常：", ex);
-                throw;
-            }
-            return returnData;
-        }
-
-        /// <summary>
-        /// 解包操作
-        /// </summary>
-        /// <param name="msg">核心返回数据包</param>
-        /// <param name="data">核心返回数据包</param>
-        /// <returns></returns>
-        public bool Analyze(Message msg, byte[] data)
-        {
-            try
-            {
-                //进行解包处理
-                DoAnalyze(msg, data);
-            }
-            catch (Exception ex)
-            {
-
-                return false;
-            }
-            return true;
-        }
-
-        #region 组包处理
-
-        /// <summary>
-        /// 组包处理
-        /// </summary>
-        /// <param name="msg"></param>
-        /// <returns></returns>
-        private byte[] DoIntegrate(Message msg)
-        {
-            #region new
-            ///*******************************************
-            // * 组包规则：
-            // * msgHeader         byte[68]   Tuxedo报文头
-            // * msgData           byte[]     报文数据
-            // * fileFlag          byte       是否发送附件 
-            // * *****************************************/
-
-            ////文件标志
-            //byte fileFlag = (byte)(msg.FileFlag ? 0x7f : 0xff);
-            ////报文数据
-            //byte[] bitMapData;
-            //var fdData = msg.IntegrateFd(out bitMapData);
-            //byte[] msgKindData = PlatformSettings.Encoding.GetBytes(MsgParames.MsgType.PadLeft(5, '0'));
-            //var msgData = new byte[msgKindData.Length + bitMapData.Length + fdData.Length];
-            //msgKindData.CopyTo(msgData, 0);
-            //bitMapData.CopyTo(msgData, msgKindData.Length);
-            //fdData.CopyTo(msgData, msgKindData.Length + bitMapData.Length);
-            ////加密报文数据
-            //MsgPackage.Encrypt(msgData, Encoding.ASCII.GetBytes(MsgParames.KeyStr), 1);
-            ////报文头
-            //var msgHeader = GetMsgT(msg, msgData.Length.ToString()).ToArray<byte>();
-            ////组装报文
-            //var totalData = new byte[msgHeader.Length + msgData.Length + 1];
-            //msgHeader.CopyTo(totalData, 0);
-            //msgData.CopyTo(totalData, msgHeader.Length);
-            //totalData[totalData.Length - 1] = fileFlag;
-
-            //return totalData;
-            #endregion
-
-
-            #region deleted
-            //报文数据区
-            byte[] msgData;
-            //报文总长度
-            int totalLen;
-            //8位长度对应字符串
-            string strLen;
-            //报文数据区的长度
-            int msgDataLen;
-            //60位报文头
-            string msgTitle;
-            //5报文类型
-            byte[] msgKindByte;
-            //位图区域
-            byte[] bitMapByte = new byte[16];
-            //有效数据内容
-            string bitDataStr = string.Empty;
-            byte[] bitDataByte;
-            //组包数据包
-            byte[] totalMsgData;
-
-            //文件标志 0xff==no file   0x7f==file
-            byte fileFlag;
-            //根据当前交易附件标志设置文件标志
-            if (msg.FileFlag)
-            {
-                fileFlag = 0x7f;
-            }
-            //无文件
-            else
-            {
-                fileFlag = 0xff;
-            }
-            try
-            {
-                //报文类型
-                msgKindByte = PlatformSettings.Encoding.GetBytes("00000");
-                //组织报文数据区域信息，位图区，数据区
-                //GetBitData(msg, bitMapByte, ref bitDataStr);
-                //bitDataByte = PlatformSettings.Encoding.GetBytes(bitDataStr);
-                bitDataByte = msg.IntegrateFd(out bitMapByte);
-
-                //报文数据区长度
-                msgDataLen = msgKindByte.Length + bitMapByte.Length + bitDataByte.Length;
-                //报文总长度
-                totalLen = msgDataLen + 68;
-                //8位长度对应字符串
-                strLen = Convert.ToString(totalLen).PadLeft(8, '0');
-                //60位报文头
-                msgTitle = msgDataLen.ToString().PadLeft(4, '0').PadLeft(68, ' ');//GetMsgT(msg, msgDataLen.ToString());
-
-                //合并5位报文类型，位图，数据区域
-                msgData = new byte[msgDataLen];
-                //合并操作
-                for (int i = 0; i < msgData.Length; i++)
-                {
-                    if (i < msgKindByte.Length)
-                    {
-                        msgData[i] = msgKindByte[i];
-                    }
-
-                    if (i > msgKindByte.Length - 1 & i < msgKindByte.Length + bitMapByte.Length)
-                    {
-                        msgData[i] = bitMapByte[i - msgKindByte.Length];
-                    }
-                    if (i > msgKindByte.Length + bitMapByte.Length - 1)
-                    {
-                        msgData[i] = bitDataByte[i - msgKindByte.Length - bitMapByte.Length];
-                    }
-                }
-
-                //MsgPackage.LogObj.Debug("加密前数据："+PlatformSettings.Encoding.GetString(msgData));
-                //加密报文数据区
-                //MsgPackage.Encrypt(msgData, Encoding.ASCII.GetBytes(CommonSettings.KeyStr), 1);
-                //MsgPackage.LogObj.Debug("加密后数据：" + PlatformSettings.Encoding.GetString(msgData));
-
-                //合并组包数据
-                //8位的报文长度
-                byte[] len8 = PlatformSettings.Encoding.GetBytes(strLen);//new byte[0];
-                //报文头字节数组
-                byte[] msgTitleByte = PlatformSettings.Encoding.GetBytes(msgTitle);
-                totalMsgData = new byte[len8.Length + msgTitleByte.Length + msgData.Length + 1];
-                for (int j = 0; j < totalMsgData.Length - 1; j++)
-                {
-                    if (j < len8.Length)
-                    {
-                        totalMsgData[j] = len8[j];
-                    }
-                    if (j > len8.Length - 1 & j < len8.Length + msgTitleByte.Length)
-                    {
-                        totalMsgData[j] = msgTitleByte[j - len8.Length];
-                    }
-                    if (j > len8.Length + msgTitleByte.Length - 1)
-                    {
-                        totalMsgData[j] = msgData[j - len8.Length - msgTitleByte.Length];
-                    }
-                }
-                //设置文件标志位
-                totalMsgData[totalMsgData.Length - 1] = fileFlag;
-
-                //处理附件
-                if (msg.FileFlag)
-                {
-                    //文件追加到数据后
-                    var file = PlatformSettings.Encoding.GetBytes(Message.Cconv(msg.FileData));//生僻字转义：文件组包处理
-                    var lenData = PlatformSettings.Encoding.GetBytes(file.Length.ToString().PadLeft(8, '0'));
-                    var fileName = !string.IsNullOrEmpty(msg._filename) ? PlatformSettings.Encoding.GetBytes(msg._filename.PadRight(30)) : PlatformSettings.Encoding.GetBytes((LoginUserInfo.KinbrNo + LoginUserInfo.TtyName).PadRight(30));
-                    var ret = new byte[totalMsgData.Length + fileName.Length + lenData.Length + file.Length + 1];
-                    Array.Copy(totalMsgData, ret, totalMsgData.Length);
-                    Array.Copy(fileName, 0, ret, totalMsgData.Length, fileName.Length);
-                    Array.Copy(lenData, 0, ret, totalMsgData.Length + fileName.Length, lenData.Length);
-                    Array.Copy(file, 0, ret, totalMsgData.Length + fileName.Length + lenData.Length, file.Length);
-                    //补充一个结束字符
-                    ret[ret.Length - 1] = 0xff;
-                    totalMsgData = ret;
-                }
-                //MsgPackage.LogObj.Debug("报文整体数据：" + PlatformSettings.Encoding.GetString(totalMsgData));
-            }
-            catch (Exception ex)
-            {
-                //写错误信息
-                PlatformLogger.SystemErrorInfo("组包发生异常！", ex);
-                throw;
-            }
-            return totalMsgData;
-            #endregion
-        }
-
-        /// <summary>
-        /// 生成TUXEDO方式报文头
-        /// </summary>
-        /// <param name="msg">域信息</param>
-        /// <param name="msgDataLen"></param>
-        /// <returns></returns>
-        private string GetMsgT(Message msg, string msgDataLen)
-        {
-            string clnm = "";                 //5位   空串
-            string svcnm = "";                //15位  Tuxedo交易服务名
-            string reqtype = "";              //1位   "4"
-            string branchNo = "";             //10位   机构编号
-            string tty = "";                  //12位   终端号
-            string titaOr8583;                //1位   代码中的值 8’
-            string cbs = "";                  //10位  空串
-            string macflg = "";               //1位   空串
-            string mac = "";                  //8位   空串
-            string result = "";               //1位   '0'
-            string len = "";                  //4位   8583数据区长度
-            //TUXEDO方式报文头
-            StringBuilder tmpMstTile = new StringBuilder();
-
-            //设置对应变量的值
-            clnm = "".PadLeft(5, ' ');
-            tmpMstTile.Append(clnm);
-            svcnm = "".PadLeft(15, ' ');
-            tmpMstTile.Append(svcnm);
-            reqtype = "4";
-            tmpMstTile.Append(reqtype);
-            //TODO:机构号扩展为10位，故报文大小变成68
-            branchNo = msg.Fd3.PadLeft(10, ' ');
-            tmpMstTile.Append(branchNo);
-            //TODO:由于tty采用12位，故修改为12位（保证核心已经修改）
-            //tty = msg.Fd10.PadLeft(9, ' ');
-            tty = msg.Fd10.PadLeft(12, ' ');
-            tmpMstTile.Append(tty);
-            titaOr8583 = "8";
-            tmpMstTile.Append(titaOr8583);
-            cbs = "".PadLeft(10, ' ');
-            tmpMstTile.Append(cbs);
-            macflg = "".PadLeft(1, ' ');
-            tmpMstTile.Append(macflg);
-            mac = "".PadLeft(8, ' ');
-            tmpMstTile.Append(mac);
-            result = "0";
-            tmpMstTile.Append(result);
-            len = msgDataLen.PadLeft(4, '0');
-            tmpMstTile.Append(len);
-
-            return tmpMstTile.ToString();
-        }
-        #endregion
-
-        #region 解包处理
-
-        /// <summary>
-        /// 解包操作
-        /// </summary>
-        /// <param name="msg"></param>
-        /// <param name="returnData"></param>
-        /// <returns></returns>
-        public void DoAnalyze(Message msg, byte[] returnData)
-        {
-            try
-            {
-                //丢弃前8位
-                var ret = new byte[returnData.Length - 8];
-                Array.Copy(returnData, 8, ret, 0, ret.Length);
-                returnData = ret;
-
-                //报文前68位内容       
-                byte[] msg60 = new byte[68];
-                //报文数据区长度        
-                int msgDataLen = 0;
-                //报文数据区内容
-                byte[] msgData;
-                //报文有效数据内容
-                byte[] msgDataReal;
-                //报文位图区
-                byte[] msgBit;
-                string msgBitStr = "";
-
-                //报文前60位（60位报文头）
-                for (int i = 0; i < 68; i++)
-                {
-                    msg60[i] = returnData[i];
-                }
-
-                //报文数据区长度 
-                byte[] tmpLen = new byte[4];
-                Array.Copy(msg60, 64, tmpLen, 0, 4);
-                msgDataLen = Convert.ToInt32(PlatformSettings.Encoding.GetString(tmpLen));
-
-                //报文前60位字符串内容
-                //MsgStr60 = Encoding.GetEncoding(CAppInfo.CodingStr).GetString(Msg60);
-
-                #region 20140423 王全
-                //承德平台无此返回报文场景
-                ////如果报文数据区第五位为0xff
-                ////总共报文数据区为4位应答码.
-                //if (returnData[72] == (byte)'\0')
-                //{
-                //    //应答码错误信息
-                //    byte[] tmpData = new byte[4];
-                //    //取得应答码错误信息内容
-                //    Array.Copy(returnData, 68, tmpData, 0, 4);
-                //    //返回应答码
-                //    msg.Fd12 = PlatformSettings.Encoding.GetString(tmpData);
-                //    return;
-                //}
-                #endregion
-
-                //取得报文数据区内容
-                msgData = new byte[msgDataLen];
-                Array.Copy(returnData, 68, msgData, 0, msgDataLen);
-                //文件标志
-                byte fileDataFlag = returnData[20];
-                //解密数据区内容
-                //MsgPackage.Encrypt(msgData, Encoding.ASCII.GetBytes(CommonSettings.KeyStr),
-                //                   0);
-                #region delete 解包封装
-                ////报文数据区格式为 5位报文类型+16位位图区域+有效数据区
-                ////报文位图区
-                ////报文位图区存在2种情况，当位图区第1域为0时，位图长度为64（压缩为8位数据），否则为128（压缩为16位数据）
-                ////标志位，是否采用128位位图
-                //bool IsBitmap128 = Convert.ToString(msgData[5], 2).PadLeft(8, '0').StartsWith("1");
-
-                //msgBit = new byte[IsBitmap128 ? 16 : 8];
-                //Array.Copy(msgData, 5, msgBit, 0, msgBit.Length);
-                ////扩展16位字符串转换为128位01格式的位图字符串
-                //foreach (byte bytes in msgBit)
-                //{
-                //    msgBitStr += Convert.ToString(bytes, 2).PadLeft(8, '0');
-                //}
-                ////写调试日志
-                ////MsgPackage.LogObj.Debug("\n返回位图:\n" + msgBitStr.Replace('\0', '\n'));
-                ////报文数据内容
-                //int startIndex = 5 + (IsBitmap128 ? 16 : 8);
-                //msgDataReal = new byte[msgDataLen - startIndex];
-                //Array.Copy(msgData, startIndex, msgDataReal, 0, msgDataReal.Length);
-                ////写调试日志
-                ////MsgPackage.LogObj.Debug("\n解包前应答数据:\n" + PlatformSettings.Encoding.GetString(msgDataReal).Replace('\0', '\n'));
-
-                ////详细解析每个域的信息
-                ////Message tmpMsg = AnilyzeFd(msgBitStr, msgDataReal, msg);
-                //if (!msg.AnilyzeFd(msgBitStr, msgDataReal))
-                //{
-                //    //解包失败
-                //    throw new FormatException("8583通讯解包操作失败！具体情况请查看日志！");
-                //}
-                if (!msg.AnilyzeFd(msgData))
-                {
-                    //解包失败
-                    throw new FormatException("8583通讯解包操作失败！具体情况请查看日志！");
-                }
-                #endregion
-                //将解析后结果复制到当前交易对象中
-                //MsgPackage.Clone(msg, tmpMsg);
-                //有文件附件的处理
-                //存在附件，规则[文件名称:30][数据长度:8][数据:n]
-                var fileLen = returnData.Length - 68 - msgDataLen - 38 - 1;
-                if (fileLen > 0)
-                {
-                    //报文文件内容               
-                    byte[] fileData = new byte[fileLen];
-                    Array.Copy(returnData, 68 + msgDataLen + 38 + 1, fileData, 0, fileLen);
-                    //返回解包后文件数据
-                    msg.FileData = Message.Cconv(PlatformSettings.Encoding.GetString(fileData), false);//生僻字转义：文件解包处理
-                    //写调试日志
-                    PlatformLogger.CommunicationInfo("\n文件数据:\n" + PlatformSettings.Encoding.GetString(fileData));
-                }
-            }
-            catch (Exception ex)
-            {
-                //写错误信息
-                PlatformLogger.SystemErrorInfo("解析报文失败！", ex);
-                throw;
-            }
-        }
-        #endregion
-
-    }
-}

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

@@ -1,7 +1,7 @@
-import { Message } from './Message'
-import { PlatformLogger } from './PlatformLogger'
-import { PlatformSettings } from './PlatformSettings'
+import Message from "@/views/front/develop/Communication/Message";
+import PlatformLogger from "@/views/front/platfrom/common/LogSystem/PlatformLogger";
 import { IPackage } from './IPackage'
+import LoginUserInfo from "@/views/front/platfrom/common/RunningParameters/LoginUserInfo";
 
 /**
  * 8583 128域类型报文，Tcp通讯方式的组包，解包处理。承德渠道
@@ -32,7 +32,7 @@ export class Msg858301 implements IPackage {
             returnData = this.doIntegrate(msg)
         } catch (ex) {
             // 写错误信息
-            PlatformLogger.systemErrorInfo("组包发生异常：", ex)
+            PlatformLogger.SystemErrorInfo("组包发生异常：", ex)
             throw ex
         }
         return returnData
@@ -117,7 +117,7 @@ export class Msg858301 implements IPackage {
             // 报文头字节数组
             const msgTitleByte = new TextEncoder().encode(msgTitle)
             totalMsgData = new Uint8Array(len8.length + msgTitleByte.length + msgData.length + 1)
-            
+
             for (let j = 0; j < totalMsgData.length - 1; j++) {
                 if (j < len8.length) {
                     totalMsgData[j] = len8[j]
@@ -137,10 +137,10 @@ export class Msg858301 implements IPackage {
                 // 文件追加到数据后
                 const file = new TextEncoder().encode(Message.cconv(msg.fileData))
                 const lenData = new TextEncoder().encode(file.length.toString().padStart(8, '0'))
-                const fileName = !msg._filename 
-                    ? new TextEncoder().encode(msg._filename.padEnd(30)) 
-                    : new TextEncoder().encode((msg.loginUserInfo.kinbrNo + msg.loginUserInfo.ttyName).padEnd(30))
-                
+                const fileName = !msg._filename
+                    ? new TextEncoder().encode(msg._filename.value.padEnd(30))//hulei 取value 转右补齐
+                    : new TextEncoder().encode((LoginUserInfo.KinbrNo + LoginUserInfo.TtyName).padEnd(30))
+
                 const ret = new Uint8Array(totalMsgData.length + fileName.length + lenData.length + file.length + 1)
                 ret.set(totalMsgData, 0)
                 ret.set(fileName, totalMsgData.length)
@@ -152,7 +152,7 @@ export class Msg858301 implements IPackage {
             }
         } catch (ex) {
             // 写错误信息
-            PlatformLogger.systemErrorInfo("组包发生异常！", ex)
+            PlatformLogger.SystemErrorInfo("组包发生异常！", ex)
             throw ex
         }
         return totalMsgData
@@ -184,7 +184,7 @@ export class Msg858301 implements IPackage {
             // 取得报文数据区内容
             msgData = new Uint8Array(msgDataLen)
             msgData.set(returnData.subarray(68, 68 + msgDataLen), 0)
-            
+
             if (!msg.anilyzeFd(msgData)) {
                 // 解包失败
                 throw new Error("8583通讯解包操作失败！具体情况请查看日志！")
@@ -197,13 +197,13 @@ export class Msg858301 implements IPackage {
                 const fileData = new Uint8Array(fileLen)
                 fileData.set(returnData.subarray(68 + msgDataLen + 38 + 1, 68 + msgDataLen + 38 + 1 + fileLen), 0)
                 // 返回解包后文件数据
-                msg.fileData = Message.cconv(new TextDecoder().decode(fileData), false)
+                msg.fileData = Message.cconv(new TextDecoder().decode(fileData))
                 // 写调试日志
-                PlatformLogger.communicationInfo("\n文件数据:\n" + new TextDecoder().decode(fileData))
+                PlatformLogger.CommunicationInfo("\n文件数据:\n" + new TextDecoder().decode(fileData))
             }
         } catch (ex) {
             // 写错误信息
-            PlatformLogger.systemErrorInfo("解析报文失败！", ex)
+            PlatformLogger.SystemErrorInfo("解析报文失败！", ex)
             throw ex
         }
     }
@@ -213,8 +213,8 @@ export class Msg858301 implements IPackage {
         const clnm = "".padStart(5, ' ')         //5位   空串
         const svcnm = "".padStart(15, ' ')        //15位  Tuxedo交易服务名
         const reqtype = "4"                       //1位   "4"
-        const branchNo = msg.fd3.padStart(10, ' ') //10位   机构编号
-        const tty = msg.fd10.padStart(12, ' ')    //12位   终端号
+        const branchNo = msg.Fd3.padStart(10, ' ') //10位   机构编号
+        const tty = msg.Fd10.padStart(12, ' ')    //12位   终端号
         const titaOr8583 = "8"                    //1位   代码中的值 8'
         const cbs = "".padStart(10, ' ')          //10位  空串
         const macflg = "".padStart(1, ' ')        //1位   空串
@@ -223,7 +223,7 @@ export class Msg858301 implements IPackage {
         const len = msgDataLen.padStart(4, '0')   //4位   8583数据区长度
 
         // TUXEDO方式报文头
-        return clnm + svcnm + reqtype + branchNo + tty + titaOr8583 + 
-               cbs + macflg + mac + result + len
+        return clnm + svcnm + reqtype + branchNo + tty + titaOr8583 +
+            cbs + macflg + mac + result + len
     }
-}
+}

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

@@ -1,5 +1,5 @@
-import { Message } from './Message'
-import { PlatformLogger } from './PlatformLogger'
+import Message from "@/views/front/develop/Communication/Message";
+import PlatformLogger from "@/views/front/platfrom/common/LogSystem/PlatformLogger";
 import { PlatformSettings } from './PlatformSettings'
 import { IPackage } from './IPackage'
 import { MsgPackage } from './MsgPackage'
@@ -122,7 +122,7 @@ export class Msg858302 implements IPackage {
             // 报文头字节数组
             const msgTitleByte = new TextEncoder().encode(msgTitle)
             totalMsgData = new Uint8Array(len8.length + msgTitleByte.length + msgData.length + 1)
-            
+
             for (let j = 0; j < totalMsgData.length - 1; j++) {
                 if (j < len8.length) {
                     totalMsgData[j] = len8[j]
@@ -164,8 +164,8 @@ export class Msg858302 implements IPackage {
         const len = msgDataLen.padStart(4, '0')  //4位   8583数据区长度
 
         // TUXEDO方式报文头
-        return clnm + svcnm + reqtype + branchNo + tty + titaOr8583 + 
-               cbs + macflg + mac + result + len
+        return clnm + svcnm + reqtype + branchNo + tty + titaOr8583 +
+            cbs + macflg + mac + result + len
     }
 
     // 解包处理
@@ -189,7 +189,7 @@ export class Msg858302 implements IPackage {
             // 取得报文数据区内容
             msgData = new Uint8Array(msgDataLen)
             msgData.set(returnData.subarray(68, 68 + msgDataLen), 0)
-            
+
             if (!msg.anilyzeFd(msgData)) {
                 // 解包失败
                 throw new Error("8583通讯解包操作失败！具体情况请查看日志！")
@@ -200,4 +200,4 @@ export class Msg858302 implements IPackage {
             throw ex
         }
     }
-}
+}

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

@@ -3,12 +3,14 @@ import { TradeBusHelper } from './TradeBusHelper'
 import { TradeInfoHelper } from './TradeInfoHelper'
 import { TradeAPIsHelper } from './TradeAPIsHelper'
 import { TradeResourcesHelper } from './TradeResourcesHelper'
-import { PaperlessEntry } from './PaperlessEntry'
-import { CashCodeEntry } from './CashCodeEntry'
-import { PlatformLogger } from '../../Platform.Common/LogSystem/PlatformLogger'
-import { ServiceSettings } from '../../TellerSystem.ServiceProxy/Ext/ServiceHelper/ServiceSettings'
-import { TradeHandle } from '../../TellerSystem.Library/Ext/Function/TradeHandle'
-import { PrintAttributes } from '../../Platform.Presentation/PageFunctions/PrintAttributes'
+//import { PaperlessEntry } from './PaperlessEntry'
+//import { CashCodeEntry } from './CashCodeEntry'
+import PlatformLogger from "@/views/front/platfrom/common/LogSystem/PlatformLogger";
+import { ServiceSettings } from "@/views/front/develop/ServiceProxy.Ext/ServiceSettings"
+import TradeHandle from '../../ServiceProxy.Ext/ServiceHelper/TradeHandle'
+import { PrintAttributes } from "../../PrintTemplate/Extension/PrintAttributes";
+//import TradeModel from "@/views/front/platfrom/common/BasicFunctions/";
+
 
 /**
  * 页面基类，填充通用的业务接口API
@@ -51,23 +53,23 @@ export abstract class PageBase implements ITradeHelper {
         return this._tradeResources
     }
 
-    // 无纸化对象
-    private paperless: PaperlessEntry | null = null
-    get Paperless(): PaperlessEntry {
-        if (!this.paperless) {
-            this.paperless = new PaperlessEntry()
-        }
-        return this.paperless
-    }
+    // 无纸化对象 hulei  无纸化和冠字号没用 暂时注销
+    // private paperless: PaperlessEntry | null = null
+    // get Paperless(): PaperlessEntry {
+    //     if (!this.paperless) {
+    //         this.paperless = new PaperlessEntry()
+    //     }
+    //     return this.paperless
+    // }
 
     // 冠字号对象
-    private cashCode: CashCodeEntry | null = null
-    get CashCode(): CashCodeEntry {
-        if (!this.cashCode) {
-            this.cashCode = new CashCodeEntry()
-        }
-        return this.cashCode
-    }
+    // private cashCode: CashCodeEntry | null = null
+    // get CashCode(): CashCodeEntry {
+    //     if (!this.cashCode) {
+    //         this.cashCode = new CashCodeEntry()
+    //     }
+    //     return this.cashCode
+    // }
 
     // 银行标签
     get BankFlag(): string {
@@ -104,7 +106,7 @@ export abstract class PageBase implements ITradeHelper {
                 }
             }
         } catch (e) {
-            PlatformLogger.tradeErrorInfo('调用InitPage失败！', e, this.TradeModel.Code)
+            PlatformLogger.TradeErrorInfo('调用InitPage失败！', e,)// TradeModel.Code hulei trademodel 不明确类
         }
         if (!flag) {
             // 关闭页面逻辑
@@ -116,17 +118,17 @@ export abstract class PageBase implements ITradeHelper {
      */
     private log2PagePrinted(log: string): void {
         try {
-            PlatformLogger.systemInfo(`Log2PagePrinted:start 【${log}】=>${this.pagePrintedHandlers.length}`)
+            PlatformLogger.SystemInfo(`Log2PagePrinted:start 【${log}】=>${this.pagePrintedHandlers.length}`)
             if (this.pagePrintedHandlers.length === 0) return
-            PlatformLogger.systemInfo(`Log2PagePrinted:list length=>${this.pagePrintedHandlers.length}`)
-        } catch {}
+            PlatformLogger.SystemInfo(`Log2PagePrinted:list length=>${this.pagePrintedHandlers.length}`)
+        } catch { }
     }
 
     /**
      * 触发打印后事件
      */
     public onPagePrinted(attr: PrintAttributes): void {
-        PlatformLogger.systemInfo(`OnPagePrinted:触发事件=>${this.pagePrintedHandlers.length}`)
+        PlatformLogger.SystemInfo(`OnPagePrinted:触发事件=>${this.pagePrintedHandlers.length}`)
         if (this.pagePrintedHandlers.length > 0) {
             this.log2PagePrinted('OnPagePrinted.start')
             this.pagePrintedHandlers.forEach(handler => handler(attr))
@@ -152,7 +154,7 @@ export abstract class PageBase implements ITradeHelper {
      * 清理缓存数据
      */
     public clear(): void {
-        this.paperless = null
+        // this.paperless = null
         this._tradeAPIs = null
         this._tradeBus = null
         this._tradeInfo = null
@@ -160,15 +162,15 @@ export abstract class PageBase implements ITradeHelper {
     }
 }
 
-// Vue组件封装
-export const PageBaseComponent = defineComponent({
-    extends: PageBase,
-    methods: {
-        initPage(): boolean {
-            return super.initPage()
-        },
-        onPagePrinted(attr: PrintAttributes): void {
-            super.onPagePrinted(attr)
-        }
-    }
-})
+// // Vue组件封装
+// export const PageBaseComponent = defineComponent({
+//     extends: PageBase,
+//     methods: {
+//         initPage(): boolean {
+//             return super.initPage()
+//         },
+//         onPagePrinted(attr: PrintAttributes): void {
+//             super.onPagePrinted(attr)
+//         }
+//     }
+// })

ant-design-pro-vue3/src/views/front/develop/Constract/Contracts/ContractManager.ts

@@ -1,6 +1,6 @@
 import { reactive } from 'vue'
-import type { PageBase } from './PageBase'
-import type { Message } from './Message'
+import type { PageBase } from "@/views/front/develop/Constract/ContractBase/PageBase"
+import Message from "@/views/front/develop/Communication/Message";
 import type { PrintContainer } from './PrintContainer'
 import type { EvaluationRecord } from './EvaluationRecord'
 import type { PaymentFeeArguments } from './PaymentFeeArguments'
@@ -21,7 +21,7 @@ export class ContractManager {
             authdata.ClearAuthData()
             const contract = page as ISubmitContract
             if (!contract || !contract.SubmitEntry) return false
-            
+
             if (contract.SubmitEntry.Submitted) {
                 TradeHandle.WriteTraceLog("ContractManager.RaiseSubmit:阻断错误的重复提交！", contract.SubmitEntry.MessageData.Fd16)
                 return false
@@ -35,8 +35,8 @@ export class ContractManager {
 
             const entry = contract.SubmitEntry
             if (!entry || !entry.LoadData(page, message)) return false
-            
-            if (!this.RaiseRecheck(page, message)) return false             
+
+            if (!this.RaiseRecheck(page, message)) return false
             if (!this.RaiseAuthorize(page, message)) return false
             if (!this.RaisePaymentFee(page, message)) return false
             if (!entry.RaiseSubmit()) return false
@@ -51,16 +51,16 @@ export class ContractManager {
         if (page.isAuthorizeContract) {
             const contract = page as IAuthorizeContract
             if (!contract) return false
-            
+
             if (ExamSystem.Instance.InExamMode) return true
-            
+
             if (page.TradeAPIs.GetTradeMetadata("isAuth") !== "true") return true
-            
+
             if (!contract.AuthorizeEntries || contract.AuthorizeEntries.length === 0) return false
 
             const entry = contract.AuthorizeEntries.find(x => x.PowerCode === powerCode)
             if (!entry) return false
-            
+
             entry.LoadData(page, message)
             return entry.RaiseAuthorize()
         }
@@ -74,16 +74,16 @@ export class ContractManager {
         if (page.isRecheckContract) {
             const contract = page as IRecheckContract
             if (!contract) return false
-            
+
             if (ExamSystem.Instance.InExamMode) return true
-            
+
             if (page.TradeAPIs.GetTradeMetadata("isRecheck") !== "true") return true
-            
+
             if (!contract.RecheckEntries || contract.RecheckEntries.length === 0) return false
 
             const entry = contract.RecheckEntries.find(x => x.PowerCode === powerCode)
             if (!entry) return false
-            
+
             entry.LoadData(page, message)
             return entry.RaiseRecheck()
         }
@@ -97,9 +97,9 @@ export class ContractManager {
         if (page.isPaymentFeeContract) {
             const contract = page as IPaymentFeeContract
             if (!contract) return false
-            
+
             if (page.TradeAPIs.GetTradeMetadata("isPaymentFee") !== "true") return true
-            
+
             if (message.TransitNode === TransitType.CallGateway2CBS) {
                 PlatformLogger.CommunicationInfo("核心前置通讯不支持收费（TransitType.CallGateway2CBS）")
                 return true
@@ -107,13 +107,13 @@ export class ContractManager {
 
             const FLAG = TradeManagerHandle.TT_SYSCONFIG_GetConfigValueByConfigID("2ea3a7e6cfa04f89a335bf1e363295de")
             const filedata = message.FileData
-            
+
             let isPaymentFee = false
             const args = new PaymentFeeArguments(message)
             if (!contract.CheckFee(args, out isPaymentFee)) return false
-            
+
             if (isPaymentFee && !contract.RaisePaymentFee(args)) return false
-            
+
             message.FileData = filedata
         }
         return true
@@ -125,9 +125,9 @@ export class ContractManager {
     public static RaiseEvaluation(page: PageBase): void {
         const contract = page as IEvaluationContract
         if (!contract) return
-        
+
         if (page.TradeAPIs.GetTradeMetadata("isEvaluation") !== "true") return
-        
+
         const record = new EvaluationRecord()
         if (!contract.PreviewEvaluation(record)) {
             const list_accno = page.PositioningUI(["账／卡号", "账号", "卡    号", "账    号", "结算账号", "账/卡号", "贷款账号", "还款账号", "贷方账号", "记贷付款账号", "借据展示号", "记账账号", "收款人账号", "付款人账号", "签约账号", "账/卡 号", "本行账号", "申请人账号"])
@@ -135,30 +135,30 @@ export class ContractManager {
                 .map(x => (x[1] as HTMLInputElement).value)
                 .filter((value, index, self) => self.indexOf(value) === index)
                 .reduce((acc, curr) => (acc[curr] = curr, acc), {} as Record<string, string>)
-            
+
             const list_idno = page.PositioningUI(["证件号码"])
                 .filter(x => x[1] instanceof HTMLInputElement)
                 .map(x => (x[1] as HTMLInputElement).value)
                 .filter((value, index, self) => self.indexOf(value) === index)
                 .reduce((acc, curr) => (acc[curr] = curr, acc), {} as Record<string, string>)
-            
+
             const list_name = page.PositioningUI(["户    名", "户　　名", "客户名称"])
                 .filter(x => x[1] instanceof HTMLInputElement)
                 .map(x => (x[1] as HTMLInputElement).value)
                 .filter((value, index, self) => self.indexOf(value) === index)
                 .reduce((acc, curr) => (acc[curr] = curr, acc), {} as Record<string, string>)
-            
+
             const list_amt = page.PositioningUI(["交易金额", "开户金额", "支取金额"])
                 .filter(x => x[1] instanceof HTMLInputElement)
                 .map(x => (x[1] as HTMLInputElement).value)
                 .filter((value, index, self) => self.indexOf(value) === index)
                 .reduce((acc, curr) => (acc[curr] = curr, acc), {} as Record<string, string>)
-            
+
             record.AccNo = Object.keys(list_accno).length === 1 ? list_accno[Object.keys(list_accno)[0]] : ''
             record.IdNo = Object.keys(list_idno).length === 1 ? list_idno[Object.keys(list_idno)[0]] : ''
             record.Name = Object.keys(list_name).length === 1 ? list_name[Object.keys(list_name)[0]] : ''
             record.Amt = Object.keys(list_amt).length === 1 ? list_amt[Object.keys(list_amt)[0]] : ''
-            
+
             const gen = (title: string, dict: Record<string, string>): HTMLElement => {
                 const line = document.createElement('div')
                 line.style.display = 'flex'
@@ -166,7 +166,7 @@ export class ContractManager {
                 titleEl.textContent = title
                 titleEl.style.width = '120px'
                 line.appendChild(titleEl)
-                
+
                 const comboBox = document.createElement('select')
                 comboBox.style.width = '300px'
                 Object.keys(dict).forEach(key => {
@@ -175,14 +175,14 @@ export class ContractManager {
                     option.textContent = dict[key]
                     comboBox.appendChild(option)
                 })
-                
+
                 comboBox.addEventListener('change', () => {
                     if (dict === list_accno) record.AccNo = comboBox.value
                     else if (dict === list_idno) record.IdNo = comboBox.value
                     else if (dict === list_name) record.Name = comboBox.value
                     else if (dict === list_amt) record.Amt = comboBox.value
                 })
-                
+
                 line.appendChild(comboBox)
                 return line
             }
@@ -190,12 +190,12 @@ export class ContractManager {
             do {
                 if (Object.keys(list_accno).length >= 1 || Object.keys(list_idno).length >= 1) {
                     const content = document.createElement('div')
-                    
+
                     if (Object.keys(list_accno).length > 0) content.appendChild(gen("银行账号", list_accno))
                     if (Object.keys(list_idno).length > 0) content.appendChild(gen("身份证号", list_idno))
                     if (Object.keys(list_name).length > 0) content.appendChild(gen("客户姓名", list_name))
                     if (Object.keys(list_amt).length > 0) content.appendChild(gen("发生金额", list_amt))
-                    
+
                     if (confirm('请确认当前客户信息：')) {
                         if (Object.keys(list_accno).length > 0) record.AccNo = (content.querySelector('select') as HTMLSelectElement).value
                         if (Object.keys(list_idno).length > 0) record.IdNo = (content.querySelectorAll('select')[1] as HTMLSelectElement).value
@@ -208,9 +208,9 @@ export class ContractManager {
                 }
             } while (true)
         }
-        
+
         PlatformLogger.SystemInfo("RaiseEvaluation:数据=>" + record.toString())
-        
+
         if (!record.IdNo.trim() && record.AccNo.trim()) {
             const ac = page.TradeAPIs.TF_Customer_QueryCustomerInformation({
                 ZH: record.AccNo.trim()
@@ -219,7 +219,7 @@ export class ContractManager {
                 record.IdNo = ac.ZJHM.trim()
             }
         }
-        
+
         if (!record.Name) {
             if (record.IdNo.trim()) {
                 const khInfo = page.TradeAPIs.TF_Customer_QueryCustomerInformation({
@@ -257,7 +257,7 @@ export class ContractManager {
                 return
             }
         }
-        
+
         const msg1 = new Message(Message.BitMap.Agn)
         page.InitFd(msg1)
         page.CommSend(msg1)
@@ -276,10 +276,10 @@ export class ContractManager {
         msg1.Fd26 = record.Name
         msg1.Fd24 = "1"
         msg1.Fd38 = page.TradeInfo.SerialNumber
-        msg1.Fd27 = LoginUserInfo.KinbrName.includes("银行") 
-            ? LoginUserInfo.KinbrName.split("银行")[1] 
+        msg1.Fd27 = LoginUserInfo.KinbrName.includes("银行")
+            ? LoginUserInfo.KinbrName.split("银行")[1]
             : LoginUserInfo.KinbrName
-        
+
         page.CallAgn(msg1)
         if (msg1.Fd12 !== "0000") {
             page.TradeAPIs.ShowInfoMessageBox(`${page.GetError(msg1)}\n，微信评价推送失败！`)
@@ -293,30 +293,30 @@ export class ContractManager {
      */
     public static RaisePrint(page: PageBase, message: Message, printList: PrintContainer[]): boolean {
         if (!page || !message || !printList) return false
-        
+
         const pl: PrintContainer[] = []
         const printAttr = page.GetPrintAttributes()
-        
+
         if (message.Fd4) {
             printAttr.SerialNumber = page.CreateTellerSerialNumber(printAttr.SystemSerialNumber)
             printAttr.BusinessTransaction = message.Fd4
-            
+
             if (printAttr.BusinessTransaction === "000000000" && message.CustomizeTransitEntry?.SerialNo) {
                 printAttr.BusinessTransaction = message.CustomizeTransitEntry.SerialNo
             }
         }
-        
+
         for (const item of printList) {
             PrintContainerExt.SetPrintElement(item, printAttr)
-            
+
             const printfee = item as IPrintFeeContract
             const print = item as IPrintContract
-            
+
             if (!print || !print.PrintData) {
                 pl.push(item)
             } else {
                 print.PrintData.LoadData(page, message)
-                
+
                 try {
                     if (item.DocumentId === "TellerSystem.Controls.Ext.PrintsHelper.Print_Fee") {
                         const msg = new Message()
@@ -331,7 +331,7 @@ export class ContractManager {
                 } catch (ex) {
                     PlatformLogger.SystemErrorInfo("RaisePrintflow:调用LoadPrintData方法发生异常！", ex)
                 }
-                
+
                 if (print.PrintData.IsBatchPrint) {
                     print.PrintData.BatchList.forEach(x => PrintContainerExt.SetPrintElement(x, printAttr))
                     pl.push(...print.PrintData.BatchList)
@@ -340,7 +340,7 @@ export class ContractManager {
                 }
             }
         }
-        
+
         const list = page.TradeAPIs.DoPrintLimit(page.TradeModel.Code, pl)
         page.PrintCertificate(list)
         return true
@@ -357,4 +357,4 @@ export const useContractManager = () => {
         RaiseEvaluation: ContractManager.RaiseEvaluation,
         RaisePrint: ContractManager.RaisePrint
     })
-}
+}

ant-design-pro-vue3/src/views/front/develop/Constract/Contracts/IPaymentFeeContract.ts

@@ -1,5 +1,4 @@
-import type { Message } from './Message'
-
+import Message from "@/views/front/develop/Communication/Message";
 /**
  * 收费合约接口
  */
@@ -54,9 +53,9 @@ export class PaymentFeeArguments {
 // Vue组件封装
 export const usePaymentFeeContract = (impl: IPaymentFeeContract) => {
     return {
-        CheckFee: (args: PaymentFeeArguments, isPaymentFee: { value: boolean }) => 
+        CheckFee: (args: PaymentFeeArguments, isPaymentFee: { value: boolean }) =>
             impl.CheckFee(args, isPaymentFee),
-        RaisePaymentFee: (args: PaymentFeeArguments) => 
+        RaisePaymentFee: (args: PaymentFeeArguments) =>
             impl.RaisePaymentFee(args)
     }
-}
+}

ant-design-pro-vue3/src/views/front/develop/Constract/Contracts/ISubmitContract.ts

@@ -1,4 +1,4 @@
-import type { Message } from './Message'
+import Message from "@/views/front/develop/Communication/Message";
 import type { SubmitEntry } from './SubmitEntry'
 
 /**
@@ -23,4 +23,4 @@ export const useSubmitContract = () => {
     return {
         ISubmitContract
     }
-}
+}

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

@@ -5,6 +5,10 @@ import { TransitEntity, AttachFile } from './ServiceEntitys'
 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';
+import { CheckInfo } from '@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/CheckInfo';
+import { CheckResult } from '@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/CheckResult';
+import { AuthResult } from '@/views/front/develop/ServiceProxy.Ext/ServiceEntitys/AuthResult';
+
 
 export enum Transit {
     CallServer = 'CallServer',
@@ -167,7 +171,7 @@ export default class TradeHandle {
             const tmpresult = await ServiceManager.GetInstance().Commit(entity)
             if (tmpresult && tmpresult.length === 1) {
                 const rmpresult = CommonFunction.ChangeTableToEntitys<CheckResult>(
-                    tmpresult[0].AttachValue as DataTable
+                    tmpresult[0].AttachValue
                 )
                 if (rmpresult.length > 0) {
                     result = rmpresult[0]
@@ -241,7 +245,7 @@ export default class TradeHandle {
             const tmpresult = await ServiceManager.GetInstance().Commit(entity)
             if (tmpresult && tmpresult.length === 1) {
                 const rmpresult = CommonFunction.ChangeTableToEntitys<AuthResult>(
-                    tmpresult[0].AttachValue as DataTable
+                    tmpresult[0].AttachValue
                 )
                 if (rmpresult.length > 0) {
                     result = rmpresult[0]
@@ -252,19 +256,12 @@ export default class TradeHandle {
         }
         return result
     }
+    WriteImportantLog
 }
 
-interface CheckInfo {
-    // ... 检查信息字段
-}
 
-interface CheckResult {
-    // ... 检查结果字段
-}
 
-interface AuthResult {
-    // ... 授权结果字段
-}
+
 
 interface AskSuperInfo {
     // ... 申请复核信息字段