diff --git a/Service/Charger/Client/ChargerClient.cs b/Service/Charger/Client/ChargerClient.cs index 9d2d1cf..90d906f 100644 --- a/Service/Charger/Client/ChargerClient.cs +++ b/Service/Charger/Client/ChargerClient.cs @@ -36,35 +36,35 @@ public class ChargerClient : TcpClient /// ///充电机遥信数据 /// - public UploadRemoteSignalData uploadRemoteSignalData = new UploadRemoteSignalData(); + public UploadRemoteSignalData UploadRemoteSignalData = new UploadRemoteSignalData(); /// /// 充电机工作状态-从遥信数据包中得到。00H:待机 01H:工作 02H:工作完成 03H:充/放电暂停 /// - public byte workstate { get; set; } + public byte Workstate { get; set; } /// /// 充电机故障-遥信数据包总故障 00H正常、01H故障 /// - public bool totalError { get; set; } + public bool TotalError { get; set; } /// /// 充电机告警-遥信数据包总告警 00H正常、01H告警 /// - public bool totalWarning { get; set; } + public bool TotalWarning { get; set; } /// /// 充电机遥测数据 /// - public UploadTelemetryData uploadTelemetryData = new UploadTelemetryData(); + public UploadTelemetryData UploadTelemetryData = new UploadTelemetryData(); /// ///充电机实时充电功率 /// - public float realTimeChargePower { get; set; } = 0; + public float RealTimeChargePower { get; set; } = 0; /// /// 心跳-桩状态 /// - public byte pileState { get; set; } + public byte PileState { get; set; } diff --git a/Service/Charger/Handler/HeartBeatHandler.cs b/Service/Charger/Handler/HeartBeatHandler.cs index 4fa9c86..9744d43 100644 --- a/Service/Charger/Handler/HeartBeatHandler.cs +++ b/Service/Charger/Handler/HeartBeatHandler.cs @@ -21,7 +21,7 @@ namespace Service.Charger.Handler //心跳存储日志 Log.Info($"receive {msg} from {sn}"); //心跳桩状态 - client.pileState = msg.Status; + client.PileState = msg.Status; //监控平台心跳应答:0-正常、1-未注册 HeartBeatRes heartBeatRes = new HeartBeatRes(0); diff --git a/Service/Charger/Handler/UploadRemoteSignalDataHandler.cs b/Service/Charger/Handler/UploadRemoteSignalDataHandler.cs index cc9c69b..e8c485f 100644 --- a/Service/Charger/Handler/UploadRemoteSignalDataHandler.cs +++ b/Service/Charger/Handler/UploadRemoteSignalDataHandler.cs @@ -29,11 +29,11 @@ namespace Service.Charger.Handler //存储日志 Log.Info($"receive {msg} from {sn}"); - client.workstate = msg.WorkStatus; + client.Workstate = msg.WorkStatus; client.IsCharged = msg.WorkStatus == 1 ? true : false; - client.totalError = msg.TotalError; - client.totalWarning = msg.TotalWarning; - client.uploadRemoteSignalData = msg; + client.TotalError = msg.TotalError; + client.TotalWarning = msg.TotalWarning; + client.UploadRemoteSignalData = msg; } else { diff --git a/Service/Charger/Handler/UploadTelemetryDataHandler.cs b/Service/Charger/Handler/UploadTelemetryDataHandler.cs index 20d58be..94373dd 100644 --- a/Service/Charger/Handler/UploadTelemetryDataHandler.cs +++ b/Service/Charger/Handler/UploadTelemetryDataHandler.cs @@ -28,9 +28,9 @@ namespace Service.Charger.Handler //存储日志 Log.Info($"receive {msg} from {sn}"); - client.uploadTelemetryData = msg; + client.UploadTelemetryData = msg; //充电机实时充电功率 - client.realTimeChargePower = msg.HighVoltageAcquisitionCurrent * msg.HighVoltageAcquisitionVoltage; + client.RealTimeChargePower = msg.HighVoltageAcquisitionCurrent * msg.HighVoltageAcquisitionVoltage; } else {