洗车机和清洁运输接口调整

langguanApi/Controllers/TransportController.cs

@@ -22,7 +22,7 @@ namespace langguanApi.Controllers
             _truckScalesService = truckScalesService;
         }
         /// <summary>
-        /// 获取门禁列表
+        /// 清洁运输：获取门禁数据和详情
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -67,7 +67,7 @@ namespace langguanApi.Controllers
             return Ok(new ApiResult() { code = 0 });
         }
         /// <summary>
-        /// 获取洗车机列表
+        /// 洗车机：获取洗车机列表和右侧洗车状态等数据，默认右侧显示第一条的记录
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -78,7 +78,7 @@ namespace langguanApi.Controllers
             return Ok(result);
         }
         /// <summary>
-        /// 获取洗车机历史记录(起始时间和结束时间非空，根据起始时间和结束时间筛选数据，如果为空，默认获取30条数据)
+        /// 洗车机：获取历史记录 和导出历史记录
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -106,7 +106,7 @@ namespace langguanApi.Controllers
 
         #region 清洁运输
         /// <summary>
-        /// 获取清洁运输趋势列表(门禁和地磅组合，地磅获取总重量，后期会用地磅重量-车辆车辆)
+        ///  清洁运输：获取清洁运输列表和饼图比例数据            
         /// </summary>
         /// <param name="reqPage"></param>
         /// <returns></returns>

langguanApi/Model/Washer.cs

@@ -172,18 +172,6 @@
         /// </summary>
         public string RunStatusString { get; set; }
         /// <summary>
-        /// 水压报警(WPAlarm 0表示异常，1表示正常)
-        /// </summary>
-        public string WPAlarmString { get; set; }
-        /// <summary>
-        /// 相序报警(PSAlarm0表示异常，1表示正常)
-        /// </summary>
-        public string PSAlarmString { get; set; }
-        /// <summary>
-        /// 故障报警(FaultAlarm 0表示异常，1表示正常)
-        /// </summary>
-        public string FaultAlarmString { get; set; }
-        /// <summary>
         /// 冲洗压力
         /// </summary>
         public double RinsePressure { get; set; }
@@ -196,22 +184,6 @@
         /// </summary>
         public double RinseVoltage { get; set; }
         /// <summary>
-        /// 水流量(Discharge  单位T)
-        /// </summary>
-        public double Discharge { get; set; }
-        /// <summary>
-        /// 电量(Electricity  KW/H)
-        /// </summary>
-        public double Electricity { get; set; }
-        /// <summary>
-        /// 电流(Current A)
-        /// </summary>
-        public double Current { get; set; }
-        /// <summary>
-        /// 水压(WaterPressure MPa)
-        /// </summary>
-        public double WaterPressure { get; set; }
-        /// <summary>
         /// 洗车机编码
         /// </summary>
         public string EquipmentId { get; set; }

langguanApi/Service/TransportService.cs

@@ -84,7 +84,7 @@ namespace langguanApi.Service
             };
         }
         /// <summary>
-        /// 获取清洁运输列表(门禁和地磅组合）
+        ///  获取清洁运输趋势列表(门禁和地磅组合，地磅获取总重量，后期会用地磅重量-车辆车辆)
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -137,7 +137,12 @@ namespace langguanApi.Service
                 result.OtherPrecent = ((double)result.cleans.Count(p => p.Effluent != "电动" && p.Effluent != "国五" && p.Effluent != "国六") / result.cleans.Count()).ToString("0.00");
                 result.OtherWeightPrecent = (result.cleans.Where(p => p.Effluent != "电动" && p.Effluent != "国五" && p.Effluent != "国六").Sum(p => p.Weight) / result.cleans.Sum(p => p.Weight)).ToString("0.00");
             }
-            return result;
+            return new ApiResult()
+            {
+                code = 0,
+                data = new { total=result.cleans.Count, item=result }
+            };
+
         }
 
         /// <summary>

langguanApi/Service/WasherService.cs

@@ -33,25 +33,31 @@ namespace langguanApi.Service
         /// 获取洗车机列表
         /// </summary>
         /// <returns></returns>
-        public async Task<List<GetWasherDto>> getWasherList()
+        public async Task<object> getWasherList()
         {
             Expression<Func<Washer, bool>> exp = filter => filter.IsDelete == false;
-            var result = (await base.GetListWithExp(exp)).ToList();
+            var result = (await base.GetListWithExp(exp)).OrderByDescending(p=>p.CreateDateTime).ToList();
             var washerResult = new List<GetWasherDto>();//转化成需要的数据
             foreach (var item in result)
             {
                 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 ? "异常" : "正常";
                 washerResult.Add(entity);
             }
-            return washerResult;
+            return new ApiResult()
+            {
+                code = 0,
+                data = new
+                {
+                    total = washerResult.Count,
+                    item = washerResult
+
+                }
+            };
         }
         /// <summary>
-        /// 获取洗车机历史记录
+        /// 获取洗车机历史记录(起始时间和结束时间非空，根据起始时间和结束时间筛选数据，如果为空，默认获取30条数据)
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -81,8 +87,17 @@ namespace langguanApi.Service
                     washerHistroyResult = washerHistroyResult.OrderByDescending(p => p.Time).Take(30).ToList();
                 }
             }
-                return washerHistroyResult;
+            return new ApiResult()
-            }
+            {
+                code = 0,
+                data = new
+                {
+                    total=washerHistroyResult.Count,
+                    item= washerHistroyResult
+                 
+                }
+            };
+        }
         }