eaXing
/
eaxing_back_africa_main
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改小布状态

Browse Source
master
zby 2 months ago
parent 3849f025ee
commit 194c122ee4
2 changed files with 105 additions and 104 deletions
Show Stats Download Patch File Download Diff File

200
Service/MyJob/UpdateDownBatteryInfoTask.cs
Unescape View File

@ -8,101 +8,105 @@ using Service.Mgr;
namespace Service.MyTask;
///// <summary>
///// 充电结束上报云平台task
///// </summary>
//[Scope]
//public class UpdateDownBatteryInfoTask : ITask
//{
// private static readonly ILog Log = LogManager.GetLogger(typeof(UpdateDownBatteryInfoTask));
// private volatile bool _stop;
// public SwapOrderBatteryRepository _swapOrderBatteryRepository { get; set; }
// public BinInfoRepository _BinInfoRepository { get; set; }
// public string Name()
// {
// return "UpdateDownBatteryInfoTask";
// }
// public int Interval()
// {
// return 1000 * 2;
// }
// public void Handle()
// {
// try
// {
// List<SwapOrderBattery> batterys =
// _swapOrderBatteryRepository.QueryListByClause(
// i => (i.DownBatteryNo == null || i.DownBatterySoc<0) && i.DownBatteryBinNo != null);
// if (batterys.Count <= 0)
// {
// return;
// }
// List<string> downBatteryBinNos = batterys.Select(i => i.DownBatteryBinNo.ToString()).ToList();
// Dictionary<string, BinInfo> binInfosMap = _BinInfoRepository
// .QueryListByClause(i => downBatteryBinNos.Contains(i.No) && i.Exists==1).ToDictionary(i => i.No);
// List<SwapOrderBattery> updateDbBattery = new List<SwapOrderBattery>();
// foreach (var battery in batterys)
// {
// //更新换下电池包
// binInfosMap.TryGetValue(battery.DownBatteryBinNo.ToString(), out BinInfo info);
// if (info.BatteryNo == null || info.BatteryNo == "" || info.BatteryNo == "-1")
// {
// continue;
// }
// if (info.Soc == null || info.Soc <=0)
// {
// continue;
// }
// /*if (!info.BatteryNo.Equals(battery.DownBatteryNo))
// {
// continue;
// }*/
// battery.DownBatteryNo = info.BatteryNo;
// battery.DownBatterySoc = info.Soc;
// battery.DownBatterySoe = info.Soe;
// updateDbBattery.Add(battery);
// }
// if (updateDbBattery.Count > 0)
// {
// Log.Info(
// $" UpdateDownBatteryInfoTask update DowmBatteryInfo db={JsonConvert.SerializeObject(updateDbBattery)}");
// _swapOrderBatteryRepository.Update(updateDbBattery);
// }
// }
// catch (Exception e)
// {
// Log.Error($" UpdateDownBatteryInfoTask err e={e}");
// }
// }
// public bool Stoped()
// {
// return _stop;
// }
// public void Stop()
// {
// _stop = true;
// }
// public void ResetStop()
// {
// _stop = false;
// }
//}
/// <summary>
/// 充电结束上报云平台task
/// </summary>
[Scope]
public class UpdateDownBatteryInfoTask : ITask
{
private static readonly ILog Log = LogManager.GetLogger(typeof(UpdateDownBatteryInfoTask));
private volatile bool _stop;
public SwapOrderBatteryRepository _swapOrderBatteryRepository { get; set; }
public BinInfoRepository _BinInfoRepository { get; set; }
public string Name()
{
return "UpdateDownBatteryInfoTask";
}
public int Interval()
{
return 1000 * 2;
}
public void Handle()
{
try
{
List<SwapOrderBattery> batterys =
_swapOrderBatteryRepository.QueryListByClause(
i => (i.DownBatteryNo == null || i.DownBatterySoc < 0) && i.DownBatteryBinNo != null);
if (batterys.Count <= 0)
{
return;
}
List<string> downBatteryBinNos = batterys.Select(i => i.DownBatteryBinNo.ToString()).ToList();
Dictionary<string, BinInfo> binInfosMap = _BinInfoRepository
.QueryListByClause(i => downBatteryBinNos.Contains(i.No) && i.Exists == 1).ToDictionary(i => i.No);
List<SwapOrderBattery> updateDbBattery = new List<SwapOrderBattery>();
foreach (var battery in batterys)
{
//更新换下电池包
binInfosMap.TryGetValue(battery.DownBatteryBinNo.ToString(), out BinInfo info);
if (info == null) {
continue;
}
if (info.BatteryNo == null || info.BatteryNo == "" || info.BatteryNo == "-1")
{
continue;
}
if (info.Soc == null || info.Soc <= 0)
{
continue;
}
/*if (!info.BatteryNo.Equals(battery.DownBatteryNo))
{
continue;
}*/
battery.DownBatteryNo = info.BatteryNo;
battery.DownBatterySoc = info.Soc;
battery.DownBatterySoe = info.Soe;
updateDbBattery.Add(battery);
}
if (updateDbBattery.Count > 0)
{
Log.Info(
$" UpdateDownBatteryInfoTask update DowmBatteryInfo db={JsonConvert.SerializeObject(updateDbBattery)}");
_swapOrderBatteryRepository.Update(updateDbBattery);
}
}
catch (Exception e)
{
Log.Error($" UpdateDownBatteryInfoTask err e={e}");
}
}
public bool Stoped()
{
return _stop;
}
public void Stop()
{
_stop = true;
}
public void ResetStop()
{
_stop = false;
}
}

9
WebStarter/Controllers/SwapMonitorController.cs
Unescape View File

@ -26,9 +26,9 @@ public class SwapMonitorController : ControllerBase
private readonly BinInfoService _binInfoService;
private readonly IStringLocalizer<SwapMonitorController> _localizer;
public SwapMonitorController(IStringLocalizer<SwapMonitorController> localizer,MonitorService swapMonitorService, BinInfoService binInfoService)
public SwapMonitorController(MonitorService swapMonitorService, BinInfoService binInfoService)
{
_localizer = localizer;
_swapMonitorService = swapMonitorService;
_binInfoService = binInfoService;
}
@ -54,10 +54,7 @@ public class SwapMonitorController : ControllerBase
var respList = _swapMonitorService.GetSwapMonitorData();
foreach (var item in respList.Data?.StateInfo)
{
item.StepName = _localizer[item.StepNo.ToString()];
}
return respList;
}

Write Preview
Loading…
Cancel
Save