提交
This commit is contained in:
@@ -45,7 +45,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
[Route("api/U8/SFC/MoRoutingBillSave")]
|
||||
public async Task<BaseResult<string>> MoRoutingBillSave(string cAccId,string cCardNum, [FromBody] Dictionary<string, object> input)
|
||||
{
|
||||
var taskId = 0L;
|
||||
//var taskId = 0L;
|
||||
|
||||
var db = CommUnit.GetDbClient();
|
||||
|
||||
@@ -58,48 +58,50 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
if (cCardNum != "FC90" && cCardNum != "FC91" && cCardNum != "FC92")
|
||||
throw new Exception("当前接口不支持此类型的单据");
|
||||
|
||||
var runtimes = 0;
|
||||
//var runtimes = 0;
|
||||
|
||||
var u8mTask = new SysU8MTask()
|
||||
{
|
||||
U8MPool = $"U8M_{cAccId}"
|
||||
};
|
||||
//var u8mTask = new SysU8MTask()
|
||||
//{
|
||||
// U8MPool = $"U8M_{cAccId}"
|
||||
//};
|
||||
|
||||
#if !DEBUG
|
||||
while (await db.Queryable<SysU8MTask>().AnyAsync())
|
||||
{
|
||||
if (runtimes > 20)
|
||||
{
|
||||
throw new Exception("当前任务队列过长");
|
||||
}
|
||||
//#if !DEBUG
|
||||
// while (await db.Queryable<SysU8MTask>().AnyAsync())
|
||||
// {
|
||||
// if (runtimes > 20)
|
||||
// {
|
||||
// throw new Exception("当前任务队列过长");
|
||||
// }
|
||||
|
||||
runtimes++;
|
||||
// runtimes++;
|
||||
|
||||
await Task.Delay(100 * runtimes);
|
||||
// await Task.Delay(100 * runtimes);
|
||||
|
||||
//u8mTask.Id = DateTime.Now.Ticks;
|
||||
// //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();
|
||||
}
|
||||
// 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();
|
||||
// }
|
||||
|
||||
}
|
||||
#endif
|
||||
// }
|
||||
//#endif
|
||||
|
||||
u8mTask.dDate = DateTime.Now;
|
||||
//u8mTask.dDate = DateTime.Now;
|
||||
|
||||
//if (u8mTask.Id == null)
|
||||
//{
|
||||
// u8mTask.Id = DateTime.Now.Ticks;
|
||||
//}
|
||||
|
||||
taskId = await db.Insertable(u8mTask).ExecuteReturnSnowflakeIdAsync();
|
||||
//taskId = await db.Insertable(u8mTask).ExecuteReturnSnowflakeIdAsync();
|
||||
|
||||
logInfo.Debug($"开始操作,当前任务ID:{taskId}");
|
||||
//var taskid = SnowFlakeSingle.Instance.NextId();
|
||||
|
||||
//logInfo.Debug($"开始操作,当前任务ID:{taskId}");
|
||||
//if (!_cache.TryGetValue($"U8M_{cAccId}", out BaseLogin baseLogin))
|
||||
//{
|
||||
// _cache.Clear();
|
||||
@@ -113,37 +115,57 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
throw new Exception("未能加载指定系统号的登录信息");
|
||||
}
|
||||
|
||||
logInfo.Debug($"开始登录,当前任务ID:{taskId}");
|
||||
logInfo.Debug("开始登录");
|
||||
|
||||
baseLogin.Init(param,true);
|
||||
|
||||
//_cache.Set($"U8M_{cAccId}", baseLogin);
|
||||
//}
|
||||
|
||||
|
||||
var bf = new MoRoutingBill();
|
||||
|
||||
logInfo.Debug($"开始保存,当前任务ID:{taskId}");
|
||||
|
||||
var bo = new MoRoutingBill();
|
||||
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);
|
||||
res = bo.Save(cCardNum, inputs);
|
||||
}
|
||||
else
|
||||
{
|
||||
res = bf.Save(cCardNum, input);
|
||||
res = bo.Save(cCardNum, input);
|
||||
}
|
||||
|
||||
logInfo.Debug($"退出登录,当前任务ID:{taskId}");
|
||||
baseLogin.ShutDown();
|
||||
//loader.Unload();
|
||||
|
||||
if (taskId != 0)
|
||||
{
|
||||
await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
|
||||
}
|
||||
//var res= loader.Save(param, cCardNum, input);
|
||||
|
||||
|
||||
|
||||
|
||||
//_cache.Set($"U8M_{cAccId}", baseLogin);
|
||||
//}
|
||||
|
||||
|
||||
//var bf = new MoRoutingBill();
|
||||
|
||||
logInfo.Debug($"开始保存");
|
||||
|
||||
//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($"退出登录");
|
||||
//baseLogin.ShutDown();
|
||||
|
||||
//if (taskId != 0)
|
||||
//{
|
||||
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
|
||||
//}
|
||||
|
||||
return res;
|
||||
|
||||
@@ -152,21 +174,21 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
{
|
||||
logInfo.Error(ex.Message, ex);
|
||||
|
||||
if (taskId != 0)
|
||||
{
|
||||
await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
|
||||
}
|
||||
//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();
|
||||
}
|
||||
//if (taskId != 0)
|
||||
//{
|
||||
// await db.Deleteable<SysU8MTask>(taskId).ExecuteCommandAsync();
|
||||
//}
|
||||
|
||||
baseLogin?.ShutDown();
|
||||
//baseLogin?.ShutDown();
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user