diff --git a/Service/Cloud/Client/CloudClient.cs b/Service/Cloud/Client/CloudClient.cs
index a77e76a..c24b09a 100644
--- a/Service/Cloud/Client/CloudClient.cs
+++ b/Service/Cloud/Client/CloudClient.cs
@@ -17,6 +17,7 @@ using MQTTnet.Formatter;
using MQTTnet.Protocol;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
+using Org.BouncyCastle.Utilities;
using Repository.Station;
using Service.Cloud.Handler;
using Service.Cloud.Msg;
@@ -25,6 +26,7 @@ using Service.Cloud.Msg.Cloud.Resp;
using Service.Cloud.Msg.Cloud.Resp.OutCharger;
using Service.Cloud.Msg.Host.Req;
using Service.Cloud.Msg.Host.Req.OutCharger;
+using Service.Cloud.Msg.Host.Resp;
namespace Service.Cloud.Client;
@@ -73,29 +75,57 @@ public class CloudClient : IMqttClientConnectedHandler, IMqttApplicationMessageR
public CarCanStart? CarCanStart { get; set; }
///
- ///
+ /// 站端发-云端收
///
- public MsgPair CarAuth { get; set; } = new();
+ public MsgPair CarAuth { get; set; } = new();
+ public MsgPair VehicleData { get; set; } = new();
+ public MsgPair Sign { get; set; } = new();
+ public MsgPair ReportingDevice { get; set; } = new();
+ public MsgPair UploadPowerChange { get; set; } = new();
+ public MsgPair ChargeRecord { get; set; } = new();
+ public MsgPair HostStatus { get; set; } = new();
+ public MsgPair ChannelStatus { get; set; } = new();
+ public MsgPair RealTimeFault { get; set; } = new();
+ public MsgPair TemperatureHumidity { get; set; } = new();
+ public MsgPair AirConditioning { get; set; } = new();
+ public MsgPair StartLog { get; set; } = new();
+ public MsgPair EndLog { get; set; } = new();
+ public MsgPair ChargeDevDataInfo { get; set; } = new();
public MsgPair BatData { get; set; } = new();
- public MsgPair ChannelStatus { get; set; } = new();
- public MsgPair AirConditioning { get; set; } = new();
- public MsgPair ChargeRecord { get; set; } = new();
- public MsgPair EndLog { get; set; } = new();
- public MsgPair HostStatus { get; set; } = new();
- public MsgPair RealTimeFault { get; set; } = new();
- public MsgPair ReportingDevice { get; set; } = new();
- public MsgPair Sign { get; set; } = new();
- public MsgPair StartLog { get; set; } = new();
- public MsgPair TemperatureHumidity { get; set; } = new();
- public MsgPair UploadPowerChange { get; set; } = new();
- public MsgPair VehicleData { get; set; } = new();
public MsgPair ChargeRecordUpLoad { get; set; } = new();
- public MsgPair ChargeDevDataInfo { get; set; } = new();
-
+ public MsgPair BatteryTotal { get; set; } = new();
+ public MsgPair ChargingTotalDis { get; set; } = new();
+ public MsgPair PowerTotal { get; set; } = new();
+ public MsgPair StaChargingTotal { get; set; } = new();
+ public MsgPair MeterEnergyKwh { get; set; } = new();
+ public MsgPair MeterDayEnergyVal { get; set; } = new();
+ public MsgPair StaHourEnergyVal { get; set; } = new();
+ public MsgPair StaDayEnergyVal { get; set; } = new();
+ public MsgPair StaDayOpeEnergyVal { get; set; } = new();
+ public MsgPair StaHourAmountVal { get; set; } = new();
+
+
+
+ ///
+ /// 云端发-站端收
+ ///
+ public MsgPair CarCanStartInfo { get; set; } = new();
+ public MsgPair SetStBaseInfo { get; set; } = new();
+ public MsgPair SetService { get; set; } = new();
+ public MsgPair SetOpTime { get; set; } = new();
+ public MsgPair SetOpModel { get; set; } = new();
+ public MsgPair SetStaPrice { get; set; } = new();
+ public MsgPair SetChargePrice { get; set; } = new();
+ public MsgPair SetChangeCarData { get; set; } = new();
+ public MsgPair SetConfig { get; set; } = new();
+ public MsgPair GetConfig { get; set; } = new();
+
+
+ //站外
public MsgPair PileEndCharge { get; set; } = new();
-
public MsgPair PileChargeRealtime { get; set; } = new();
public MsgPair PileRealtime { get; set; } = new();
+
#endregion
@@ -396,12 +426,12 @@ public class CloudClient : IMqttClientConnectedHandler, IMqttApplicationMessageR
#region 主动发送CMD
- public VehicleCertificationResp? SendVehicleCertification(VehicleCertification vehicleCertification,
+ public CarAuthRes? SendVehicleCertification(CarAuth carAuth,
TimeSpan? timeSpan = null)
{
- Log.Info(vehicleCertification);
- this.CarAuth.Req = vehicleCertification;
- this.Publish(vehicleCertification);
+ Log.Info(carAuth);
+ this.CarAuth.Req = carAuth;
+ this.Publish(carAuth);
return CarAuth.GetResp(timeSpan);
}
@@ -416,96 +446,96 @@ public class CloudClient : IMqttClientConnectedHandler, IMqttApplicationMessageR
///
/// 换电站通道状态上报
///
- ///
+ ///
///
///
- public ChannelStatusReportingResp? SendChannelStatusReporting(ChannelStatusReporting channelStatusReporting,
+ public StationChnRunStatusRes? SendChannelStatusReporting(StationChnRunStatus stationChnRunStatus,
TimeSpan timeSpan)
{
- this.ChannelStatus.Req = channelStatusReporting;
- this.Publish(channelStatusReporting);
+ this.ChannelStatus.Req = stationChnRunStatus;
+ this.Publish(stationChnRunStatus);
return ChannelStatus.GetResp(timeSpan);
}
- public AirConditioningDataResp? SendAirConditioningData(AirConditioningData airConditioningData,
+ public AcDataInfoRes? SendAirConditioningData(AcDataInfo acDataInfo,
TimeSpan timeSpan)
{
- this.AirConditioning.Req = airConditioningData;
- this.Publish(airConditioningData);
+ this.AirConditioning.Req = acDataInfo;
+ this.Publish(acDataInfo);
return AirConditioning.GetResp(timeSpan);
}
- public ChargeRecordReportingResp? SendChargeRecordReporting(ChargeRecordReporting chargeRecord,
+ public ChargeRecordReportRes? SendChargeRecordReporting(ChargeRecordReport chargeRecord,
TimeSpan timeSpan)
{
this.ChargeRecord.Req = chargeRecord;
this.Publish(chargeRecord);
return ChargeRecord.GetResp(timeSpan);
}
- public EndLogMessageResp? SendEndLogMessage(EndLogMessage endLogMessage,
+ public EqmStateEndLogInfoRes? SendEndLogMessage(EqmStateEndLogInfo endLogMessage,
TimeSpan timeSpan)
{
this.EndLog.Req = endLogMessage;
this.Publish(endLogMessage);
return EndLog.GetResp(timeSpan);
}
- public HostStatusReportedResp? SendHostStatusReported(HostStatusReported hostStatusReported,
+ public StationRunStatusRes? SendHostStatusReported(StationRunStatus hostStatusReported,
TimeSpan timeSpan)
{
this.HostStatus.Req = hostStatusReported;
this.Publish(hostStatusReported);
return HostStatus.GetResp(timeSpan);
}
- public RealTimeFaultInfoResp? SendRealTimeFaultInfo(RealTimeFaultInfo realTimeFaultInfo,
+ public FaultReportRes? SendRealTimeFaultInfo(FaultReport faultReport,
TimeSpan timeSpan)
{
- this.RealTimeFault.Req = realTimeFaultInfo;
- this.Publish(realTimeFaultInfo);
+ this.RealTimeFault.Req = faultReport;
+ this.Publish(faultReport);
return RealTimeFault.GetResp(timeSpan);
}
- public ReportingDeviceListResp? SendReportingDeviceList(ReportingDeviceList reportingDeviceList,
+ public DevListRes? SendReportingDeviceList(DevList devList,
TimeSpan timeSpan)
{
- this.ReportingDevice.Req = reportingDeviceList;
- this.Publish(reportingDeviceList);
+ this.ReportingDevice.Req = devList;
+ this.Publish(devList);
return ReportingDevice.GetResp(timeSpan);
}
- public SignInResp? SendSignIn(SignIn signIn,
+ public SignInRes? SendSignIn(SignIn signIn,
TimeSpan? timeSpan=null)
{
this.Sign.Req = signIn;
this.Publish(signIn);
return Sign.GetResp(timeSpan);
}
- public StartLogMessageResp? SendStartLogMessage(StartLogMessage startLogMessage,
+ public EqmStateStartLogInfoRes? SendStartLogMessage(EqmStateStartLogInfo eqmStateStartLogInfo,
TimeSpan timeSpan)
{
- this.StartLog.Req = startLogMessage;
- this.Publish(startLogMessage);
+ this.StartLog.Req = eqmStateStartLogInfo;
+ this.Publish(eqmStateStartLogInfo);
return StartLog.GetResp(timeSpan);
}
- public TemperatureHumidityDataResp? SendTemperatureHumidityData(TemperatureHumidityData temperatureHumidityData,
+ public EvmDataInfoRes? SendTemperatureHumidityData(EvmDataInfo evmDataInfo,
TimeSpan timeSpan)
{
- this.TemperatureHumidity.Req = temperatureHumidityData;
- this.Publish(temperatureHumidityData);
+ this.TemperatureHumidity.Req = evmDataInfo;
+ this.Publish(evmDataInfo);
return TemperatureHumidity.GetResp(timeSpan);
}
///
/// 上传换电订单
///
- ///
+ ///
///
///
- public UploadSwapOrderResp? SendUploadPowerChangeOrder(UploadSwapOrder uploadSwapOrder, TimeSpan? timeSpan = null)
+ public StaSwapRecordRes? SendUploadPowerChangeOrder(StaSwapRecord staSwapRecord, TimeSpan? timeSpan = null)
{
- this.UploadPowerChange.Req = uploadSwapOrder;
- this.Publish(uploadSwapOrder);
+ this.UploadPowerChange.Req = staSwapRecord;
+ this.Publish(staSwapRecord);
return UploadPowerChange.GetResp(timeSpan);
}
- public VehicleDataReportingResp? SendVehicleDataReporting(VehicleDataReporting vehicleDataReporting,
+ public CardataReportRes? SendVehicleDataReporting(CardataReport cardataReport,
TimeSpan timeSpan)
{
- this.VehicleData.Req = vehicleDataReporting;
- this.Publish(vehicleDataReporting);
+ this.VehicleData.Req = cardataReport;
+ this.Publish(cardataReport);
return VehicleData.GetResp(timeSpan);
}
@@ -523,6 +553,76 @@ public class CloudClient : IMqttClientConnectedHandler, IMqttApplicationMessageR
return ChargeDevDataInfo.GetResp(timeSpan);
}
+ public BatteryTotalRes? SendBatteryTotal(BatteryTotal req, TimeSpan? timeSpan = null)
+ {
+ this.BatteryTotal.Req = req;
+ this.Publish(req);
+ return BatteryTotal.GetResp(timeSpan);
+ }
+
+ public ChargingTotalDisRes? SendChargingTotalDis(ChargingTotalDis req, TimeSpan? timeSpan = null)
+ {
+ this.ChargingTotalDis.Req = req;
+ this.Publish(req);
+ return ChargingTotalDis.GetResp(timeSpan);
+ }
+
+ public PowerTotalRes? SendPowerTotal(PowerTotal req, TimeSpan? timeSpan = null)
+ {
+ this.PowerTotal.Req = req;
+ this.Publish(req);
+ return PowerTotal.GetResp(timeSpan);
+ }
+
+ public StaChargingTotalRes? SendStaChargingTotal(StaChargingTotal req, TimeSpan? timeSpan = null)
+ {
+ this.StaChargingTotal.Req = req;
+ this.Publish(req);
+ return StaChargingTotal.GetResp(timeSpan);
+ }
+
+ public MeterEnergyKwhRes? SendMeterEnergyKwh(MeterEnergyKwh req, TimeSpan? timeSpan = null)
+ {
+ this.MeterEnergyKwh.Req = req;
+ this.Publish(req);
+ return MeterEnergyKwh.GetResp(timeSpan);
+ }
+
+ public MeterDayEnergyValRes? SendMeterDayEnergyVal(MeterDayEnergyVal req, TimeSpan? timeSpan = null)
+ {
+ this.MeterDayEnergyVal.Req = req;
+ this.Publish(req);
+ return MeterDayEnergyVal.GetResp(timeSpan);
+ }
+
+ public StaHourEnergyValRes? SendStaHourEnergyVal(StaHourEnergyVal req, TimeSpan? timeSpan = null)
+ {
+ this.StaHourEnergyVal.Req = req;
+ this.Publish(req);
+ return StaHourEnergyVal.GetResp(timeSpan);
+ }
+
+ public StaDayEnergyValRes? SendStaDayEnergyVal(StaDayEnergyVal req, TimeSpan? timeSpan = null)
+ {
+ this.StaDayEnergyVal.Req = req;
+ this.Publish(req);
+ return StaDayEnergyVal.GetResp(timeSpan);
+ }
+
+ public StaDayOpeEnergyValRes? SendStaDayOpeEnergyVal(StaDayOpeEnergyVal req, TimeSpan? timeSpan = null)
+ {
+ this.StaDayOpeEnergyVal.Req = req;
+ this.Publish(req);
+ return StaDayOpeEnergyVal.GetResp(timeSpan);
+ }
+
+ public StaHourAmountValRes? SendStaHourAmountVal(StaHourAmountVal req, TimeSpan? timeSpan = null)
+ {
+ this.StaHourAmountVal.Req = req;
+ this.Publish(req);
+ return StaHourAmountVal.GetResp(timeSpan);
+ }
+
public PileEndChargeResp? SendPileEndCharge(PileEndCharge req, TimeSpan? timeSpan = null)
{
this.PileEndCharge.Req = req;
diff --git a/Service/Cloud/Common/CloudConst.cs b/Service/Cloud/Common/CloudConst.cs
index 8b6bd80..453b956 100644
--- a/Service/Cloud/Common/CloudConst.cs
+++ b/Service/Cloud/Common/CloudConst.cs
@@ -4,45 +4,20 @@ public class CloudConst
{
#region cmd definition
- public static readonly string signIn = "signIn";
- public static readonly string signInRes = "signInRes";
+ #region 站端发云端收
+
public static readonly string carAuth = "carAuth";
public static readonly string carAuthRes = "carAuthRes";
- public static readonly string carCanStart = "carCanStart";
- public static readonly string carCanStartRes = "carCanStartRes";
- ///
- /// 2 换电车辆数据上报
- ///
public static readonly string CardataReport = "CardataReport";
public static readonly string CardataReportRes = "CardataReportRes";
- public static readonly string setStBaseInfo = "setStBaseInfo";
- public static readonly string setStBaseInfoRes = "setStBaseInfoRes";
+ public static readonly string signIn = "signIn";
+ public static readonly string signInRes = "signInRes";
public static readonly string devList = "devList";
public static readonly string devListRep = "devListRep";
- public static readonly string setService = "setService";
- public static readonly string setServiceRes = "setServiceRes";
- public static readonly string setOpTime = "setOpTime";
- public static readonly string setOpTimeRes = "setOpTimeRes";
- public static readonly string setOpModel = "setOpModel";
- public static readonly string setOpModelRes = "setOpModelRes";
- public static readonly string setStaPrice = "setStaPrice";
- public static readonly string setStaPriceRes = "setStaPriceRes";
- public static readonly string setChargePrice = "setChargePrice";
- public static readonly string setChargePriceRes = "setChargePriceRes";
- public static readonly string setChangeCarData = "setChangeCarData";
- public static readonly string setChangeCarDataRes = "setChangeCarDataRes";
- public static readonly string setConfig = "setConfig";
- public static readonly string setConfigRes = "setConfigRes";
- public static readonly string getConfig = "getConfig";
- public static readonly string getConfigRes = "getConfigRes";
public static readonly string staSwapRecord = "staSwapRecord";
public static readonly string staSwapRecordRes = "staSwapRecordRes";
- public static readonly string amtBat = "amtBat";
- public static readonly string amtBatRes = "amtBatRes";
public static readonly string ChargeRecordReport = "ChargeRecordReport";
public static readonly string ChargeRecordReportsRes = "ChargeRecordReportsRes";
- public static readonly string ChargeRecordUpLoad = "ChargeRecordUpLoad";
- public static readonly string ChargeRecordUpLoadRes = "ChargeRecordUploadRes";
public static readonly string stationRunStatus = "stationRunStatus";
public static readonly string stationRunStatusRes = "stationRunStatusRes";
public static readonly string stationChnRunStatus = "stationChnRunStatus";
@@ -61,25 +36,60 @@ public class CloudConst
public static readonly string chargeDevDataInfoRes = "chargeDevDataInfoRes";
public static readonly string batDataInfo = "batDataInfo";
public static readonly string batDataInfoRes = "batDataInfoRes";
+ public static readonly string ChargeRecordUpLoad = "ChargeRecordUpLoad";
+ public static readonly string ChargeRecordUpLoadRes = "ChargeRecordUploadRes";
+ public static readonly string batteryTotal = "batteryTotal";
public static readonly string batteryTotalRes = "batteryTotalRes";
- public static readonly string meterDayEnergyValRes = "meterDayEnergyValRes";
- public static readonly string meterEnergyKwhRes = "meterEnergyKwhRes";
+ public static readonly string chargingTotalDis = "chargingTotalDis";
+ public static readonly string chargingTotaDislRes = "chargingTotaDislRes";
+ public static readonly string powerTotal = "powerTotal";
public static readonly string powerTotalRes = "powerTotalRes";
+ public static readonly string staChargingTotal = "staChargingTotal";
public static readonly string staChargingTotalRes = "staChargingTotalRes";
- public static readonly string staDayEnergyValRes = "staDayEnergyValRes";
- public static readonly string staDayOpeEnergyValRes = "staDayOpeEnergyValRes";
- public static readonly string staHourAmountValRes = "staHourAmountValRes";
- public static readonly string staHourEnergyValRes = "staHourEnergyValRes";
- public static readonly string batteryTotal = "batteryTotal";
- public static readonly string chargingTotalDis = "chargingTotalDis";
+ public static readonly string meterEnergyKwh = "meterEnergyKwh";
+ public static readonly string meterEnergyKwhRes = "meterEnergyKwhRes";
public static readonly string meterDayEnergyVal = "meterDayEnergyVal";
+ public static readonly string meterDayEnergyValRes = "meterDayEnergyValRes";
public static readonly string staHourEnergyVal = "staHourEnergyVal";
- public static readonly string staHourAmountVal = "staHourAmountVal";
+ public static readonly string staHourEnergyValRes = "staHourEnergyValRes";
public static readonly string staDayEnergyVal = "staDayEnergyVal";
- public static readonly string staChargingTotal = "staChargingTotal";
- public static readonly string meterEnergyKwh = "meterEnergyKwh";
- public static readonly string powerTotal = "powerTotal";
+ public static readonly string staDayEnergyValRes = "staDayEnergyValRes";
public static readonly string staDayOpeEnergyVal = "staDayOpeEnergyVal";
+ public static readonly string staDayOpeEnergyValRes = "staDayOpeEnergyValRes";
+ public static readonly string staHourAmountVal = "staHourAmountVal";
+ public static readonly string staHourAmountValRes = "staHourAmountValRes";
+
+ #endregion
+
+ #region 云端发站端收
+
+
+ public static readonly string carCanStart = "carCanStart";
+ public static readonly string carCanStartRes = "carCanStartRes";
+ public static readonly string setStBaseInfo = "setStBaseInfo";
+ public static readonly string setStBaseInfoRes = "setStBaseInfoRes";
+ public static readonly string setService = "setService";
+ public static readonly string setServiceRes = "setServiceRes";
+ public static readonly string setOpTime = "setOpTime";
+ public static readonly string setOpTimeRes = "setOpTimeRes";
+ public static readonly string setOpModel = "setOpModel";
+ public static readonly string setOpModelRes = "setOpModelRes";
+ public static readonly string setStaPrice = "setStaPrice";
+ public static readonly string setStaPriceRes = "setStaPriceRes";
+ public static readonly string setChargePrice = "setChargePrice";
+ public static readonly string setChargePriceRes = "setChargePriceRes";
+ public static readonly string setChangeCarData = "setChangeCarData";
+ public static readonly string setChangeCarDataRes = "setChangeCarDataRes";
+ public static readonly string setConfig = "setConfig";
+ public static readonly string setConfigRes = "setConfigRes";
+ public static readonly string getConfig = "getConfig";
+ public static readonly string getConfigRes = "getConfigRes";
+
+ #endregion
+
+
+ public static readonly string amtBat = "amtBat";
+ public static readonly string amtBatRes = "amtBatRes";
///
/// 站外
diff --git a/Service/Cloud/Handler/BatteryOperatingModelHandler.cs b/Service/Cloud/Handler/BatteryOperatingModelHandler.cs
index 572f2c4..e43b66d 100644
--- a/Service/Cloud/Handler/BatteryOperatingModelHandler.cs
+++ b/Service/Cloud/Handler/BatteryOperatingModelHandler.cs
@@ -29,7 +29,7 @@ public class BatteryOperatingModelHandler: IBaseHandler
public void Handle(string t)
{
- BatteryOperatingModel? req = JsonConvert.DeserializeObject(t);
+ SetOpModel? req = JsonConvert.DeserializeObject(t);
if (req != null)
{
@@ -61,8 +61,8 @@ public class BatteryOperatingModelHandler: IBaseHandler
- BatteryOperatingModelResp resp = new BatteryOperatingModelResp();
- CloudClientMgr.CloudClient?.Publish(resp);
+ SetOpModelRes res = new SetOpModelRes();
+ CloudClientMgr.CloudClient?.Publish(res);
}
}
}
\ No newline at end of file
diff --git a/Service/Cloud/Handler/BusinessHourHandler.cs b/Service/Cloud/Handler/BusinessHourHandler.cs
index f69b406..d3f7748 100644
--- a/Service/Cloud/Handler/BusinessHourHandler.cs
+++ b/Service/Cloud/Handler/BusinessHourHandler.cs
@@ -19,7 +19,7 @@ public class BusinessHourHandler : IBaseHandler
public void Handle(string t)
{
- BusinessHour? req = JsonConvert.DeserializeObject(t);
+ SetOpTime? req = JsonConvert.DeserializeObject(t);
if (req != null)
{
List reqSeg = req.seg;
@@ -29,7 +29,7 @@ public class BusinessHourHandler : IBaseHandler
StaticStationInfo.OperationEndTime = reqSeg.Select(i => i.et).Join();
}
- BusinessHourResp resp = new BusinessHourResp();
+ SetOpTimeRes resp = new SetOpTimeRes();
CloudClientMgr.CloudClient?.Publish(resp);
}
}
diff --git a/Service/Cloud/Handler/CarAuthResHandler.cs b/Service/Cloud/Handler/CarAuthResHandler.cs
index 43401fc..7cf8439 100644
--- a/Service/Cloud/Handler/CarAuthResHandler.cs
+++ b/Service/Cloud/Handler/CarAuthResHandler.cs
@@ -17,7 +17,7 @@ public class CarAuthResHandler : IBaseHandler
public void Handle(string t)
{
- VehicleCertificationResp? resp = JsonConvert.DeserializeObject(t);
+ CarAuthRes? resp = JsonConvert.DeserializeObject(t);
CloudClientMgr.CloudClient.CarAuth.SetResp(resp);
}
}
\ No newline at end of file
diff --git a/Service/Cloud/Handler/ChargerElectricityPriceModelHandler.cs b/Service/Cloud/Handler/ChargerElectricityPriceModelHandler.cs
index 283085d..76845c2 100644
--- a/Service/Cloud/Handler/ChargerElectricityPriceModelHandler.cs
+++ b/Service/Cloud/Handler/ChargerElectricityPriceModelHandler.cs
@@ -30,7 +30,7 @@ public class ChargerElectricityPriceModelHandler : IBaseHandler
public void Handle(string t)
{
- ChargerElectricityPriceModel? priceModel = JsonConvert.DeserializeObject(t);
+ SetChargePrice? priceModel = JsonConvert.DeserializeObject(t);
if (priceModel != null)
{
ElecPriceModelVersion version = _versionRepository.QueryByClause(d => d.Version == priceModel.ceid);
@@ -63,7 +63,7 @@ public class ChargerElectricityPriceModelHandler : IBaseHandler
_detailRepository.Insert(versionDetails);
}
- ChargerElectricityPriceModelResp resp = new ChargerElectricityPriceModelResp();
+ SetChargePriceRes resp = new SetChargePriceRes();
CloudClientMgr.CloudClient?.Publish(resp);
}
}
diff --git a/Service/Cloud/Handler/DeliverBasicInformationHandler.cs b/Service/Cloud/Handler/DeliverBasicInformationHandler.cs
index 51bd7f0..1526891 100644
--- a/Service/Cloud/Handler/DeliverBasicInformationHandler.cs
+++ b/Service/Cloud/Handler/DeliverBasicInformationHandler.cs
@@ -18,7 +18,7 @@ public class DeliverBasicInformationHandler : IBaseHandler
public void Handle(string t)
{
- DeliverBasicInformation? deliverBasicInformation = JsonConvert.DeserializeObject(t);
+ SetStBaseInfo? deliverBasicInformation = JsonConvert.DeserializeObject(t);
if (deliverBasicInformation != null)
{
StaticStationInfo.StationNo = deliverBasicInformation.sn;
@@ -26,7 +26,7 @@ public class DeliverBasicInformationHandler : IBaseHandler
StaticStationInfo.StationSn = deliverBasicInformation.SS;
//TODO 补全StaticStationInfo后赋值
- DeliverBasicInformationResp resp = new DeliverBasicInformationResp();
+ SetStBaseInfoRes resp = new SetStBaseInfoRes();
CloudClientMgr.CloudClient?.Publish(resp);
}
}
diff --git a/Service/Cloud/Handler/ParameterAcquisitionHandler.cs b/Service/Cloud/Handler/ParameterAcquisitionHandler.cs
index 18a67d9..30d396b 100644
--- a/Service/Cloud/Handler/ParameterAcquisitionHandler.cs
+++ b/Service/Cloud/Handler/ParameterAcquisitionHandler.cs
@@ -18,10 +18,10 @@ public class ParameterAcquisitionHandler : IBaseHandler
public void Handle(string t)
{
- ParameterAcquisition? req = JsonConvert.DeserializeObject(t);
+ GetConfig? req = JsonConvert.DeserializeObject(t);
if (req != null)
{
- ParameterAcquisitionResp resp = new ParameterAcquisitionResp();
+ GetConfigRes resp = new GetConfigRes();
resp.chsoc = Convert.ToChar(StaticStationInfo.SwapSoc);
resp.eid = StaticStationInfo.Eid;
resp.oid = StaticStationInfo.Oid;
diff --git a/Service/Cloud/Handler/ServiceableStateHandler.cs b/Service/Cloud/Handler/ServiceableStateHandler.cs
index af25d46..68e9379 100644
--- a/Service/Cloud/Handler/ServiceableStateHandler.cs
+++ b/Service/Cloud/Handler/ServiceableStateHandler.cs
@@ -19,7 +19,7 @@ public class ServiceableStateHandler:IBaseHandler
public void Handle(string t)
{
- ServiceableState? req = JsonConvert.DeserializeObject(t);
+ SetServiceRes? req = JsonConvert.DeserializeObject(t);
if (req != null)
{
StaticStationInfo.StationStatus = req.st;
diff --git a/Service/Cloud/Handler/SetConfigurationParametersHandler.cs b/Service/Cloud/Handler/SetConfigurationParametersHandler.cs
index 5e0127c..ae5eda0 100644
--- a/Service/Cloud/Handler/SetConfigurationParametersHandler.cs
+++ b/Service/Cloud/Handler/SetConfigurationParametersHandler.cs
@@ -18,7 +18,7 @@ public class SetConfigurationParametersHandler : IBaseHandler
public void Handle(string t)
{
- SetConfigurationParameters? setConfigurationParameters = JsonConvert.DeserializeObject(t);
+ SetConfig? setConfigurationParameters = JsonConvert.DeserializeObject(t);
if (setConfigurationParameters != null)
{
char chsoc = setConfigurationParameters.chsoc;
@@ -27,7 +27,7 @@ public class SetConfigurationParametersHandler : IBaseHandler
StaticStationInfo.Oid = setConfigurationParameters.oid;
StaticStationInfo.Ceid = setConfigurationParameters.ceid;
- SetConfigurationParametersResp resp = new SetConfigurationParametersResp();
+ SetConfigRes resp = new SetConfigRes();
CloudClientMgr.CloudClient?.Publish(resp);
}
}
diff --git a/Service/Cloud/Handler/SignInRespHandler.cs b/Service/Cloud/Handler/SignInRespHandler.cs
index 218b52a..faf37af 100644
--- a/Service/Cloud/Handler/SignInRespHandler.cs
+++ b/Service/Cloud/Handler/SignInRespHandler.cs
@@ -12,7 +12,7 @@ public class SignInRespHandler : IBaseHandler
public void Handle(string t)
{
- SignInResp? signInResp = JsonConvert.DeserializeObject(t);
+ SignInRes? signInResp = JsonConvert.DeserializeObject(t);
if (signInResp != null)
{
CloudClientMgr.CloudClient.Authed = signInResp.re == 0;
diff --git a/Service/Cloud/Handler/UploadSwapOrderResHandler.cs b/Service/Cloud/Handler/UploadSwapOrderResHandler.cs
index f32b209..dde7b3a 100644
--- a/Service/Cloud/Handler/UploadSwapOrderResHandler.cs
+++ b/Service/Cloud/Handler/UploadSwapOrderResHandler.cs
@@ -16,7 +16,7 @@ public class UploadSwapOrderResHandler : IBaseHandler
public SwapOrderRepository SwapOrderRepository { get; set; }
public void Handle(string t)
{
- UploadSwapOrderResp? resp = JsonConvert.DeserializeObject(t);
+ StaSwapRecordRes? resp = JsonConvert.DeserializeObject(t);
if (resp != null)
{
if (CloudClientMgr.CloudClient != null)
diff --git a/Service/Cloud/Msg/Cloud/Req/ParameterAcquisition.cs b/Service/Cloud/Msg/Cloud/Req/GetConfig.cs
similarity index 92%
rename from Service/Cloud/Msg/Cloud/Req/ParameterAcquisition.cs
rename to Service/Cloud/Msg/Cloud/Req/GetConfig.cs
index 4a57a6c..8db2f58 100644
--- a/Service/Cloud/Msg/Cloud/Req/ParameterAcquisition.cs
+++ b/Service/Cloud/Msg/Cloud/Req/GetConfig.cs
@@ -5,7 +5,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.12.1 后台服务器下发参数获取
///
- public class ParameterAcquisition : ICmd
+ public class GetConfig : ICmd
{
///
/// 自定义
diff --git a/Service/Cloud/Msg/Cloud/Req/OfflinePowerOnVehicleData.cs b/Service/Cloud/Msg/Cloud/Req/SetChangeCarData.cs
similarity index 97%
rename from Service/Cloud/Msg/Cloud/Req/OfflinePowerOnVehicleData.cs
rename to Service/Cloud/Msg/Cloud/Req/SetChangeCarData.cs
index 6335c60..b097e50 100644
--- a/Service/Cloud/Msg/Cloud/Req/OfflinePowerOnVehicleData.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetChangeCarData.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.10.1 后台服务器下发离线换电车辆数据
///
- public class OfflinePowerOnVehicleData : ICmd
+ public class SetChangeCarData : ICmd
{
///
/// 更新方式
diff --git a/Service/Cloud/Msg/Cloud/Req/ChargerElectricityPriceModel.cs b/Service/Cloud/Msg/Cloud/Req/SetChargePrice.cs
similarity index 96%
rename from Service/Cloud/Msg/Cloud/Req/ChargerElectricityPriceModel.cs
rename to Service/Cloud/Msg/Cloud/Req/SetChargePrice.cs
index 3014add..d6382b6 100644
--- a/Service/Cloud/Msg/Cloud/Req/ChargerElectricityPriceModel.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetChargePrice.cs
@@ -5,7 +5,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.9.1 后台服务器下发换电站充电机的电价模型
///
- public class ChargerElectricityPriceModel : ICmd
+ public class SetChargePrice : ICmd
{
///
/// 更新时间
diff --git a/Service/Cloud/Msg/Cloud/Req/SetConfigurationParameters.cs b/Service/Cloud/Msg/Cloud/Req/SetConfig.cs
similarity index 95%
rename from Service/Cloud/Msg/Cloud/Req/SetConfigurationParameters.cs
rename to Service/Cloud/Msg/Cloud/Req/SetConfig.cs
index d80ad53..1db2236 100644
--- a/Service/Cloud/Msg/Cloud/Req/SetConfigurationParameters.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetConfig.cs
@@ -11,7 +11,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.11.1 后台服务器下发设置配置参数
///
- public class SetConfigurationParameters : ICmd
+ public class SetConfig : ICmd
{
///
/// 可换 soc 阈值
diff --git a/Service/Cloud/Msg/Cloud/Req/BatteryOperatingModel.cs b/Service/Cloud/Msg/Cloud/Req/SetOpModel.cs
similarity index 96%
rename from Service/Cloud/Msg/Cloud/Req/BatteryOperatingModel.cs
rename to Service/Cloud/Msg/Cloud/Req/SetOpModel.cs
index 46bd9c9..a4641f3 100644
--- a/Service/Cloud/Msg/Cloud/Req/BatteryOperatingModel.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetOpModel.cs
@@ -5,7 +5,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.7.1 后台服务器下发换电站的电池运营模型
///
- public class BatteryOperatingModel : ICmd
+ public class SetOpModel : ICmd
{
///
/// 运营模型ID
diff --git a/Service/Cloud/Msg/Cloud/Req/BusinessHour.cs b/Service/Cloud/Msg/Cloud/Req/SetOpTime.cs
similarity index 96%
rename from Service/Cloud/Msg/Cloud/Req/BusinessHour.cs
rename to Service/Cloud/Msg/Cloud/Req/SetOpTime.cs
index fa973d7..07c065b 100644
--- a/Service/Cloud/Msg/Cloud/Req/BusinessHour.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetOpTime.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.6.1 后台服务器设置换电站的营业时段
///
- public class BusinessHour : ICmd
+ public class SetOpTime : ICmd
{
///
/// 更新时间
diff --git a/Service/Cloud/Msg/Cloud/Req/SetService.cs b/Service/Cloud/Msg/Cloud/Req/SetService.cs
new file mode 100644
index 0000000..767153e
--- /dev/null
+++ b/Service/Cloud/Msg/Cloud/Req/SetService.cs
@@ -0,0 +1,19 @@
+using Service.Cloud.Common;
+
+namespace Service.Cloud.Msg.Cloud.Req;
+
+///
+/// 3.2.5.1 后台服务器下发换电站的可服务状态设置
+///
+public class SetService: ICmd
+{
+ ///
+ /// 服务状态 1:换电站服务启用 2:换电站服务停用
+ ///
+ public int st { get; set; }
+
+ public string GetCmd()
+ {
+ return CloudConst.setService;
+ }
+}
\ No newline at end of file
diff --git a/Service/Cloud/Msg/Cloud/Req/ServiceableState.cs b/Service/Cloud/Msg/Cloud/Req/SetServiceRes.cs
similarity index 93%
rename from Service/Cloud/Msg/Cloud/Req/ServiceableState.cs
rename to Service/Cloud/Msg/Cloud/Req/SetServiceRes.cs
index 2d251d6..f33cd1e 100644
--- a/Service/Cloud/Msg/Cloud/Req/ServiceableState.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetServiceRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.5.1 后台服务器下发换电站的可服务状态设置
///
- public class ServiceableState : ICmd
+ public class SetServiceRes : ICmd
{
///
/// 服务状态
diff --git a/Service/Cloud/Msg/Cloud/Req/SetStBaseInfo.cs b/Service/Cloud/Msg/Cloud/Req/SetStBaseInfo.cs
index 18b8761..eb66ed0 100644
--- a/Service/Cloud/Msg/Cloud/Req/SetStBaseInfo.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetStBaseInfo.cs
@@ -5,7 +5,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.3.1 后台服务器下发换电站的基础信息
///
- public class DeliverBasicInformation : ICmd
+ public class SetStBaseInfo : ICmd
{
///
/// 电站编码
diff --git a/Service/Cloud/Msg/Cloud/Req/ElectricityPriceModel.cs b/Service/Cloud/Msg/Cloud/Req/SetStaPrice.cs
similarity index 96%
rename from Service/Cloud/Msg/Cloud/Req/ElectricityPriceModel.cs
rename to Service/Cloud/Msg/Cloud/Req/SetStaPrice.cs
index a6b198e..b0cf041 100644
--- a/Service/Cloud/Msg/Cloud/Req/ElectricityPriceModel.cs
+++ b/Service/Cloud/Msg/Cloud/Req/SetStaPrice.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Req
///
/// 3.2.8.1 后台服务器下发换电站的电价模型
///
- public class ElectricityPriceModel : ICmd
+ public class SetStaPrice : ICmd
{
///
/// 计费模型ID
diff --git a/Service/Cloud/Msg/Cloud/Resp/AirConditioningDataResp.cs b/Service/Cloud/Msg/Cloud/Resp/AcDataInfoRes.cs
similarity index 92%
rename from Service/Cloud/Msg/Cloud/Resp/AirConditioningDataResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/AcDataInfoRes.cs
index d9087cc..e183393 100644
--- a/Service/Cloud/Msg/Cloud/Resp/AirConditioningDataResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/AcDataInfoRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 4.2.7.2 云平台反馈换电站空调数据信息
///
- public class AirConditioningDataResp : ICmd
+ public class AcDataInfoRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/VehicleCertificationResp.cs b/Service/Cloud/Msg/Cloud/Resp/CarAuthRes.cs
similarity index 97%
rename from Service/Cloud/Msg/Cloud/Resp/VehicleCertificationResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/CarAuthRes.cs
index bd9515d..a24616d 100644
--- a/Service/Cloud/Msg/Cloud/Resp/VehicleCertificationResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/CarAuthRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 2.1.1.2 后台应答换电站车辆认证的结果
///
- public class VehicleCertificationResp : ICmd
+ public class CarAuthRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/VehicleDataReportingResp.cs b/Service/Cloud/Msg/Cloud/Resp/CardataReportRes.cs
similarity index 92%
rename from Service/Cloud/Msg/Cloud/Resp/VehicleDataReportingResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/CardataReportRes.cs
index df26052..ca8b2d1 100644
--- a/Service/Cloud/Msg/Cloud/Resp/VehicleDataReportingResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/CardataReportRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 2.1.3.3 云平台反馈换电车辆数据上报
///
- public class VehicleDataReportingResp : ICmd
+ public class CardataReportRes : ICmd
{
///
/// 接收结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/ChargeRecordReportingResp.cs b/Service/Cloud/Msg/Cloud/Resp/ChargeRecordReportRes.cs
similarity index 93%
rename from Service/Cloud/Msg/Cloud/Resp/ChargeRecordReportingResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/ChargeRecordReportRes.cs
index 2246cd7..73324b0 100644
--- a/Service/Cloud/Msg/Cloud/Resp/ChargeRecordReportingResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/ChargeRecordReportRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 云平台反馈换电站状态上报
///
- public class ChargeRecordReportingResp : ICmd
+ public class ChargeRecordReportRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/ReportingDeviceListResp.cs b/Service/Cloud/Msg/Cloud/Resp/DevListRes.cs
similarity index 95%
rename from Service/Cloud/Msg/Cloud/Resp/ReportingDeviceListResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/DevListRes.cs
index 2e75159..7290c08 100644
--- a/Service/Cloud/Msg/Cloud/Resp/ReportingDeviceListResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/DevListRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 3.2.4. 2 后台应答/请求设备列表上报
///
- public class ReportingDeviceListResp : ICmd
+ public class DevListRes : ICmd
{
///
/// 操作类型
diff --git a/Service/Cloud/Msg/Cloud/Resp/StartLogMessageResp.cs b/Service/Cloud/Msg/Cloud/Resp/EqmStateStartLogInfoRes.cs
similarity index 94%
rename from Service/Cloud/Msg/Cloud/Resp/StartLogMessageResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/EqmStateStartLogInfoRes.cs
index 2cd86ea..61faf04 100644
--- a/Service/Cloud/Msg/Cloud/Resp/StartLogMessageResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/EqmStateStartLogInfoRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 4.2.8.2 云平台反馈设备状态开始日志信息
///
- public class StartLogMessageResp : ICmd
+ public class EqmStateStartLogInfoRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/TemperatureHumidityDataResp.cs b/Service/Cloud/Msg/Cloud/Resp/EvmDataInfoRes.cs
similarity index 91%
rename from Service/Cloud/Msg/Cloud/Resp/TemperatureHumidityDataResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/EvmDataInfoRes.cs
index 20acbea..0641d81 100644
--- a/Service/Cloud/Msg/Cloud/Resp/TemperatureHumidityDataResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/EvmDataInfoRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 4.2.6.2 云平台反馈换电站温湿度数据信息
///
- public class TemperatureHumidityDataResp : ICmd
+ public class EvmDataInfoRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/RealTimeFaultInfoResp.cs b/Service/Cloud/Msg/Cloud/Resp/FaultReportRes.cs
similarity index 92%
rename from Service/Cloud/Msg/Cloud/Resp/RealTimeFaultInfoResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/FaultReportRes.cs
index bef6b38..6fd02c5 100644
--- a/Service/Cloud/Msg/Cloud/Resp/RealTimeFaultInfoResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/FaultReportRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 2 云平台反馈设备实时故障信息
///
- public class RealTimeFaultInfoResp : ICmd
+ public class FaultReportRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/SignInResp.cs b/Service/Cloud/Msg/Cloud/Resp/SignInRes.cs
similarity index 97%
rename from Service/Cloud/Msg/Cloud/Resp/SignInResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/SignInRes.cs
index 18c0f35..55556ca 100644
--- a/Service/Cloud/Msg/Cloud/Resp/SignInResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/SignInRes.cs
@@ -4,7 +4,7 @@ namespace Service.Cloud.Msg.Cloud.Resp;
///
/// 3.2.2 后台应答签到的结果
///
-public class SignInResp : ICmd
+public class SignInRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/UploadSwapOrderResp.cs b/Service/Cloud/Msg/Cloud/Resp/StaSwapRecordRes.cs
similarity index 94%
rename from Service/Cloud/Msg/Cloud/Resp/UploadSwapOrderResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/StaSwapRecordRes.cs
index 374cfc9..4e299c6 100644
--- a/Service/Cloud/Msg/Cloud/Resp/UploadSwapOrderResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/StaSwapRecordRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 4.2.1.2 后台服务器应答换电站上报的订单信息
///
- public class UploadSwapOrderResp : ICmd
+ public class StaSwapRecordRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/ChannelStatusReportingResp.cs b/Service/Cloud/Msg/Cloud/Resp/StationChnRunStatusRes.cs
similarity index 93%
rename from Service/Cloud/Msg/Cloud/Resp/ChannelStatusReportingResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/StationChnRunStatusRes.cs
index ffce4f5..b01c0f9 100644
--- a/Service/Cloud/Msg/Cloud/Resp/ChannelStatusReportingResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/StationChnRunStatusRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 3 云平台反馈换电站通道状态上报
///
- public class ChannelStatusReportingResp : ICmd
+ public class StationChnRunStatusRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Cloud/Resp/HostStatusReportedResp.cs b/Service/Cloud/Msg/Cloud/Resp/StationRunStatusRes.cs
similarity index 94%
rename from Service/Cloud/Msg/Cloud/Resp/HostStatusReportedResp.cs
rename to Service/Cloud/Msg/Cloud/Resp/StationRunStatusRes.cs
index dbd7a05..f9bc8fe 100644
--- a/Service/Cloud/Msg/Cloud/Resp/HostStatusReportedResp.cs
+++ b/Service/Cloud/Msg/Cloud/Resp/StationRunStatusRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Cloud.Resp
///
/// 4.2.3.3 云平台反馈换电站状态上报
///
- public class HostStatusReportedResp : ICmd
+ public class StationRunStatusRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Req/AirConditioningData.cs b/Service/Cloud/Msg/Host/Req/AcDataInfo.cs
similarity index 97%
rename from Service/Cloud/Msg/Host/Req/AirConditioningData.cs
rename to Service/Cloud/Msg/Host/Req/AcDataInfo.cs
index 80e488c..131f94a 100644
--- a/Service/Cloud/Msg/Host/Req/AirConditioningData.cs
+++ b/Service/Cloud/Msg/Host/Req/AcDataInfo.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.7.1 换电站空调数据信息
///
- public class AirConditioningData : ICmd
+ public class AcDataInfo : ICmd
{
///
/// 场站编码
diff --git a/Service/Cloud/Msg/Host/Req/VehicleCertification.cs b/Service/Cloud/Msg/Host/Req/CarAuth.cs
similarity index 98%
rename from Service/Cloud/Msg/Host/Req/VehicleCertification.cs
rename to Service/Cloud/Msg/Host/Req/CarAuth.cs
index 58ef1e2..aaf3e6c 100644
--- a/Service/Cloud/Msg/Host/Req/VehicleCertification.cs
+++ b/Service/Cloud/Msg/Host/Req/CarAuth.cs
@@ -11,7 +11,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 2.1.1.1 换电站进行车辆认证
///
- public class VehicleCertification : ICmd
+ public class CarAuth : ICmd
{
///
/// 认证方式
diff --git a/Service/Cloud/Msg/Host/Req/VehicleDataReporting.cs b/Service/Cloud/Msg/Host/Req/CardataReport.cs
similarity index 99%
rename from Service/Cloud/Msg/Host/Req/VehicleDataReporting.cs
rename to Service/Cloud/Msg/Host/Req/CardataReport.cs
index a2637f2..ef2de4e 100644
--- a/Service/Cloud/Msg/Host/Req/VehicleDataReporting.cs
+++ b/Service/Cloud/Msg/Host/Req/CardataReport.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 换电车辆数据上报
///
- public class VehicleDataReporting : ICmd
+ public class CardataReport : ICmd
{
///
/// 订单号
diff --git a/Service/Cloud/Msg/Host/Req/ChargeRecordReporting.cs b/Service/Cloud/Msg/Host/Req/ChargeRecordReport.cs
similarity index 98%
rename from Service/Cloud/Msg/Host/Req/ChargeRecordReporting.cs
rename to Service/Cloud/Msg/Host/Req/ChargeRecordReport.cs
index 94399c7..12bc3e5 100644
--- a/Service/Cloud/Msg/Host/Req/ChargeRecordReporting.cs
+++ b/Service/Cloud/Msg/Host/Req/ChargeRecordReport.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.2.2 充电记录上报
///
- public class ChargeRecordReporting : ICmd
+ public class ChargeRecordReport : ICmd
{
///
/// 充电流水号
diff --git a/Service/Cloud/Msg/Host/Req/ReportingDeviceList.cs b/Service/Cloud/Msg/Host/Req/DevList.cs
similarity index 98%
rename from Service/Cloud/Msg/Host/Req/ReportingDeviceList.cs
rename to Service/Cloud/Msg/Host/Req/DevList.cs
index 1a2a967..660319d 100644
--- a/Service/Cloud/Msg/Host/Req/ReportingDeviceList.cs
+++ b/Service/Cloud/Msg/Host/Req/DevList.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 3.2.4 换电站上报设备列表
///
- public class ReportingDeviceList : ICmd
+ public class DevList : ICmd
{
///
/// 操作类型
diff --git a/Service/Cloud/Msg/Host/Req/StartLogMessage.cs b/Service/Cloud/Msg/Host/Req/EqmStateStartLogInfo.cs
similarity index 96%
rename from Service/Cloud/Msg/Host/Req/StartLogMessage.cs
rename to Service/Cloud/Msg/Host/Req/EqmStateStartLogInfo.cs
index b6a424f..1a11f36 100644
--- a/Service/Cloud/Msg/Host/Req/StartLogMessage.cs
+++ b/Service/Cloud/Msg/Host/Req/EqmStateStartLogInfo.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.8.1 换电站设备状态开始日志信息
///
- public class StartLogMessage : ICmd
+ public class EqmStateStartLogInfo : ICmd
{
///
/// 设备编号
diff --git a/Service/Cloud/Msg/Host/Req/TemperatureHumidityData.cs b/Service/Cloud/Msg/Host/Req/EvmDataInfo.cs
similarity index 95%
rename from Service/Cloud/Msg/Host/Req/TemperatureHumidityData.cs
rename to Service/Cloud/Msg/Host/Req/EvmDataInfo.cs
index eccde3e..73adf06 100644
--- a/Service/Cloud/Msg/Host/Req/TemperatureHumidityData.cs
+++ b/Service/Cloud/Msg/Host/Req/EvmDataInfo.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.6.1 换电站温湿度数据信息
///
- public class TemperatureHumidityData : ICmd
+ public class EvmDataInfo : ICmd
{
///
/// 场站编码
diff --git a/Service/Cloud/Msg/Host/Req/RealTimeFaultInfo.cs b/Service/Cloud/Msg/Host/Req/FaultReport.cs
similarity index 97%
rename from Service/Cloud/Msg/Host/Req/RealTimeFaultInfo.cs
rename to Service/Cloud/Msg/Host/Req/FaultReport.cs
index ab221ad..8de5750 100644
--- a/Service/Cloud/Msg/Host/Req/RealTimeFaultInfo.cs
+++ b/Service/Cloud/Msg/Host/Req/FaultReport.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.5.1 换电站设备实时故障信息
///
- public class RealTimeFaultInfo : ICmd
+ public class FaultReport : ICmd
{
///
/// 场站編码
diff --git a/Service/Cloud/Msg/Host/Req/HostStatusReported.cs b/Service/Cloud/Msg/Host/Req/HostStatusReported.cs
index 8c1b5df..6843cbe 100644
--- a/Service/Cloud/Msg/Host/Req/HostStatusReported.cs
+++ b/Service/Cloud/Msg/Host/Req/HostStatusReported.cs
@@ -33,7 +33,7 @@ namespace Service.Cloud.Msg.Host.Req
public string GetCmd()
{
- return CloudConst.setOpModelRes;
+ return CloudConst.stationRunStatus;
}
}
}
diff --git a/Service/Cloud/Msg/Host/Req/SingleBatInfo.cs b/Service/Cloud/Msg/Host/Req/SingleBatInfo.cs
index d370259..9e2c19e 100644
--- a/Service/Cloud/Msg/Host/Req/SingleBatInfo.cs
+++ b/Service/Cloud/Msg/Host/Req/SingleBatInfo.cs
@@ -84,8 +84,4 @@ public class SingleBatInfo
///
public DateTime bt { get; set; }
- public string GetCmd()
- {
- return CloudConst.batDataInfo;
- }
}
\ No newline at end of file
diff --git a/Service/Cloud/Msg/Host/Req/StaDayOpeEnergyVal.cs b/Service/Cloud/Msg/Host/Req/StaDayOpeEnergyVal.cs
index b70b779..a48c0e4 100644
--- a/Service/Cloud/Msg/Host/Req/StaDayOpeEnergyVal.cs
+++ b/Service/Cloud/Msg/Host/Req/StaDayOpeEnergyVal.cs
@@ -1,70 +1,83 @@
using Service.Cloud.Common;
-namespace Service.Cloud.Msg.Host;
+namespace Service.Cloud.Msg.Host.Req;
///
/// 5.2.17 换电站日运行统计结果信息
///
-public class StaDayOpeEnergyVal
+public class StaDayOpeEnergyVal : ICmd
{
///
/// 换电站编码 换电站唯一码,区域码+ 类型码+流水号
///
public string sn { get; set; }
+
///
/// 换电站名称 ****换电站
///
public string sm { get; set; }
+
///
/// 运行开始时间 比如:08:00
///
public DateTime st { get; set; }
+
///
/// 运行结束时间 比如:18:00
///
public DateTime et { get; set; }
+
///
/// 站运行总时长 单位:分钟
///
public int tt { get; set; }
+
///
/// 首次换电时刻 格式 ”yyyy-MM-dd HH:mm:ss ”
///
public DateTime ft { get; set; }
+
///
/// 结束换电时刻 格式 ”yyyy-MM-dd HH:mm:ss ”
///
public DateTime sp { get; set; }
+
///
/// 换电总时长 单位: 秒
///
public float ts { get; set; }
+
///
/// 换电总次数 换电总次数
///
public int tc { get; set; }
+
///
/// 充电总次数 充电总次数
///
public int cc { get; set; }
+
///
/// 运营状态
///
public byte os { get; set; }
+
///
/// 平均换电时长 单位:秒
///
public float at { get; set; }
+
///
/// 平均充电时长 单位:分钟
///
public float ct { get; set; }
+
///
/// 换电日期 精确到 日。格式 ” yyyy-MM-dd”(如2020-11-20)
///
public DateTime dt { get; set; }
-
-
+
+
public string GetCmd()
{
return CloudConst.staDayOpeEnergyVal;
diff --git a/Service/Cloud/Msg/Host/Req/UploadSwapOrder.cs b/Service/Cloud/Msg/Host/Req/StaSwapRecord.cs
similarity index 99%
rename from Service/Cloud/Msg/Host/Req/UploadSwapOrder.cs
rename to Service/Cloud/Msg/Host/Req/StaSwapRecord.cs
index 8eec39a..c235a66 100644
--- a/Service/Cloud/Msg/Host/Req/UploadSwapOrder.cs
+++ b/Service/Cloud/Msg/Host/Req/StaSwapRecord.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.1.1 换电上传换电订单
///
- public class UploadSwapOrder : ICmd
+ public class StaSwapRecord : ICmd
{
///
/// 换电站编码
diff --git a/Service/Cloud/Msg/Host/Req/ChannelStatusReporting.cs b/Service/Cloud/Msg/Host/Req/StationChnRunStatus.cs
similarity index 97%
rename from Service/Cloud/Msg/Host/Req/ChannelStatusReporting.cs
rename to Service/Cloud/Msg/Host/Req/StationChnRunStatus.cs
index b223e19..ae224db 100644
--- a/Service/Cloud/Msg/Host/Req/ChannelStatusReporting.cs
+++ b/Service/Cloud/Msg/Host/Req/StationChnRunStatus.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Req
///
/// 4.2.4.2 换电站通道状态上报
///
- public class ChannelStatusReporting : ICmd
+ public class StationChnRunStatus : ICmd
{
///
/// 换电通道编号
diff --git a/Service/Cloud/Msg/Host/Req/StationRunStatus.cs b/Service/Cloud/Msg/Host/Req/StationRunStatus.cs
new file mode 100644
index 0000000..9f03a38
--- /dev/null
+++ b/Service/Cloud/Msg/Host/Req/StationRunStatus.cs
@@ -0,0 +1,23 @@
+using Service.Cloud.Common;
+
+namespace Service.Cloud.Msg.Host.Req;
+
+public class StationRunStatus : ICmd
+{
+ ///
+ /// 服务状态 0:未知 1:换电站服务启用 2:换电站服务停用
+ ///
+ public int rs { get; set; }
+ ///
+ /// 换电站运营状态 1:营业状态 2:暂停营业状态 3:设备维护状态 4:歇业状态
+ ///
+ public int os { get; set; }
+ ///
+ /// 换电站总体故障等级 参考 1.4 中故障等级定义
+ ///
+ public int fl { get; set; }
+ public string GetCmd()
+ {
+ return CloudConst.stationRunStatus;
+ }
+}
\ No newline at end of file
diff --git a/Service/Cloud/Msg/Host/Resp/PowerChangeCommandResp.cs b/Service/Cloud/Msg/Host/Resp/CarCanStartRes.cs
similarity index 96%
rename from Service/Cloud/Msg/Host/Resp/PowerChangeCommandResp.cs
rename to Service/Cloud/Msg/Host/Resp/CarCanStartRes.cs
index 82fe2cf..3a95f67 100644
--- a/Service/Cloud/Msg/Host/Resp/PowerChangeCommandResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/CarCanStartRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 2 换电站应答车辆开始换电指令
///
- public class PowerChangeCommandResp : ICmd
+ public class CarCanStartRes : ICmd
{
///
/// 接收结果
diff --git a/Service/Cloud/Msg/Host/Resp/ParameterAcquisitionResp.cs b/Service/Cloud/Msg/Host/Resp/GetConfigRes.cs
similarity index 95%
rename from Service/Cloud/Msg/Host/Resp/ParameterAcquisitionResp.cs
rename to Service/Cloud/Msg/Host/Resp/GetConfigRes.cs
index bf14e37..1fbe8d3 100644
--- a/Service/Cloud/Msg/Host/Resp/ParameterAcquisitionResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/GetConfigRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 3.2.11.2 换电站应答后台服务器下发参数获取
///
- public class ParameterAcquisitionResp : ICmd
+ public class GetConfigRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/OfflinePowerOnVehicleDataResp.cs b/Service/Cloud/Msg/Host/Resp/SetChangeCarDataRes.cs
similarity index 91%
rename from Service/Cloud/Msg/Host/Resp/OfflinePowerOnVehicleDataResp.cs
rename to Service/Cloud/Msg/Host/Resp/SetChangeCarDataRes.cs
index 6cba53f..9831de5 100644
--- a/Service/Cloud/Msg/Host/Resp/OfflinePowerOnVehicleDataResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetChangeCarDataRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 3.2.9.2 换电站应答后台服务器下发离线换电车辆数据
///
- public class OfflinePowerOnVehicleDataResp : ICmd
+ public class SetChangeCarDataRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/ChargerElectricityPriceModelResp.cs b/Service/Cloud/Msg/Host/Resp/SetChargePriceRes.cs
similarity index 91%
rename from Service/Cloud/Msg/Host/Resp/ChargerElectricityPriceModelResp.cs
rename to Service/Cloud/Msg/Host/Resp/SetChargePriceRes.cs
index ac9790c..7cb45f3 100644
--- a/Service/Cloud/Msg/Host/Resp/ChargerElectricityPriceModelResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetChargePriceRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 2 换电站应答后台服务器下发换电站充电电价模型
///
- public class ChargerElectricityPriceModelResp : ICmd
+ public class SetChargePriceRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/SetConfigurationParametersResp.cs b/Service/Cloud/Msg/Host/Resp/SetConfigRes.cs
similarity index 91%
rename from Service/Cloud/Msg/Host/Resp/SetConfigurationParametersResp.cs
rename to Service/Cloud/Msg/Host/Resp/SetConfigRes.cs
index c8bf8a3..a2f8632 100644
--- a/Service/Cloud/Msg/Host/Resp/SetConfigurationParametersResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetConfigRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 1.2 换电站应答后台服务器下发参数设置
///
- public class SetConfigurationParametersResp : ICmd
+ public class SetConfigRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/BatteryOperatingModelResp.cs b/Service/Cloud/Msg/Host/Resp/SetOpModelRes.cs
similarity index 92%
rename from Service/Cloud/Msg/Host/Resp/BatteryOperatingModelResp.cs
rename to Service/Cloud/Msg/Host/Resp/SetOpModelRes.cs
index 2493084..56f6861 100644
--- a/Service/Cloud/Msg/Host/Resp/BatteryOperatingModelResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetOpModelRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 3.2.7.2 换电站应答后台服务器设置换电站的电池运营模型
///
- public class BatteryOperatingModelResp : ICmd
+ public class SetOpModelRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/BusinessHourResp.cs b/Service/Cloud/Msg/Host/Resp/SetOpTimeRes.cs
similarity index 93%
rename from Service/Cloud/Msg/Host/Resp/BusinessHourResp.cs
rename to Service/Cloud/Msg/Host/Resp/SetOpTimeRes.cs
index 0543e21..40118b6 100644
--- a/Service/Cloud/Msg/Host/Resp/BusinessHourResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetOpTimeRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 3.2.6.2 换电站应答后台服务器下发后台服务器设置换电站的营业时段
///
- public class BusinessHourResp : ICmd
+ public class SetOpTimeRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/SetStBaseInfoRes.cs b/Service/Cloud/Msg/Host/Resp/SetStBaseInfoRes.cs
index 1d9b241..e581bdb 100644
--- a/Service/Cloud/Msg/Host/Resp/SetStBaseInfoRes.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetStBaseInfoRes.cs
@@ -5,7 +5,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 3.2.3.2 换电站应答后台服务器下发换电站的基础信息
///
- public class DeliverBasicInformationResp : ICmd
+ public class SetStBaseInfoRes : ICmd
{
///
/// 应答结果
diff --git a/Service/Cloud/Msg/Host/Resp/ElectricityPriceModelResp.cs b/Service/Cloud/Msg/Host/Resp/SetStaPriceRes.cs
similarity index 96%
rename from Service/Cloud/Msg/Host/Resp/ElectricityPriceModelResp.cs
rename to Service/Cloud/Msg/Host/Resp/SetStaPriceRes.cs
index b14e5b6..5819b47 100644
--- a/Service/Cloud/Msg/Host/Resp/ElectricityPriceModelResp.cs
+++ b/Service/Cloud/Msg/Host/Resp/SetStaPriceRes.cs
@@ -10,7 +10,7 @@ namespace Service.Cloud.Msg.Host.Resp
///
/// 3.2.9.1 后台服务器下发换电站充电机的电价模型
///
- public class ElectricityPriceModelResp : ICmd
+ public class SetStaPriceRes : ICmd
{
///
/// 更新时间
diff --git a/Service/Execute/Api/CloudApi.cs b/Service/Execute/Api/CloudApi.cs
index 045bccf..1952b2b 100644
--- a/Service/Execute/Api/CloudApi.cs
+++ b/Service/Execute/Api/CloudApi.cs
@@ -24,10 +24,10 @@ public abstract class CloudApi
///
///
///
- public static VehicleCertificationResp? VehicleCheck(RfidReadModel rfidReadModel, SwapOrder swapOrder)
+ public static CarAuthRes? VehicleCheck(RfidReadModel rfidReadModel, SwapOrder swapOrder)
{
- VehicleCertification vehicleCertification = new()
+ CarAuth carAuth = new()
{
ty = 2,
rfid = rfidReadModel.VelVin,
@@ -40,9 +40,9 @@ public abstract class CloudApi
};
Log.Info(
- $" CloudApi VehicleCheck SendVehicleCertification param={JsonConvert.SerializeObject(vehicleCertification)}");
- VehicleCertificationResp? sendVehicleCertification =
- CloudClientMgr.CloudClient?.SendVehicleCertification(vehicleCertification,
+ $" CloudApi VehicleCheck SendVehicleCertification param={JsonConvert.SerializeObject(carAuth)}");
+ CarAuthRes? sendVehicleCertification =
+ CloudClientMgr.CloudClient?.SendVehicleCertification(carAuth,
global::System.TimeSpan.FromSeconds(TimeSpan));
Log.Info(
@@ -62,7 +62,7 @@ public abstract class CloudApi
,SwapOrderReportCloud orderReportCloud)
{
- UploadSwapOrder uploadSwapOrder = new()
+ StaSwapRecord staSwapRecord = new()
{
rfid = swapOrder.VehicleVin,
sn = StaticStationInfo.StationNo,
@@ -91,10 +91,10 @@ public abstract class CloudApi
vtm=orderReportCloud.Vtm,
};
Log.Info(
- $" CloudApi UploadSwapOrder seq={seq} SendUploadPowerChangeOrder param={JsonConvert.SerializeObject(uploadSwapOrder)}");
+ $" CloudApi UploadSwapOrder seq={seq} SendUploadPowerChangeOrder param={JsonConvert.SerializeObject(staSwapRecord)}");
- UploadSwapOrderResp? sendUploadPowerChangeOrder = CloudClientMgr.CloudClient?.SendUploadPowerChangeOrder(
- uploadSwapOrder,
+ StaSwapRecordRes? sendUploadPowerChangeOrder = CloudClientMgr.CloudClient?.SendUploadPowerChangeOrder(
+ staSwapRecord,
global::System.TimeSpan.FromSeconds(TimeSpan));
Log.Info(
$" CloudApi UploadSwapOrder seq={seq} SendUploadPowerChangeOrder resp={JsonConvert.SerializeObject(sendUploadPowerChangeOrder)}");
@@ -114,11 +114,11 @@ public abstract class CloudApi
///
public static void SendStateLog(SwapOrder swapOrder, InfoEnum.BusinessSwappingForCloudState state)
{
- ChannelStatusReporting channelStatusReporting = new()
+ StationChnRunStatus stationChnRunStatus = new()
{
};
- CloudClientMgr.CloudClient?.SendChannelStatusReporting(channelStatusReporting,
+ CloudClientMgr.CloudClient?.SendChannelStatusReporting(stationChnRunStatus,
global::System.TimeSpan.FromSeconds(TimeSpan));
return;
}
diff --git a/Service/Execute/Step/CarPrepareState.cs b/Service/Execute/Step/CarPrepareState.cs
index 379ee8d..80227c0 100644
--- a/Service/Execute/Step/CarPrepareState.cs
+++ b/Service/Execute/Step/CarPrepareState.cs
@@ -194,7 +194,7 @@ public class CarPrepareState : IState
BaseEnumExtensions.GetEnumByCode(
StaticStationInfo.StationModel))
{
- VehicleCertificationResp? vehicleCertificationResp =
+ CarAuthRes? vehicleCertificationResp =
CloudApi.VehicleCheck(machine.RfidReadModel, machine.SwapOrder);
if (vehicleCertificationResp == null || vehicleCertificationResp.re != 0)
diff --git a/Service/Service.csproj b/Service/Service.csproj
index 5ce8eff..cca5f77 100644
--- a/Service/Service.csproj
+++ b/Service/Service.csproj
@@ -57,6 +57,8 @@
+
+
diff --git a/WebStarter/Controllers/FireControlController.cs b/WebStarter/Controllers/FireControlController.cs
index 1ea9adc..12e1270 100644
--- a/WebStarter/Controllers/FireControlController.cs
+++ b/WebStarter/Controllers/FireControlController.cs
@@ -224,7 +224,7 @@ public class FireControlController
/// 获取读取到的信息
///
///
- [HttpGet("GetSubzone2")]
+ [HttpGet("GetSubzone6")]
public Result GetSubzone6()
{
return Result.Success(FireControlMgr.Subzone6);
@@ -244,7 +244,7 @@ public class FireControlController
/// 获取读取到的信息
///
///
- [HttpGet("GetSubzone2")]
+ [HttpGet("GetSubzone8")]
public Result GetSubzone8()
{
return Result.Success(FireControlMgr.Subzone8);
diff --git a/WebStarter/Controllers/Test/GenController.cs b/WebStarter/Controllers/Test/GenController.cs
index db3c8ab..f425bd4 100644
--- a/WebStarter/Controllers/Test/GenController.cs
+++ b/WebStarter/Controllers/Test/GenController.cs
@@ -44,9 +44,9 @@ public class GenController : ControllerBase
}
[HttpGet("CloudTestVelCheck")]
- public Result CloudTestVelCheck()
+ public Result CloudTestVelCheck()
{
- VehicleCertificationResp vehicleCertificationResp = CloudApi.VehicleCheck(new RfidReadModel()
+ CarAuthRes carAuthRes = CloudApi.VehicleCheck(new RfidReadModel()
{
//VelMac = "111",
VelNo = "晋C03733D",
@@ -55,11 +55,11 @@ public class GenController : ControllerBase
{
VehicleEnterTime = DateTime.Now
});
- return Result.Success(vehicleCertificationResp);
+ return Result.Success(carAuthRes);
}
[HttpGet("CloudTestUploadSwapOrder")]
- public Result CloudTestUploadSwapOrder()
+ public Result CloudTestUploadSwapOrder()
{
var uploadSwapOrder = CloudApi.UploadSwapOrder(new SwapOrder()
{
@@ -80,12 +80,12 @@ public class GenController : ControllerBase
{
});
- return Result.Success();
+ return Result.Success();
}
[HttpGet("CloudTestUploadChargeOrder")]
- public Result CloudTestUploadChargeOrder()
+ public Result CloudTestUploadChargeOrder()
{
List chargeOrders = new List()
{
@@ -104,7 +104,7 @@ public class GenController : ControllerBase
};
CloudClientMgr.CloudClient?.PublishChargeOrder(chargeOrders, 1);
- return Result.Success();
+ return Result.Success();
}
diff --git a/WebStarter/Properties/launchSettings.json b/WebStarter/Properties/launchSettings.json
index e31ee95..82f39c3 100644
--- a/WebStarter/Properties/launchSettings.json
+++ b/WebStarter/Properties/launchSettings.json
@@ -17,7 +17,7 @@
"applicationUrl": "http://localhost:5034",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
- "profiles_active": "dev"
+ "profiles_active": "prod"
}
},
"IIS Express": {
@@ -27,7 +27,7 @@
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development",
"applicationUrl": "http://0.0.0.0:5034",
- "profiles_active": "dev"
+ "profiles_active": "prod"
}
}
}