From 61580ac13bdafe666a426cedc73d0e4e011f9d77 Mon Sep 17 00:00:00 2001
From: pangwenpeng <17302161021@163.com>
Date: Thu, 25 Jul 2024 16:49:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=97=E8=BD=A6=E6=9C=BA=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/TransportController.cs        |  4 +-
 langguanApi/Model/Washer.cs                   |  2 +-
 langguanApi/Service/TransportService.cs       | 17 +++++---
 langguanApi/Service/WasherService.cs          | 43 ++++++++++---------
 4 files changed, 36 insertions(+), 30 deletions(-)

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
        /// <param name="input"></param>
        /// <returns></returns>
         [HttpPost("addwasherlist")]
-        public async Task<IActionResult> AddWasherList(List<AddWasher> input)
+        public async Task<IActionResult> AddWasherList([FromBody] List<AddWasher> input)
         {
             await _washerService.addWasher(input);
             return Ok(new ApiResult() { code = 0 });
@@ -97,7 +97,7 @@ namespace langguanApi.Controllers
         /// <param name="input"></param>
         /// <returns></returns>
         [HttpPost("addruckscaleslist")]
-        public async Task<IActionResult> AddRuckScalesList(List<AddTruckScalesDto> input)
+        public async Task<IActionResult> AddRuckScalesList([FromBody] List<AddTruckScalesDto> 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 @@
     }
 
     /// <summary>
-    /// 添加洗车机
+    /// 获取洗车机
     /// </summary>
     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<Washer> result = new List<Washer>();
             foreach (var item in input)
             {
-                var entity = input.Adapt<Washer>();
+                var entity = item.Adapt<Washer>();
                 result.Add(entity);
             }
-           
+
             await base.CreateManyAsync(result);
         }
         /// <summary>
@@ -43,9 +43,9 @@ namespace langguanApi.Service
                 var entity = item.Adapt<GetWasherDto>();
                 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<WasherHistoryDto>();
-                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;
         }
+
+
+
     }
-
-
-
-}