diff --git a/Service/Charger/Handler/RecordChargeHandler.cs b/Service/Charger/Handler/RecordChargeHandler.cs index 4cd95ba..6a790a0 100644 --- a/Service/Charger/Handler/RecordChargeHandler.cs +++ b/Service/Charger/Handler/RecordChargeHandler.cs @@ -22,23 +22,23 @@ namespace Service.Charger.Handler [Order(8)] [Scope("InstancePerDependency")] public class RecordChargeHandler : SimpleChannelInboundHandler, IBaseHandler - { + { private static readonly ILog Log = LogManager.GetLogger(typeof(RecordChargeHandler)); private ChargeOrderRepository _chargeOrderRepository; - + /// - /// + /// /// /// public RecordChargeHandler(ChargeOrderRepository chargeOrderRepository) { _chargeOrderRepository = chargeOrderRepository; } - + protected override void ChannelRead0(IChannelHandlerContext ctx, RecordCharge msg) { - + if(ClientMgr.TryGetClient(ctx.Channel, out var sn, out var client)) { float[] powersPeriods = new float[4] { 0, 0, 0, 0 }; //元素索引顺序代表值;1:尖;2:峰;3:平;4:谷 @@ -50,7 +50,7 @@ namespace Service.Charger.Handler if (msg.FlagOfTime6 >= 1 && msg.FlagOfTime6 <= 4){powersPeriods[msg.FlagOfTime6 - 1] += msg.ChargingPowerOfTime6;} if (msg.FlagOfTime7 >= 1 && msg.FlagOfTime7 <= 4){powersPeriods[msg.FlagOfTime7 - 1] += msg.ChargingPowerOfTime7;} if (msg.FlagOfTime8 >= 1 && msg.FlagOfTime8 <= 4){powersPeriods[msg.FlagOfTime8 - 1] += msg.ChargingPowerOfTime8;} - + float[] acPowersPeriods = new float[4] { 0, 0, 0, 0 }; //元素索引顺序代表值;1:尖;2:峰;3:平;4:谷 if (msg.AcFlagOfTime1 >= 1 && msg.AcFlagOfTime1 <= 4){acPowersPeriods[msg.AcFlagOfTime1 - 1] += msg.AcChargingPowerOfTime1;} if (msg.AcFlagOfTime2 >= 1 && msg.AcFlagOfTime2 <= 4){acPowersPeriods[msg.AcFlagOfTime2 - 1] += msg.AcChargingPowerOfTime2;} @@ -101,7 +101,8 @@ namespace Service.Charger.Handler db.EndTime = new DateTime(msg.EndYear + 2000, msg.EndMonth, msg.EndDay, msg.EndHour, msg.EndMinute, msg.EndSecond); db.StartSoc = msg.SocBefore; db.StopSoc = msg.SocAfter; - db.ChargeTimeCount= msg.ChargingTimeCount; + TimeSpan? timeSpan = (db.EndTime - db.StartTime); + db.ChargeTimeCount= timeSpan?.Minutes; db.ElecCount = Convert.ToDecimal(msg.ChargingPower); db.AcElecCount = Convert.ToDecimal(msg.AcMeterElecCount); db.StartAcElec = Convert.ToDecimal(msg.AcMeterDataBefore); @@ -126,4 +127,4 @@ namespace Service.Charger.Handler } } -} \ No newline at end of file +} diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Core.dll b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Core.dll deleted file mode 100644 index 3d82ef1..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Core.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Core.pdb b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Core.pdb deleted file mode 100644 index e036166..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Core.pdb and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Models.dll b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Models.dll deleted file mode 100644 index 3f943f3..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Models.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Models.pdb b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Models.pdb deleted file mode 100644 index 52a6cfa..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Models.pdb and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Repository.dll b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Repository.dll deleted file mode 100644 index 50ca342..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Repository.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Repository.pdb b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Repository.pdb deleted file mode 100644 index 32c26f2..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Repository.pdb and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Services.dll b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Services.dll deleted file mode 100644 index 95feaf7..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Services.dll and /dev/null differ diff --git a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Services.pdb b/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Services.pdb deleted file mode 100644 index 8630804..0000000 Binary files a/WebStarter/bin/Debug/net6.0/SwapBatteryMaersai.Services.pdb and /dev/null differ