测试线程静态前提交

2024-08-07 18:44:46 +08:00
parent b13ae6ec88
commit 4e4316c6dc
33 changed files with 1596 additions and 380 deletions
@@ -4,10 +4,18 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using System.Web.Http;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.JScript;
+using SqlSugar;
+using UFIDA.U8.Framework.Api.Common.Entity;
+using UFIDA.U8.Framework.Api.ControlObject.Json;
 using UFIDA.U8.Framework.Api.ControlObject.Models;
 using UFIDA.U8.Framework.Api.ControlObject.U8M;
 using UFIDA.U8.Framework.Api.Unit;
 using UFIDA.U8.Framework.Api.Models;
+using Yitter.IdGenerator;
+using System.Web.UI.WebControls;
+using Convert = System.Convert;
+
 // ReSharper disable InconsistentNaming
 // ReSharper disable IdentifierTypo
 // ReSharper disable FieldCanBeMadeReadOnly.Local
@@ -35,33 +43,107 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        /// <returns></returns>
        [HttpPost]
        [Route("api/U8/SFC/MoRoutingBillSave")]
-        public async Task<BaseResult<dynamic>> MoRoutingBillSave(string cAccId,string cCardNum, [FromBody] Dictionary<string, object> input)
+        public async Task<BaseResult<string>> MoRoutingBillSave(string cAccId,string cCardNum, [FromBody] Dictionary<string, object> input)
        {
+            var taskId = 0L;
+
+            var db = CommUnit.GetDbClient();
+
+            BaseLogin baseLogin=null;
+
            try
            {
+                logInfo.Debug($"接口标识:MoRoutingBillSave,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
+
                if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
                    throw new Exception("当前接口不支持此类型的单据");

-                if (!_cache.TryGetValue($"U8M_{cAccId}", out BaseLogin baseLogin))
+                var runtimes = 0;
+
+                var u8mTask = new SysU8MTask()
                {
-                    baseLogin = new BaseLogin();
+                    U8MPool = $"U8M_{cAccId}"
+                };

-                    var param = await CommUnit.GetLoginParamter(cAccId);
-
-                    if (param == null)
+#if !DEBUG
+                while (await db.Queryable<SysU8MTask>().AnyAsync())
+                {
+                    if (runtimes > 20)
                    {
-                        throw new Exception("未能加载指定系统号的登录信息");
+                        throw new Exception("当前任务队列过长");
                    }

-                    baseLogin.Init(param);
+                    runtimes++;
+
+                    await Task.Delay(100 * runtimes);
+
+                    //u8mTask.Id = DateTime.Now.Ticks;
+
+                    if (await db.Queryable<SysU8MTask>()
+                            .AnyAsync(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1))
+                    {
+                        await db.Deleteable<SysU8MTask>()
+                            .Where(a => SqlFunc.DateDiff(DateType.Minute, a.dDate, DateTime.Now) > 1)
+                            .ExecuteCommandAsync();
+                    }

-                    _cache.Set($"U8M_{cAccId}", baseLogin);
                }
+#endif
+
+                u8mTask.dDate = DateTime.Now;
+
+                //if (u8mTask.Id == null)
+                //{
+                //    u8mTask.Id = DateTime.Now.Ticks;
+                //}
+
+                taskId = await db.Insertable(u8mTask).ExecuteReturnSnowflakeIdAsync();
+
+                logInfo.Debug($"开始操作,当前任务ID:{taskId}");
+                //if (!_cache.TryGetValue($"U8M_{cAccId}", out BaseLogin baseLogin))
+                //{
+                //    _cache.Clear();
+
+                baseLogin = new BaseLogin();
+
+                var param = await CommUnit.GetLoginParamter(cAccId);
+
+                if (param == null)
+                {
+                    throw new Exception("未能加载指定系统号的登录信息");
+                }
+
+                logInfo.Debug($"开始登录,当前任务ID:{taskId}");
+
+                baseLogin.Init(param,true);
+
+                //_cache.Set($"U8M_{cAccId}", baseLogin);
+                //}
+

                var bf = new MoRoutingBill();

-                var res=bf.Save( cCardNum, input);
+                logInfo.Debug($"开始保存,当前任务ID:{taskId}");

+                BaseResult<string> res;
+                if (input.ContainsKey("bBatch") && Convert.ToBoolean(input["bBatch"]))
+                {
+                    var inputs = input["inputs"] as List<Dictionary<string, object>> ?? $"{input["inputs"]}".ToObject<List<Dictionary<string, object>>>();
+
+                    res = bf.Save(cCardNum, inputs);
+                }
+                else
+                {
+                    res = bf.Save(cCardNum, input);
+                }
+
+                logInfo.Debug($"退出登录,当前任务ID:{taskId}");
+                baseLogin.ShutDown();
+
+                if (taskId != 0)
+                {
+                    await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
+                }

                return res;

@@ -70,7 +152,21 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
            {
                logInfo.Error(ex.Message, ex);

-                return new BaseResult<dynamic> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
+                if (taskId != 0)
+                {
+                    await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
+                }
+
+                return new BaseResult<string> { bSuccess = false, message = ex.Message, result = ex.StackTrace };
+            }
+            finally
+            {
+                if (taskId != 0)
+                {
+                    await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
+                }
+
+                baseLogin?.ShutDown();
            }


@@ -85,7 +181,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC90/Save")]
        [Route("api/U8/SFC/FC90/Save/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC90Save(string cAccId, [FromBody] Dictionary<string, object> input)
+        public async Task<BaseResult<string>> FC90Save(string cAccId, [FromBody] Dictionary<string, object> input)
        {
            return await MoRoutingBillSave(cAccId, "FC90", input);
        }
@@ -99,7 +195,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC91/Save")]
        [Route("api/U8/SFC/FC91/Save/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC91Save(string cAccId, [FromBody] Dictionary<string, object> input)
+        public async Task<BaseResult<string>> FC91Save(string cAccId, [FromBody] Dictionary<string, object> input)
        {
            return await MoRoutingBillSave(cAccId, "FC91", input);
        }
@@ -113,7 +209,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC92/Save")]
        [Route("api/U8/SFC/FC92/Save/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC92Save(string cAccId, [FromBody] Dictionary<string, object> input)
+        public async Task<BaseResult<string>> FC92Save(string cAccId, [FromBody] Dictionary<string, object> input)
        {
            return await MoRoutingBillSave(cAccId, "FC92", input);
        }
@@ -127,10 +223,12 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        /// <returns></returns>
        [HttpPost]
        [Route("api/U8/SFC/MoRoutingBillDelete")]
-        public async Task<BaseResult<dynamic>> MoRoutingBillDelete(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> MoRoutingBillDelete(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
        {
            try
            {
+                logInfo.Debug($"接口标识:MoRoutingBillDelete,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
+
                if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
                    throw new Exception("当前接口不支持此类型的单据");

@@ -166,7 +264,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
            {
                logInfo.Error(ex.Message, ex);

-                return new BaseResult<dynamic> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
+                return new BaseResult<string> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
            }


@@ -182,7 +280,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC90/Delete")]
        [Route("api/U8/SFC/FC90/Delete/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC90Delete(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC90Delete(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillDelete(cAccId, "FC90", input);
        }
@@ -196,7 +294,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC91/Delete")]
        [Route("api/U8/SFC/FC91/Delete/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC91Delete(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC91Delete(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillDelete(cAccId, "FC91", input);
        }
@@ -210,7 +308,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC92/Delete")]
        [Route("api/U8/SFC/FC92/Delete/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC92Delete(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC92Delete(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillDelete(cAccId, "FC92", input);
        }
@@ -224,10 +322,12 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        /// <returns></returns>
        [HttpPost]
        [Route("api/U8/SFC/MoRoutingBillVerify")]
-        public async Task<BaseResult<dynamic>> MoRoutingBillVerify(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> MoRoutingBillVerify(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
        {
            try
            {
+                logInfo.Debug($"接口标识:MoRoutingBillVerify,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
+
                if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
                    throw new Exception("当前接口不支持此类型的单据");

@@ -263,7 +363,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
            {
                logInfo.Error(ex.Message, ex);

-                return new BaseResult<dynamic> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
+                return new BaseResult<string> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
            }


@@ -279,7 +379,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC90/Verify")]
        [Route("api/U8/SFC/FC90/Verify/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC90Verify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC90Verify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillVerify(cAccId, "FC90", input);
        }
@@ -293,7 +393,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC91/Verify")]
        [Route("api/U8/SFC/FC91/Verify/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC91Verify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC91Verify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillVerify(cAccId, "FC91", input);
        }
@@ -307,7 +407,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC92/Verify")]
        [Route("api/U8/SFC/FC92/Verify/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC92Verify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC92Verify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillVerify(cAccId, "FC92", input);
        }
@@ -321,10 +421,13 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        /// <returns></returns>
        [HttpPost]
        [Route("api/U8/SFC/MoRoutingBillUnVerify")]
-        public async Task<BaseResult<dynamic>> MoRoutingBillUnVerify(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> MoRoutingBillUnVerify(string cAccId,string cCardNum, [FromBody] DeleteMoRoutingBillInput input)
        {
            try
            {
+                logInfo.Debug($"接口标识:MoRoutingBillUnVerify,系统号:{cAccId},单据类型编码:{cCardNum},报文数据:{input.ToJson()}");
+
+
                if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
                    throw new Exception("当前接口不支持此类型的单据");

@@ -360,7 +463,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
            {
                logInfo.Error(ex.Message, ex);

-                return new BaseResult<dynamic> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
+                return new BaseResult<string> {bSuccess = false,message = ex.Message,result = ex.StackTrace};
            }


@@ -376,7 +479,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC90/UnVerify")]
        [Route("api/U8/SFC/FC90/UnVerify/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC90UnVerify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC90UnVerify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillVerify(cAccId, "FC90", input);
        }
@@ -390,7 +493,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC91/UnVerify")]
        [Route("api/U8/SFC/FC91/UnVerify/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC91UnVerify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC91UnVerify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillUnVerify(cAccId, "FC91", input);
        }
@@ -404,7 +507,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
        [HttpPost]
        [Route("api/U8/SFC/FC92/UnVerify")]
        [Route("api/U8/SFC/FC92/UnVerify/{cAccId}")]
-        public async Task<BaseResult<dynamic>> FC92UnVerify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
+        public async Task<BaseResult<string>> FC92UnVerify(string cAccId, [FromBody] DeleteMoRoutingBillInput input)
        {
            return await MoRoutingBillUnVerify(cAccId, "FC92", input);
        }