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

现场调试提交

Browse Source
master
CZ 4 months ago
parent 284f32b215
commit 4f6c558b66
3 changed files with 97 additions and 22 deletions
Show Stats Download Patch File Download Diff File

99
Entity/DbModel/Station/ChargeOrder.cs
Unescape View File

@ -138,37 +138,37 @@ namespace Entity.DbModel.Station
[SugarColumn(ColumnName = "ac_elec_count")]
public decimal? AcElecCount { get; set; }
/// <summary>
/*/// <summary>
/// Desc:充电开始交流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "start_ac_elec")]
public decimal? StartAcElec { get; set; }
public decimal? StartAcElec { get; set; }*/
/// <summary>
/*/// <summary>
/// Desc:充电结束交流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "stop_ac_elec")]
public decimal? StopAcElec { get; set; }
public decimal? StopAcElec { get; set; }*/
/// <summary>
/*/// <summary>
/// Desc:充电开始直流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "start_dc_elec")]
public decimal? StartDcElec { get; set; }
public decimal? StartDcElec { get; set; }*/
/// <summary>
/*/// <summary>
/// Desc:充电结束直流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "stop_dc_elec")]
public decimal? StopDcElec { get; set; }
public decimal? StopDcElec { get; set; }*/
/// <summary>
/// Desc:停止原因;0：满电自动停止；1-人工停止
@ -178,7 +178,7 @@ namespace Entity.DbModel.Station
[SugarColumn(ColumnName = "stop_reason")]
public int? StopReason { get; set; }
/// <summary>
/*/// <summary>
/// Desc:尖时段电量
/// Default:
/// Nullable:True
@ -240,15 +240,15 @@ namespace Entity.DbModel.Station
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "ac_valley_elec_count")]
public decimal? ACValleyElecCount { get; set; }
public decimal? ACValleyElecCount { get; set; }*/
/// <summary>
/*/// <summary>
/// Desc:电价版本号
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "elec_price_model_version")]
public string ElecPriceModelVersion { get; set; }
public string ElecPriceModelVersion { get; set; }*/
/// <summary>
/// Desc:换电订单编号
@ -289,10 +289,81 @@ namespace Entity.DbModel.Station
[SugarColumn(ColumnName = "start_type")]
public int StartType { get; set; }
/// <summary>
/*/// <summary>
/// 上报次数
/// </summary>
[SugarColumn(ColumnName = "reporting_times")]
public int ReportingTimes { get; set; }
public int ReportingTimes { get; set; }*/
/// <summary>
/// Desc:充电开始交流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "start_ac_elec1")]
public decimal? StartAcElec1 { get; set; }
[SugarColumn(ColumnName = "start_ac_elec2")]
public decimal? StartAcElec2 { get; set; }
/// <summary>
/// Desc:充电结束交流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "stop_ac_elec1")]
public decimal? StopAcElec1 { get; set; }
[SugarColumn(ColumnName = "stop_ac_elec2")]
public decimal? StopAcElec2 { get; set; }
/// <summary>
/// Desc:充电开始直流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "start_dc_elec1")]
public decimal? StartDcElec1 { get; set; }
[SugarColumn(ColumnName = "start_dc_elec2")]
public decimal? StartDcElec2 { get; set; }
/// <summary>
/// Desc:充电结束直流表电量
/// Default:
/// Nullable:True
/// </summary>
[SugarColumn(ColumnName = "stop_dc_elec1")]
public decimal? StopDcElec1 { get; set; }
[SugarColumn(ColumnName = "stop_dc_elec2")]
public decimal? StopDcElec2 { get; set; }
/// <summary>
/// 充电金额
/// </summary>
[SugarColumn(ColumnName = "charge_amount")]
public decimal? ChargeAmount { get; set; }
/// <summary>
/// 充电前卡余额
/// </summary>
[SugarColumn(ColumnName = "card_balance_before")]
public decimal? CardBalanceBefore { get; set; }
/// <summary>
/// 充电后卡余额
/// </summary>
[SugarColumn(ColumnName = "card_balance_behind")]
public decimal? CardBalanceBehind { get; set; }
/// <summary>
/// 交易流水号
/// </summary>
[SugarColumn(ColumnName = "transaction_serial_num")]
public string TransactionSerialNum { get; set; }
}
}

4
Service/Station/ChargeOrderService.cs
Unescape View File

@ -147,11 +147,11 @@ public class ChargeOrderService : BaseServices<ChargeOrder>
Expression<Func<ChargeOrder, bool>> condition2Expr = u => u.StopReason == chargeOrder.StopReason;
where = where == null ? condition2Expr : Expression.Lambda<Func<ChargeOrder, bool>>(Expression.AndAlso(where.Body, condition2Expr.Body), parameter);
}
if (!string.IsNullOrEmpty(chargeOrder.ElecPriceModelVersion))
/*if (!string.IsNullOrEmpty(chargeOrder.ElecPriceModelVersion))
{
Expression<Func<ChargeOrder, bool>> condition2Expr = u => u.ElecPriceModelVersion == chargeOrder.ElecPriceModelVersion;
where = where == null ? condition2Expr : Expression.Lambda<Func<ChargeOrder, bool>>(Expression.AndAlso(where.Body, condition2Expr.Body), parameter);
}
}*/
if (!string.IsNullOrEmpty(chargeOrder.SwapOrderSn))
{
Expression<Func<ChargeOrder, bool>> condition2Expr = u => u.SwapOrderSn == chargeOrder.SwapOrderSn;

16
Service/Station/MonitorService.cs
Unescape View File

@ -98,14 +98,18 @@ public class MonitorService
var tboxCarInfoModel = StationSoftMgr.SwappingStateMachine.BoxCarInfoModel;
List<BinInfo> binInfos = BinInfoRepository.QueryListByClause(i => i.Exists == 1 && i.Status == 1);
var plcSwapModel = new PlcSwapModelResp();
if(ClientMgr.PlcClient!=null)
{
plcSwapModel.ModelState = ClientMgr.PlcClient.Auto ? 1010 : 1000;
plcSwapModel.ControlModel = ClientMgr.PlcClient.Remote ? 1010 : 1000;
}
SwapMonitorScreenResp monitorScreenResp = new()
{
PlcSwapModel = new PlcSwapModelResp()
{
ModelState = ClientMgr.PlcClient.Auto?1010:1000,
//StationInLampSts = ClientMgr.PlcClient.
ControlModel = ClientMgr.PlcClient.Remote?1010:1000,
},
PlcSwapModel = plcSwapModel,
StateInfo = stateInfoList,
VehicleInfo = new SwapVehicleResp()
{

Write Preview
Loading…
Cancel
Save