From 772514da44efbeffaa96f26fbbf957b3ed7d54a1 Mon Sep 17 00:00:00 2001 From: pangwenpeng <17302161021@163.com> Date: Thu, 8 Aug 2024 17:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=97=E8=BD=A6=E6=9C=BA=E5=92=8C=E6=B8=85?= =?UTF-8?q?=E6=B4=81=E8=BF=90=E8=BE=93=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/TransportController.cs | 8 ++--- langguanApi/Model/Washer.cs | 28 ---------------- langguanApi/Service/TransportService.cs | 9 +++-- langguanApi/Service/WasherService.cs | 33 ++++++++++++++----- 4 files changed, 35 insertions(+), 43 deletions(-) diff --git a/langguanApi/Controllers/TransportController.cs b/langguanApi/Controllers/TransportController.cs index 453c47d..51a2535 100644 --- a/langguanApi/Controllers/TransportController.cs +++ b/langguanApi/Controllers/TransportController.cs @@ -22,7 +22,7 @@ namespace langguanApi.Controllers _truckScalesService = truckScalesService; } /// - /// 获取门禁列表 + /// 清洁运输：获取门禁数据和详情 /// /// /// @@ -67,7 +67,7 @@ namespace langguanApi.Controllers return Ok(new ApiResult() { code = 0 }); } /// - /// 获取洗车机列表 + /// 洗车机：获取洗车机列表和右侧洗车状态等数据，默认右侧显示第一条的记录 /// /// /// @@ -78,7 +78,7 @@ namespace langguanApi.Controllers return Ok(result); } /// - /// 获取洗车机历史记录(起始时间和结束时间非空，根据起始时间和结束时间筛选数据，如果为空，默认获取30条数据) + /// 洗车机：获取历史记录 和导出历史记录 /// /// /// @@ -106,7 +106,7 @@ namespace langguanApi.Controllers #region 清洁运输 /// - /// 获取清洁运输趋势列表(门禁和地磅组合，地磅获取总重量，后期会用地磅重量-车辆车辆) + /// 清洁运输：获取清洁运输列表和饼图比例数据 /// /// /// diff --git a/langguanApi/Model/Washer.cs b/langguanApi/Model/Washer.cs index d5953df..21c6121 100644 --- a/langguanApi/Model/Washer.cs +++ b/langguanApi/Model/Washer.cs @@ -172,18 +172,6 @@ /// public string RunStatusString { get; set; } /// - /// 水压报警(WPAlarm 0表示异常，1表示正常) - /// - public string WPAlarmString { get; set; } - /// - /// 相序报警(PSAlarm0表示异常，1表示正常) - /// - public string PSAlarmString { get; set; } - /// - /// 故障报警(FaultAlarm 0表示异常，1表示正常) - /// - public string FaultAlarmString { get; set; } - /// /// 冲洗压力 /// public double RinsePressure { get; set; } @@ -196,22 +184,6 @@ /// public double RinseVoltage { get; set; } /// - /// 水流量(Discharge 单位T) - /// - public double Discharge { get; set; } - /// - /// 电量(Electricity KW/H) - /// - public double Electricity { get; set; } - /// - /// 电流(Current A) - /// - public double Current { get; set; } - /// - /// 水压(WaterPressure MPa) - /// - public double WaterPressure { get; set; } - /// /// 洗车机编码 /// public string EquipmentId { get; set; } diff --git a/langguanApi/Service/TransportService.cs b/langguanApi/Service/TransportService.cs index 2ad64c6..1285121 100644 --- a/langguanApi/Service/TransportService.cs +++ b/langguanApi/Service/TransportService.cs @@ -84,7 +84,7 @@ namespace langguanApi.Service }; } /// - /// 获取清洁运输列表(门禁和地磅组合） + /// 获取清洁运输趋势列表(门禁和地磅组合，地磅获取总重量，后期会用地磅重量-车辆车辆) /// /// /// @@ -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 } + }; + } /// diff --git a/langguanApi/Service/WasherService.cs b/langguanApi/Service/WasherService.cs index fe00ba4..6e18ff8 100644 --- a/langguanApi/Service/WasherService.cs +++ b/langguanApi/Service/WasherService.cs @@ -33,25 +33,31 @@ namespace langguanApi.Service /// 获取洗车机列表 /// /// - public async Task> getWasherList() + public async Task getWasherList() { Expression> 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();//转化成需要的数据 foreach (var item in result) { 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 ? "异常" : "正常"; washerResult.Add(entity); } - return washerResult; + return new ApiResult() + { + code = 0, + data = new + { + total = washerResult.Count, + item = washerResult + + } + }; } /// - /// 获取洗车机历史记录 + /// 获取洗车机历史记录(起始时间和结束时间非空，根据起始时间和结束时间筛选数据，如果为空，默认获取30条数据) /// /// /// @@ -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 + + } + }; + } }