增加交易唯一码,方便在网络状态不佳的情况下重新获取操作结果
This commit is contained in:
@@ -1,16 +1,11 @@
|
||||
using log4net;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using SqlSugar;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.ServiceModel;
|
||||
using System.Threading.Tasks;
|
||||
using System.Web;
|
||||
using System.Web.Http;
|
||||
using System.Web.Http.Description;
|
||||
using System.Web.UI.WebControls;
|
||||
using UFIDA.U8.Framework.Api.Common.Entity;
|
||||
using UFIDA.U8.Framework.Api.ControlObject.Common;
|
||||
using UFIDA.U8.Framework.Api.ControlObject.Entity;
|
||||
@@ -45,7 +40,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
{
|
||||
try
|
||||
{
|
||||
|
||||
|
||||
_logInfo.Debug($"当前接口:api/U8/DP/Login,参数:{input.ToJson()}");
|
||||
|
||||
var db = CommUnit.GetDbClient();
|
||||
@@ -64,7 +59,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
pDate = string.IsNullOrWhiteSpace(input.pDate) ? $"{DateTime.Today:yyyy-MM-dd}" : input.pDate,
|
||||
pPassword = string.IsNullOrWhiteSpace(input.pPassword) ? "" : CommUnit.GetDecrypt(input.pPassword),
|
||||
pYearId = string.IsNullOrWhiteSpace(input.pDate) ? $"{DateTime.Today.Year}" : $"{DateTime.Parse(input.pDate).Year}",
|
||||
pSubId = "DP",
|
||||
pSubId = "DP",
|
||||
pUserId = input.pUserId
|
||||
};
|
||||
|
||||
@@ -366,7 +361,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Route("api/U8/DP/UploadConfig")]
|
||||
public async Task<BaseResult<string>> UploadConfig(string cKey,[FromBody] List<Dictionary<string,object>> inputs)
|
||||
public async Task<BaseResult<string>> UploadConfig(string cKey, [FromBody] List<Dictionary<string, object>> inputs)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -389,7 +384,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
|
||||
return new BaseResult<string> { bSuccess = false, message = "查询失败", result = ex.Message };
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -405,7 +400,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
{
|
||||
var fileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"App_Data/{cKey}.json");
|
||||
|
||||
var txt=File.ReadAllText(fileName );
|
||||
var txt = File.ReadAllText(fileName);
|
||||
|
||||
return new BaseResult<string>()
|
||||
{
|
||||
@@ -458,9 +453,14 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 注册子系统
|
||||
/// </summary>
|
||||
/// <param name="input"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost]
|
||||
[Route("api/U8/DP/InitSubSystem")]
|
||||
public async Task<BaseResult<long>> InitSubSystem(Dictionary<string,string> input)
|
||||
public async Task<BaseResult<long>> InitSubSystem(Dictionary<string, string> input)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -476,7 +476,7 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
throw new Exception("当前子系统已注册");
|
||||
}
|
||||
|
||||
info.Id=SnowFlakeSingle.instance.NextId();
|
||||
info.Id = SnowFlakeSingle.instance.NextId();
|
||||
|
||||
await db.Insertable(info).ExecuteCommandAsync();
|
||||
|
||||
@@ -491,6 +491,52 @@ namespace UFIDA.U8.Framework.Api.Controllers.U8
|
||||
|
||||
return new BaseResult<long>() { bSuccess = false, message = "子系统初始化失败", result = 0 };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取接口执行结果
|
||||
/// </summary>
|
||||
/// <param name="tradeid"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet]
|
||||
[Route("api/U8/AA/Result")]
|
||||
[Route("api/U8/AP/Result")]
|
||||
[Route("api/U8/DP/Result")]
|
||||
[Route("api/U8/MO/Result")]
|
||||
[Route("api/U8/PU/Result")]
|
||||
[Route("api/U8/SA/Result")]
|
||||
[Route("api/U8/SFC/Result")]
|
||||
[Route("api/U8/SF/Result")]
|
||||
[Route("api/U8/ST/Result")]
|
||||
[Route("api/U8/Workflow/Result")]
|
||||
public async Task<BaseResult<string>> Result(string tradeid)
|
||||
{
|
||||
try
|
||||
{
|
||||
var db = CommUnit.GetDbClient();
|
||||
|
||||
var entity = await db.Queryable<SysTradeResult>().Where(a=>a.cTradeId==tradeid).FirstAsync();
|
||||
|
||||
if (entity==null)
|
||||
{
|
||||
throw new Exception($"未能找到请求ID:{tradeid}的结果");
|
||||
}
|
||||
|
||||
if (entity.bRun == true)
|
||||
{
|
||||
throw new Exception($"请求ID:{tradeid}正在执行");
|
||||
}
|
||||
|
||||
return entity.cResult;
|
||||
|
||||
} catch (Exception ex)
|
||||
{
|
||||
_logInfo.Error(ex.Message, ex);
|
||||
|
||||
return new BaseResult<string>() { bSuccess = false, message = ex.Message, result = ex.Message };
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user