diff --git a/Service/Api/Resp/CarInfoResp.cs b/Service/Api/Resp/CarInfoResp.cs index 736a39e..71ce863 100644 --- a/Service/Api/Resp/CarInfoResp.cs +++ b/Service/Api/Resp/CarInfoResp.cs @@ -15,7 +15,7 @@ public class CarInfoResp /// 度电数据 /// /// - public ElecMsg? ElecMsg { get; set; } + public ElecInfo? ElecMsg { get; set; } /// /// 车辆信息 diff --git a/Service/Api/Resp/ElecInfo.cs b/Service/Api/Resp/ElecInfo.cs new file mode 100644 index 0000000..2c13632 --- /dev/null +++ b/Service/Api/Resp/ElecInfo.cs @@ -0,0 +1,82 @@ +using HybirdFrameworkCore.Autofac.Attribute; + +namespace Service.Car.Msg.Car.Req; + +public class ElecInfo : BaseMsg +{ + + /// + /// 小计里程 0~16777215 + /// + public double? SubMile { get; set; } + + /// + /// 车辆总里程 0~16777215 + /// + public double? TotalMile { get; set; } + + /// + /// 车辆累计放电量 + /// + public double AccDischargeCount { get; set; } + + /// + /// 车辆累计回馈电量 + /// + public double AccFallbackCount { get; set; } + + /// + /// 车辆累计插枪充电量 + /// + public double AccChargeCount { get; set; } + + /// + /// 5 车辆累计综合能耗 + /// + public double AccKgce { get; set; } + + /// + /// 6 本次实时放电量 + /// + public double ThisTimeRealDischarge { get; set; } + + /// + /// 7 上一次结算放电量 + /// + public double LastTimeBalanceDischarge { get; set; } + + /// + /// 8 本次实时回馈电量 + /// + public double ThisTimeRealFeedbackPower { get; set; } + + /// + /// 9 上一次结算回馈电量 + /// + public double LastTimeBalanceFeedbackPower { get; set; } + + /// + /// 10 本次实时插枪充电量 + /// + public double ThisTimeRealChargeCount { get; set; } + + /// + /// 11 上一次结算插枪充电量 + /// + public double LastTimeBalanceChargeCount { get; set; } + + /// + /// 12 本次实时综合能耗 + /// + public double ThisTimeRealKgce { get; set; } + + /// + /// 13 上一次结算综合能耗 + /// + public double LastTimeBalanceKgce { get; set; } + + /// + /// 14 待结算电费电量 + /// + public double ElectricityToBeSettled { get; set; } +} \ No newline at end of file diff --git a/Service/TBox/Service/TBoxService.cs b/Service/TBox/Service/TBoxService.cs index 9ac7071..773ee6e 100644 --- a/Service/TBox/Service/TBoxService.cs +++ b/Service/TBox/Service/TBoxService.cs @@ -1,3 +1,4 @@ +using AutoMapper; using HybirdFrameworkCore.Utils; using HybirdFrameworkDriver.Session; using log4net; @@ -39,7 +40,10 @@ public class TBoxService ioSession.BusinessMap.TryGetValue("ElecMsg", out var elecMsg); if (elecMsg != null) { - carInfoResp.ElecMsg = (ElecMsg)elecMsg; + ElecMsg value = (ElecMsg)elecMsg; + var config = new MapperConfiguration(cfg => cfg.CreateMap().ReverseMap()); + IMapper mapper = config.CreateMapper(); + carInfoResp.ElecMsg = mapper.Map(value); } ioSession.BusinessMap.TryGetValue("HeartBeatMsg", out var heartBeatMsg); diff --git a/WebStarter/Controllers/CarController.cs b/WebStarter/Controllers/CarController.cs index f0f4730..16fb389 100644 --- a/WebStarter/Controllers/CarController.cs +++ b/WebStarter/Controllers/CarController.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using AutoMapper; using HybirdFrameworkCore.Utils; using HybirdFrameworkDriver.Session; using log4net; @@ -55,7 +56,10 @@ public class CarController : ControllerBase ioSession.BusinessMap.TryGetValue("ElecMsg", out var elecMsg); if (elecMsg != null) { - carInfoResp.ElecMsg = (ElecMsg)elecMsg; + ElecMsg value = (ElecMsg)elecMsg; + var config = new MapperConfiguration(cfg => cfg.CreateMap().ReverseMap()); + IMapper mapper = config.CreateMapper(); + carInfoResp.ElecMsg = mapper.Map(value); } ioSession.BusinessMap.TryGetValue("HeartBeatMsg", out var heartBeatMsg);