From 4c0f8b9123f9627be73fff05c2062cffeee42cb7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 04 9月 2024 10:41:49 +0800
Subject: [PATCH] AddInterfaceLogForRequestAsync
---
iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs
index 96655eb..d048e36 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/AccessInterface/AccessInterfaceService.cs
@@ -48,6 +48,7 @@
private readonly IHttpContextAccessor _httpContextAccessor;
private readonly IRepository<WorkPieceProcess, MasterDbContextLocator> _workPieceProcessRep;
private readonly IAccessInterfaceLogService _accessInterfaceLog;
+ private readonly IAccessInterfaceLogForRequestService _accessInterfaceLogForRequest;
private readonly IRepository<WorkPieceInfoLog, MasterDbContextLocator> _WorkPieceInfoLog;
private readonly IRepository<EquipmentCurrentMonitor, MasterDbContextLocator> _equipmentCurrentMonitorRep;
private readonly IRepository<EquipmentBaseInfo, MasterDbContextLocator> _equipmentBaseInfoRep;
@@ -63,7 +64,9 @@
/// <param name="workPieceInfoRep"></param>
/// <param name="httpContextAccessor"></param>
/// <param name="accessInterfaceLog"></param>
- public AccessInterfaceService(IRepository<QualityDataInfo, MasterDbContextLocator> qualityDataInfoRep,
+ public AccessInterfaceService(
+ IAccessInterfaceLogForRequestService accessInterfaceLogForRequest,
+ IRepository<QualityDataInfo, MasterDbContextLocator> qualityDataInfoRep,
IRepository<QualityDataInfoLog, MasterDbContextLocator> qualityDataInfoLogRep,
IRepository<WorkPieceInfo, MasterDbContextLocator> workPieceInfoRep,
IHttpContextAccessor httpContextAccessor,
@@ -77,6 +80,7 @@
, IRepository<ProductionPlanInfo, MasterDbContextLocator> productionPlanInfoRep
, IRepository<ShiftInfo, MasterDbContextLocator> shiftInfoRep)
{
+ _accessInterfaceLogForRequest = accessInterfaceLogForRequest;
_qualityDataInfoRep = qualityDataInfoRep;
_qualityDataInfoLogRep = qualityDataInfoLogRep;
_workPieceInfoRep = workPieceInfoRep;
@@ -300,8 +304,8 @@
{
try
{
- addLog.WorkPieceID = input.WorkPieceID;
- addLog.WorkingProcedureCurrent = input.WorkingProcedure;
+ addLog.WorkPieceID = input?.WorkPieceID;
+ addLog.WorkingProcedureCurrent = input?.WorkingProcedure;
await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
}
@@ -323,7 +327,7 @@
[HttpGet("GetWorkingProcedureForID")]
public async Task<AccessWorPieceInfoOutput> GetWorkingProcedureForID([FromQuery] AccessWorkPieceInfoInput input)
{
- AddAccessInterfaceLogInput addLog = new();
+ AddAccessInterfaceLogForRequestInput addLog = new();
addLog.JsonString = JsonConvert.SerializeObject(input);
addLog.Action = 2;
addLog.Key = input.WorkPieceID;
@@ -337,7 +341,9 @@
if (input == null || string.IsNullOrEmpty(input.WorkPieceID))
{
addLog.Result = "浼犲叆鍙傛暟寮傚父锛氬伐浠跺彿涓嶈兘涓虹┖锛�";
- await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //鏇挎崲[Editby shaocx,2024-09-04]
+ await _accessInterfaceLogForRequest.AddInterfaceLogForRequestAsync(addLog);
throw Oops.Oh(addLog.Result);
}
@@ -346,14 +352,18 @@
if (workPieceInfo == null)
{
addLog.Result = $"浼犲叆鍙傛暟寮傚父锛氬伐浠跺彿{input.WorkPieceID}涓嶈兘鎵惧埌鎸囧畾宸ヤ欢锛�";
- await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //鏇挎崲[Editby shaocx,2024-09-04]
+ await _accessInterfaceLogForRequest.AddInterfaceLogForRequestAsync(addLog);
throw Oops.Oh(addLog.Result);
}
var re = workPieceInfo.Adapt<AccessWorPieceInfoOutput>();
addLog.Result = re;
- await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //鏇挎崲[Editby shaocx,2024-09-04]
+ await _accessInterfaceLogForRequest.AddInterfaceLogForRequestAsync(addLog);
return re;
}
@@ -807,7 +817,7 @@
var workPieceInfo = await _workPieceInfoRep.DetachedEntities
.FirstOrDefaultAsync(w => w.WorkPieceID == input.WorkPieceID.Trim());
- AddAccessInterfaceLogInput addLog = new();
+ AddAccessInterfaceLogForRequestInput addLog = new();
addLog.JsonString = JsonConvert.SerializeObject(input);
addLog.Action = 2;
addLog.Key = input.WorkPieceID;
@@ -818,7 +828,9 @@
addLog.IpAddress = ipAddress.MapToIPv4().ToString();
}
addLog.OperateAddress = $"{_httpContextAccessor.HttpContext.Request.Path}";// {_httpContextAccessor.HttpContext.Request.QueryString}"; //_httpContextAccessor.HttpContext.Request.GetEncodedUrl();
- await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //鏇挎崲[Editby shaocx,2024-09-04]
+ // await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ await _accessInterfaceLogForRequest.AddInterfaceLogForRequestAsync(addLog);
return workPieceInfo == null ? null : workPieceInfo.Adapt<AccessWorPieceInfoOutput>();
}
@@ -865,13 +877,15 @@
await _threadStatusMonitorRep.UpdateAsync(threadStatusMonitor);
}
}
- AddAccessInterfaceLogInput addLog = new();
+ AddAccessInterfaceLogForRequestInput addLog = new();
addLog.JsonString = JsonConvert.SerializeObject(input);
addLog.Action = 1;
addLog.Key = input.Threadcode;
addLog.IpAddress = _httpContextAccessor.HttpContext.Connection.RemoteIpAddress.ToString();
addLog.OperateAddress = $"{_httpContextAccessor.HttpContext.Request.Path}{_httpContextAccessor.HttpContext.Request.QueryString}";
- await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ //鏇挎崲[Editby shaocx,2024-09-04]
+ // await _accessInterfaceLog.AddInterfaceLogAsync(addLog);
+ await _accessInterfaceLogForRequest.AddInterfaceLogForRequestAsync(addLog);
}
#endregion
}
--
Gitblit v1.9.3