diff --git a/langguanApi/Controllers/TransportController.cs b/langguanApi/Controllers/TransportController.cs index 6dafe5f..67f426b 100644 --- a/langguanApi/Controllers/TransportController.cs +++ b/langguanApi/Controllers/TransportController.cs @@ -61,7 +61,7 @@ namespace langguanApi.Controllers /// /// [HttpPost("addwasherlist")] - public async Task AddWasherList(List input) + public async Task AddWasherList([FromBody] List input) { await _washerService.addWasher(input); return Ok(new ApiResult() { code = 0 }); @@ -97,7 +97,7 @@ namespace langguanApi.Controllers /// /// [HttpPost("addruckscaleslist")] - public async Task AddRuckScalesList(List input) + public async Task AddRuckScalesList([FromBody] List input) { await _truckScalesService.AddTruckScalesList(input); return Ok(new ApiResult() { code = 0 }); diff --git a/langguanApi/Model/Washer.cs b/langguanApi/Model/Washer.cs index b7bfbc9..d5953df 100644 --- a/langguanApi/Model/Washer.cs +++ b/langguanApi/Model/Washer.cs @@ -154,7 +154,7 @@ } /// - /// 添加洗车机 + /// 获取洗车机 /// public class GetWasherDto { diff --git a/langguanApi/Service/TransportService.cs b/langguanApi/Service/TransportService.cs index 1908dda..a91e320 100644 --- a/langguanApi/Service/TransportService.cs +++ b/langguanApi/Service/TransportService.cs @@ -110,15 +110,18 @@ namespace langguanApi.Service }); } } - if (!string.IsNullOrWhiteSpace(input.startTime)) + if (result.Any()) { - result.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList(); + if (!string.IsNullOrWhiteSpace(input.startTime)) + { + result.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList(); + } + if (!string.IsNullOrWhiteSpace(input.endTime)) + { + result.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList(); + } + result = result.Skip(input.current - 1).Take(input.pageSize).ToList(); } - if (!string.IsNullOrWhiteSpace(input.endTime)) - { - result.Where(p => Convert.ToDateTime(p.Time) <=Convert.ToDateTime(input.endTime)).ToList(); - } - result = result.Skip(input.current - 1).Take(input.pageSize).ToList(); return result; } diff --git a/langguanApi/Service/WasherService.cs b/langguanApi/Service/WasherService.cs index 3bfb6fd..fe00ba4 100644 --- a/langguanApi/Service/WasherService.cs +++ b/langguanApi/Service/WasherService.cs @@ -23,10 +23,10 @@ namespace langguanApi.Service List result = new List(); foreach (var item in input) { - var entity = input.Adapt(); + var entity = item.Adapt(); result.Add(entity); } - + await base.CreateManyAsync(result); } /// @@ -43,9 +43,9 @@ namespace langguanApi.Service var entity = item.Adapt(); entity.EquipmentStatusString = item.EquipmentStatus == 0 ? "异常" : "正常"; entity.FaultAlarmString = item.FaultAlarm == 0 ? "异常" : "正常"; - entity.PSAlarmString=item.PSAlarm==0?"异常":"正常"; - entity.RunStatusString=item.RunStatus==0?"停止":"运行"; - entity.WPAlarmString=item.WPAlarm==0?"异常":"正常"; + entity.PSAlarmString = item.PSAlarm == 0 ? "异常" : "正常"; + entity.RunStatusString = item.RunStatus == 0 ? "停止" : "运行"; + entity.WPAlarmString = item.WPAlarm == 0 ? "异常" : "正常"; washerResult.Add(entity); } return washerResult; @@ -63,25 +63,28 @@ namespace langguanApi.Service foreach (var item in result) { var entity = item.Adapt(); - entity.StateString=item.State==0?"停止":"运行"; + entity.StateString = item.State == 0 ? "停止" : "运行"; washerHistroyResult.Add(entity); } - if (!string.IsNullOrWhiteSpace(input.startTime)) - { - washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList(); - } - if (!string.IsNullOrWhiteSpace(input.endTime)) - { - washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList(); - } if (washerHistroyResult.Any()) { - washerHistroyResult = washerHistroyResult.OrderByDescending(p => p.Time).Take(30).ToList(); + if (!string.IsNullOrWhiteSpace(input.startTime)) + { + washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) >= Convert.ToDateTime(input.startTime)).ToList(); + } + if (!string.IsNullOrWhiteSpace(input.endTime)) + { + washerHistroyResult = washerHistroyResult.Where(p => Convert.ToDateTime(p.Time) <= Convert.ToDateTime(input.endTime)).ToList(); + } + if (string.IsNullOrWhiteSpace(input.startTime) && string.IsNullOrWhiteSpace(input.endTime)) + { + washerHistroyResult = washerHistroyResult.OrderByDescending(p => p.Time).Take(30).ToList(); + } + } + return washerHistroyResult; } - return washerHistroyResult; } + + + } - - - -}