From bc9d3e64b75ccb077b5efb2cf33bf37dfced0692 Mon Sep 17 00:00:00 2001 From: lxw Date: Sat, 29 Jun 2024 17:35:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E7=94=B5=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebStarter/Controllers/SwapOrderController.cs | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/WebStarter/Controllers/SwapOrderController.cs b/WebStarter/Controllers/SwapOrderController.cs index e1aadc9..0c8a958 100644 --- a/WebStarter/Controllers/SwapOrderController.cs +++ b/WebStarter/Controllers/SwapOrderController.cs @@ -5,6 +5,7 @@ using Entity.Api.Resp; using Entity.DbModel.Station; using Entity.Dto; using HybirdFrameworkCore.Entity; +using log4net; using Magicodes.ExporterAndImporter.Excel; using Microsoft.AspNetCore.Mvc; using Repository.Station; @@ -21,6 +22,8 @@ namespace WebStarter.Controllers; [Route("api/[controller]")] public class SwapOrderController : ControllerBase { + + private static readonly ILog Log = LogManager.GetLogger(typeof(SwapOrderController)); private readonly SwapOrderService swapOrderService; private readonly SwapOrderBatteryService swapOrderBatteryService; private readonly SwapOrderStepService swapOrderStepService; @@ -42,26 +45,29 @@ public class SwapOrderController : ControllerBase [HttpPost("QueryPage")] public async Task>> QueryPage([FromBody] QuerySwapOrderPageReq req) { + Log.Info($"SwapOrderController QueryPage req={req}"); if (!string.IsNullOrEmpty(req.DownBatteryNo)||!string.IsNullOrEmpty(req.UpBatteryNo)) { var result = BatteryCodeList(req); return Result>.Success(result); } - + Log.Info($"查询换电订单 SwapOrderController start QueryPage swapOrderService.QuerySwapOrder req={req}"); var swapOrderResp = swapOrderService.QuerySwapOrder(req); + Log.Info($"查询换电订单 SwapOrderController end QueryPage swapOrderService.QuerySwapOrder req={req}"); //获取所有订单号 var orderSns = swapOrderResp.Rows.Select(row => row.Sn).ToList(); - + Log.Info($"查询上报云平台次数 SwapOrderController start QueryPage swapOrderService.QueryReportCloudNumBySn req={orderSns}"); //查询上报云平台次数 Dictionary queryReportCloudNumBySn = swapOrderService.QueryReportCloudNumBySn(orderSns); - + Log.Info($"查询上报云平台次数 SwapOrderController end QueryPage swapOrderService.QueryReportCloudNumBySn req={orderSns}"); + Log.Info($"查询订单电池数据 SwapOrderController start QueryPage swapOrderBatteryService.QueryListByClause req={orderSns}"); ////查询订单电池数据 List batteryList = swapOrderBatteryService.QueryListByClause(u => orderSns.Contains(u.SwapOrderSn)); - + Log.Info($"查询订单电池数据 SwapOrderController end QueryPage swapOrderBatteryService.QueryListByClause req={orderSns}"); //映射 var config = new MapperConfiguration(cfg => cfg.CreateMap().ReverseMap()); @@ -69,9 +75,9 @@ public class SwapOrderController : ControllerBase List swapOrderBattery = mapper.Map>(batteryList); - + Log.Info($"查询公里数 SwapOrderController start QueryPage swapOrderReportCloudRepository.QueryListByClause req={orderSns}"); List swapOrderReportClouds = swapOrderReportCloudRepository.QueryListByClause(u => orderSns.Contains(u.SwapOrderSn)); - + Log.Info($"查询公里数 SwapOrderController end QueryPage swapOrderReportCloudRepository.QueryListByClause req={orderSns}"); //将电池数据添加到换电订单数据中 foreach (var row in swapOrderResp.Rows) { @@ -88,9 +94,10 @@ public class SwapOrderController : ControllerBase } } } - + Log.Info($"查询订单步序数据 SwapOrderController start QueryPage swapOrderStepService.QueryListByClause req={orderSns}"); //查询订单步序数据 var stepList = swapOrderStepService.QueryListByClause(u => orderSns.Contains(u.SwapOrderSn)); + Log.Info($"查询订单步序数据 SwapOrderController end QueryPage swapOrderStepService.QueryListByClause req={orderSns}"); stepList = stepList.OrderBy(s => s.Sort).ToList(); //映射