Commit f697c92e authored by 吴春's avatar 吴春

1

parent 047eab17
...@@ -12,7 +12,7 @@ namespace Edu.Common.API ...@@ -12,7 +12,7 @@ namespace Edu.Common.API
public int AccountId { get; set; } public int AccountId { get; set; }
public int ApplicationId { get; set; } public int ApplicationId { get; set; }
public string KeyWord { get; set; } public string KeyWord { get; set; }
public string TimeUtc { get; set; } public int LogId { get; set; }
public int Status { get; set; } public int Status { get; set; }
public string CompletionResultModel { get; set; } public string CompletionResultModel { get; set; }
......
...@@ -229,9 +229,8 @@ namespace Edu.WebApi.Controllers.AI ...@@ -229,9 +229,8 @@ namespace Edu.WebApi.Controllers.AI
return ApiResult.Failed(jsonObject.GetStringValue("msg")); return ApiResult.Failed(jsonObject.GetStringValue("msg"));
} }
} }
return ApiResult.Failed("获取失败");
} }
return ApiResult.Success(); return ApiResult.Failed("解析失败!");
} }
else if (supplierModel.SupplierType == Common.Enum.AI.SupplierTypeEnum.OpenAI) else if (supplierModel.SupplierType == Common.Enum.AI.SupplierTypeEnum.OpenAI)
{ {
...@@ -247,18 +246,21 @@ namespace Edu.WebApi.Controllers.AI ...@@ -247,18 +246,21 @@ namespace Edu.WebApi.Controllers.AI
AccountId = this.AppletUserInfo.AccountId, AccountId = this.AppletUserInfo.AccountId,
ApplicationId = applicationId, ApplicationId = applicationId,
KeyWord = keyWord, KeyWord = keyWord,
TimeUtc = dateStr, LogId = 0,
Status = 0, Status = 0,
CompletionResultModel = "", CompletionResultModel = "",
}; };
Cache.User.UserReidsCache.Set(this.AppletUserInfo.AccountId + "_" + "TimeUtc" + dateStr, resultModel, Common.Config.JwtExpirTime);
var result = openai.Completions.CreateCompletionAsync(completion); var result = openai.Completions.CreateCompletionAsync(completion);
int addId = aiModule.SetAIUseLogModule(userLogModel); int addId = aiModule.SetAIUseLogModule(userLogModel);
if (addId > 0)
{
Cache.User.UserReidsCache.Set(this.AppletUserInfo.AccountId + "_" + "LogId_" + addId, resultModel, Common.Config.JwtExpirTime);
if (result != null) if (result != null)
{ {
try try
{ {
var returnModel = Cache.User.UserReidsCache.OpenAIGet(this.AppletUserInfo.AccountId + "_" + "TimeUtc" + dateStr); resultModel.LogId = addId;
var returnModel = Cache.User.UserReidsCache.OpenAIGet(this.AppletUserInfo.AccountId + "_" + "LogId_" + addId);
if (returnModel != null) if (returnModel != null)
{ {
returnModel.Status = 1; returnModel.Status = 1;
...@@ -268,9 +270,8 @@ namespace Edu.WebApi.Controllers.AI ...@@ -268,9 +270,8 @@ namespace Edu.WebApi.Controllers.AI
completionResult = JsonHelper.Serialize(result.Result); completionResult = JsonHelper.Serialize(result.Result);
} }
returnModel.CompletionResultModel = completionResult; returnModel.CompletionResultModel = completionResult;
Cache.User.UserReidsCache.Set(this.AppletUserInfo.AccountId + "_" + "TimeUtc" + dateStr, resultModel, Common.Config.JwtExpirTime); Cache.User.UserReidsCache.Set(this.AppletUserInfo.AccountId + "_" + "LogId_" + addId, resultModel, Common.Config.JwtExpirTime);
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -279,7 +280,8 @@ namespace Edu.WebApi.Controllers.AI ...@@ -279,7 +280,8 @@ namespace Edu.WebApi.Controllers.AI
} }
return ApiResult.Success(data: new { result = resultModel, Id = addId }); return ApiResult.Success(data: new { result = resultModel, Id = addId });
} }
return ApiResult.Success(); }
return ApiResult.Failed("解析失败!");
} }
/// <summary> /// <summary>
...@@ -289,18 +291,18 @@ namespace Edu.WebApi.Controllers.AI ...@@ -289,18 +291,18 @@ namespace Edu.WebApi.Controllers.AI
[HttpPost] [HttpPost]
public ApiResult GetOpenAIResult() public ApiResult GetOpenAIResult()
{ {
string dateStr = base.ParmJObj.GetStringValue("TimeUtc"); //string dateStr = base.ParmJObj.GetStringValue("TimeUtc");
int Id = base.ParmJObj.GetInt("Id", 0); int Id = base.ParmJObj.GetInt("Id", 0);
if (string.IsNullOrWhiteSpace(dateStr) || Id <= 0) if (Id <= 0)
{ {
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
var returnModel = Cache.User.UserReidsCache.OpenAIGet(this.AppletUserInfo.AccountId + "_" + "TimeUtc" + dateStr); var returnModel = Cache.User.UserReidsCache.OpenAIGet(this.AppletUserInfo.AccountId + "_" + "LogId_" + Id);
if (returnModel == null) if (returnModel == null)
{ {
return ApiResult.Failed("获取失败请重新调用"); return ApiResult.Failed("获取失败请重新调用");
} }
else else if (returnModel.Status == 1)
{ {
var model = aiModule.GetAIUseLogEntity(Id); var model = aiModule.GetAIUseLogEntity(Id);
model.ResultInfo = returnModel.CompletionResultModel; model.ResultInfo = returnModel.CompletionResultModel;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment