diff --git a/BatCharging.Service/ChargerMgrTool.cs b/BatCharging.Service/ChargerMgrTool.cs
index 70be8db..78806a6 100644
--- a/BatCharging.Service/ChargerMgrTool.cs
+++ b/BatCharging.Service/ChargerMgrTool.cs
@@ -1086,8 +1086,8 @@ namespace BatCharging.Service
case 102:
{
CMD102 CMD102 = new MsgReceiveCMDCom().ConCMD102(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD102);
+ string result = "(CMD=10)充电桩上传心跳包信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩上传心跳包信息对象：" + JsonConvert.SerializeObject(CMD102);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD102 != null)
@@ -1102,8 +1102,8 @@ namespace BatCharging.Service
case 104:
{
CMD104 CMD104 = new MsgReceiveCMDCom().ConCMD104(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD104);
+ string result = "(CMD=10)充电桩状态信息包上报 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩状态信息包上报对象：" + JsonConvert.SerializeObject(CMD104);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD104 != null)
@@ -1122,8 +1122,8 @@ namespace BatCharging.Service
case 106:
{
CMD106 CMD106 = new MsgReceiveCMDCom().ConCMD106(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD106);
+ string result = "(CMD=10)充电桩签到信息上报 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩签到信息上报对象：" + JsonConvert.SerializeObject(CMD106);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD106 != null)
@@ -1138,8 +1138,8 @@ namespace BatCharging.Service
case 108:
{
CMD108 CMD108 = new MsgReceiveCMDCom().ConCMD108(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD108);
+ string result = "(CMD=10)充电桩告警信息上报(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩告警信息上报(预留)对象：" + JsonConvert.SerializeObject(CMD108);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD108 != null)
@@ -1153,8 +1153,8 @@ namespace BatCharging.Service
case 110:
{
CMD110 CMD110 = new MsgReceiveCMDCom().ConCMD110(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD110);
+ string result = "(CMD=10)充电桩上报充电启动完成命令(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩上报充电启动完成命令(预留)对象：" + JsonConvert.SerializeObject(CMD110);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD110 != null)
@@ -1168,8 +1168,8 @@ namespace BatCharging.Service
case 112:
{
CMD112 CMD112 = new MsgReceiveCMDCom().ConCMD112(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD112);
+ string result = "(CMD=10)充电桩模块信息上报(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩模块信息上报对象：" + JsonConvert.SerializeObject(CMD112);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD112 != null)
@@ -1184,18 +1184,13 @@ namespace BatCharging.Service
case 114:
{
CMD114 CMD114 = new MsgReceiveCMDCom().ConCMD114(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD114);
+ string result = "(CMD=10)充电桩应答服务器查询最近一次充电各时段信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "(CMD=10)充电桩应答服务器查询最近一次充电各时段信息对象：" + JsonConvert.SerializeObject(CMD114);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD114 != null)
{
- byte chargeNum = 0;
- byte sign = 0;
-
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send113(chargeNum, sign);
-
+ //todo
}
}
break;
@@ -1206,29 +1201,27 @@ namespace BatCharging.Service
case 202:
{
CMD202 CMD202 = new MsgReceiveCMDCom().ConCMD202(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD202);
+ string result = "充电桩上报充电记录信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "上报充电记录信息对象：" + JsonConvert.SerializeObject(CMD202);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD202 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send201();
-
+ //todo
+ CmnChargerParam._CHR00TCPCLIENT.Send201(CMD202,);
}
}
break;
case 204:
{
CMD204 CMD204 = new MsgReceiveCMDCom().ConCMD204(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD204);
+ string result = "充电桩充电上传用户账户查询报文 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩充电上传用户账户查询报文对象：" + JsonConvert.SerializeObject(CMD204);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD204 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send203();
+ CmnChargerParam._CHR00TCPCLIENT.Send203();
}
}
@@ -1236,14 +1229,13 @@ namespace BatCharging.Service
case 206:
{
CMD206 CMD206 = new MsgReceiveCMDCom().ConCMD206(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD206);
+ string result = "充电桩充电上传用户密码验证报文 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩充电上传用户密码验证报文对象：" + JsonConvert.SerializeObject(CMD206);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD206 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send205();
+ CmnChargerParam._CHR00TCPCLIENT.Send205();
}
}
@@ -1251,14 +1243,12 @@ namespace BatCharging.Service
case 208:
{
CMD208 CMD208 = new MsgReceiveCMDCom().ConCMD208(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD208);
+ string result = "充电桩上报“即插即充”启动充电请求 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩上报“即插即充”启动充电请求对象：" + JsonConvert.SerializeObject(CMD208);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD208 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
-
CmnChargerParam._CHR00TCPCLIENT.Send207(CMD208, "", "", 0, 0, 0, 0);
}
@@ -1267,8 +1257,8 @@ namespace BatCharging.Service
case 210:
{
CMD210 CMD210 = new MsgReceiveCMDCom().ConCMD210(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD210);
+ string result = "充电桩上报“即插即充”启动充电结果 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩上报“即插即充”启动充电结果：" + JsonConvert.SerializeObject(CMD210);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD210 != null)
@@ -1286,8 +1276,8 @@ namespace BatCharging.Service
case 302:
{
CMD302 CMD302 = new MsgReceiveCMDCom().ConCMD302(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD302);
+ string result = "充电桩上报BMS信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩上报BMS信息对象：" + JsonConvert.SerializeObject(CMD302);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD302 != null)
@@ -1301,8 +1291,8 @@ namespace BatCharging.Service
case 304:
{
CMD304 CMD304 = new MsgReceiveCMDCom().ConCMD304(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD304);
+ string result = "充电桩上报BMS信息(预留-暂时不用) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩上报BMS信息(预留-暂时不用)对象：" + JsonConvert.SerializeObject(CMD304);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD304 != null)
@@ -1319,17 +1309,13 @@ namespace BatCharging.Service
case 402:
{
CMD402 CMD402 = new MsgReceiveCMDCom().ConCMD402(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD402);
+ string result = "充电桩上报历史的充电记录 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩上报历史的充电记录：" + JsonConvert.SerializeObject(CMD402);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD402 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- uint startIndex = 0;
- string chargingSerialNum = "";
- CmnChargerParam._CHR00TCPCLIENT.Send401(chargingSerialNum, startIndex);
-
+ //todo
}
}
break;
@@ -1339,14 +1325,13 @@ namespace BatCharging.Service
case 1002:
{
CMD1002 CMD1002 = new MsgReceiveCMDCom().ConCMD1002(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1002);
+ string result = "充电桩回复服务器下发擦除指令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩回复服务器下发擦除指令对象：" + JsonConvert.SerializeObject(CMD1002);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1002 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send1001();
+ //todo
}
}
@@ -1354,89 +1339,81 @@ namespace BatCharging.Service
case 1004:
{
CMD1004 CMD1004 = new MsgReceiveCMDCom().ConCMD1004(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1004);
+ string result = "充电桩应答服务器下发升级文件名指令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发升级文件名指令对象：" + JsonConvert.SerializeObject(CMD1004);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1004 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send1003();
-
+ //todo
}
}
break;
case 1006:
{
CMD1006 CMD1006 = new MsgReceiveCMDCom().ConCMD1006(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1006);
+ string result = "充电桩应答服务器下发升级文件大小指令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发升级文件大小指令对象：" + JsonConvert.SerializeObject(CMD1006);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1006 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send1005();
-
+ //todo
}
}
break;
case 1008:
{
CMD1008 CMD1008 = new MsgReceiveCMDCom().ConCMD1008(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1008);
+ string result = "充电桩应答服务器下发升级文件数据指令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发升级文件数据指令对象：" + JsonConvert.SerializeObject(CMD1008);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1008 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send1007();
-
+ //todo
}
}
break;
case 1010:
{
CMD1010 CMD1010 = new MsgReceiveCMDCom().ConCMD1010(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1010);
+ string result = "充电桩应答服务器下发升级文件数据结束指令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发升级文件数据结束指令对象：" + JsonConvert.SerializeObject(CMD1010);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1010 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send1009();
-
+ //todo
}
}
break;
case 1012:
{
CMD1012 CMD1012 = new MsgReceiveCMDCom().ConCMD1012(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1012);
+ string result = "充电桩应答服务器下发重启指令- 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发重启指令对象：" + JsonConvert.SerializeObject(CMD1012);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1012 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send1011();
-
+ //todo
}
}
break;
case 1022:
{
CMD1022 CMD1022 = new MsgReceiveCMDCom().ConCMD1022(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1022);
+ string result = "充电桩主动请求升级命令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩主动请求升级命令对象：" + JsonConvert.SerializeObject(CMD1022);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1022 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send1021();
+ uint results = 0;
+ string description = "";
+ //服务器回复充电桩主动请求升级命令
+ CmnChargerParam._CHR00TCPCLIENT.Send1021( results, description);
}
}
@@ -1447,102 +1424,26 @@ namespace BatCharging.Service
case 1102:
{
CMD1102 CMD1102 = new MsgReceiveCMDCom().ConCMD1102(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1102);
+ string result = "充电桩应答后台服务器查询24时电费计价策略信息- 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答后台服务器查询24时电费计价策略信息对象：" + JsonConvert.SerializeObject(CMD1102);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1102 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
-
-
+ //todo
}
}
break;
case 1104:
{
CMD1104 CMD1104 = new MsgReceiveCMDCom().ConCMD1104(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1104);
+ string result = "充电桩应答后台服务器设置24时电费计价策略信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答后台服务器设置24时电费计价策略信息对象：" + JsonConvert.SerializeObject(CMD1104);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1104 != null)
{
- CMD1103 CMD = new CMD1103();
- CMD.startHour1 = 0;
- CMD.startMinute1 = 0;
- CMD.endHour1 = 0;
- CMD.endMinute1 = 0;
- CMD.rate1 = 0;
-
- CMD.startHour2 = 0;
- CMD.startMinute2 = 0;
- CMD.endHour2 = 0;
- CMD.endMinute2 = 0;
- CMD.rate2 = 0;
-
- CMD.startHour3 = 0;
- CMD.startMinute3 = 0;
- CMD.endHour3 = 0;
- CMD.endMinute3 = 0;
- CMD.rate3 = 0;
-
- CMD.startHour4 = 0;
- CMD.startMinute4 = 0;
- CMD.endHour4 = 0;
- CMD.endMinute4 = 0;
- CMD.rate4 = 0;
-
- CMD.startHour5 = 0;
- CMD.startMinute5 = 0;
- CMD.endHour5 = 0;
- CMD.endMinute5 = 0;
- CMD.rate5 = 0;
-
- CMD.startHour6 = 0;
- CMD.startMinute6 = 0;
- CMD.endHour6 = 0;
- CMD.endMinute6 = 0;
- CMD.rate6 = 0;
-
- CMD.startHour7 = 0;
- CMD.startMinute7 = 0;
- CMD.endHour7 = 0;
- CMD.endMinute7 = 0;
- CMD.rate7 = 0;
-
- CMD.startHour8 = 0;
- CMD.startMinute8 = 0;
- CMD.endHour8 = 0;
- CMD.endMinute8 = 0;
- CMD.rate8 = 0;
-
- CMD.startHour9 = 0;
- CMD.startMinute9 = 0;
- CMD.endHour9 = 0;
- CMD.endMinute9 = 0;
- CMD.rate9 = 0;
-
- CMD.startHour10 = 0;
- CMD.startMinute10 = 0;
- CMD.endHour10 = 0;
- CMD.endMinute10 = 0;
- CMD.rate10 = 0;
-
- CMD.startHour11 = 0;
- CMD.startMinute11 = 0;
- CMD.endHour11 = 0;
- CMD.endMinute11 = 0;
- CMD.rate11 = 0;
-
- CMD.startHour12 = 0;
- CMD.startMinute12 = 0;
- CMD.endHour12 = 0;
- CMD.endMinute12 = 0;
- CMD.rate12 = 0;
-
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send1103(CMD);
+ //todo
}
}
@@ -1550,99 +1451,13 @@ namespace BatCharging.Service
case 1106:
{
CMD1106 CMD1106 = new MsgReceiveCMDCom().ConCMD1106(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1106);
+ string result = "充电桩应答后台服务器设置分时段计价策略信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答后台服务器设置分时段计价策略信息对象：" + JsonConvert.SerializeObject(CMD1106);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1106 != null)
{
- CMD1105 CMD = new CMD1105();
- CMD.startHour1 = 0;
- CMD.startMinute1 = 0;
- CMD.endHour1 = 0;
- CMD.endMinute1 = 0;
- CMD.rate1 = 0;
- CMD.reserveRate1 = 0;
-
- CMD.startHour2 = 0;
- CMD.startMinute2 = 0;
- CMD.endHour2 = 0;
- CMD.endMinute2 = 0;
- CMD.rate2 = 0;
- CMD.reserveRate2 = 0;
-
- CMD.startHour3 = 0;
- CMD.startMinute3 = 0;
- CMD.endHour3 = 0;
- CMD.endMinute3 = 0;
- CMD.rate3 = 0;
- CMD.reserveRate3 = 0;
-
- CMD.startHour4 = 0;
- CMD.startMinute4 = 0;
- CMD.endHour4 = 0;
- CMD.endMinute4 = 0;
- CMD.rate4 = 0;
- CMD.reserveRate4 = 0;
-
- CMD.startHour5 = 0;
- CMD.startMinute5 = 0;
- CMD.endHour5 = 0;
- CMD.endMinute5 = 0;
- CMD.rate5 = 0;
- CMD.reserveRate5 = 0;
-
- CMD.startHour6 = 0;
- CMD.startMinute6 = 0;
- CMD.endHour6 = 0;
- CMD.endMinute6 = 0;
- CMD.rate6 = 0;
- CMD.reserveRate6 = 0;
-
- CMD.startHour7 = 0;
- CMD.startMinute7 = 0;
- CMD.endHour7 = 0;
- CMD.endMinute7 = 0;
- CMD.rate7 = 0;
- CMD.reserveRate7 = 0;
-
- CMD.startHour8 = 0;
- CMD.startMinute8 = 0;
- CMD.endHour8 = 0;
- CMD.endMinute8 = 0;
- CMD.rate8 = 0;
- CMD.reserveRate8 = 0;
-
- CMD.startHour9 = 0;
- CMD.startMinute9 = 0;
- CMD.endHour9 = 0;
- CMD.endMinute9 = 0;
- CMD.rate9 = 0;
- CMD.reserveRate9 = 0;
-
- CMD.startHour10 = 0;
- CMD.startMinute10 = 0;
- CMD.endHour10 = 0;
- CMD.endMinute10 = 0;
- CMD.rate10 = 0;
- CMD.reserveRate10 = 0;
-
- CMD.startHour11 = 0;
- CMD.startMinute11 = 0;
- CMD.endHour11 = 0;
- CMD.endMinute11 = 0;
- CMD.rate11 = 0;
- CMD.reserveRate11 = 0;
-
- CMD.startHour12 = 0;
- CMD.startMinute12 = 0;
- CMD.endHour12 = 0;
- CMD.endMinute12 = 0;
- CMD.rate12 = 0;
- CMD.reserveRate12 = 0;
-
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send1105(CMD);
+ //todo
}
}
@@ -1650,15 +1465,13 @@ namespace BatCharging.Service
case 1108:
{
CMD1108 CMD1108 = new MsgReceiveCMDCom().ConCMD1108(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1108);
+ string result = "充电桩回复分时电费计价策略信息 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩回复分时电费计价策略信息对象：" + JsonConvert.SerializeObject(CMD1108);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1108 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send1107();
-
+ //todo
}
}
break;
@@ -1668,34 +1481,13 @@ namespace BatCharging.Service
case 1302:
{
CMD1302 CMD1302 = new MsgReceiveCMDCom().ConCMD1302(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1302);
+ string result = "充电桩应答白名单操作日志数据包 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答白名单操作日志数据包对象：" + JsonConvert.SerializeObject(CMD1302);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1302 != null)
{
-
- CMD1301 CMD = new CMD1301();
- CMD.reserved1 = 0;
- CMD.reserved2 = 0;
- //CMD.chargingStationCode = chargingStationCode;
- //CMD.whitelistType = whitelistType;
- //CMD.operation = operation;
- //CMD.whitelistVersionNum = whitelistVersionNum;
- //CMD.DistributeWhitelistNum = DistributeWhitelistNum;
- //CMD.carVinOrChargCardNum01 = carVinOrChargCardNum01;
- //CMD.carVinOrChargCardNum02 = carVinOrChargCardNum02;
- //CMD.carVinOrChargCardNum03 = carVinOrChargCardNum03;
- //CMD.carVinOrChargCardNum04 = carVinOrChargCardNum04;
- //CMD.carVinOrChargCardNum05 = carVinOrChargCardNum05;
- //CMD.carVinOrChargCardNum06 = carVinOrChargCardNum06;
- //CMD.carVinOrChargCardNum07 = carVinOrChargCardNum07;
- //CMD.carVinOrChargCardNum08 = carVinOrChargCardNum08;
- //CMD.carVinOrChargCardNum09 = carVinOrChargCardNum09;
- //CMD.carVinOrChargCardNum10 = carVinOrChargCardNum10;
-
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- CmnChargerParam._CHR00TCPCLIENT.Send1301(CMD);
+ //todo
}
}
@@ -1706,45 +1498,39 @@ namespace BatCharging.Service
case 1402:
{
CMD1402 CMD1402 = new MsgReceiveCMDCom().ConCMD1402(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1402);
+ string result = "充电桩应答服务器下发FTP远程升级命令- 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发FTP远程升级命令对象：" + JsonConvert.SerializeObject(CMD1402);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1402 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send1401();
-
+ //todo
}
}
break;
case 1403:
{
CMD1403 CMD1403 = new MsgReceiveCMDCom().ConCMD1403(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1403);
+ string result = "充电桩应答FTP升级包下载进度 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答FTP升级包下载进度对象：" + JsonConvert.SerializeObject(CMD1403);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1403 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send9();
-
+ //todo
}
}
break;
case 1407:
{
CMD1407 CMD1407 = new MsgReceiveCMDCom().ConCMD1407(data);
- string result = "(CMD=10)充电桩上传命令请求(预留) - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
- result += "\r\n" + "(CMD=10)充电桩上传命令请求(预留)对象：" + JsonConvert.SerializeObject(CMD1407);
+ string result = "充电桩应答服务器下发获取充电桩日志命令 - 接收字节内容：" + ByteUtils.BytesToHexStr(data) + "；";
+ result += "\r\n" + "充电桩应答服务器下发获取充电桩日志命令对象：" + JsonConvert.SerializeObject(CMD1407);
Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码");
if (CMD1407 != null)
{
- //(CMD=9)后台服务器应答桩上传命令请求(预留)
- //CmnChargerParam._CHR00TCPCLIENT.Send9();
-
+ //todo
}
}
break;
diff --git a/Monitor.ChargeTest/FrmChargeResult.cs b/Monitor.ChargeTest/FrmChargeResult.cs
index f475d56..e5f9b52 100644
--- a/Monitor.ChargeTest/FrmChargeResult.cs
+++ b/Monitor.ChargeTest/FrmChargeResult.cs
@@ -433,6 +433,9 @@ namespace Monitor.ChargeTest
///
private void button1_Click(object sender, EventArgs e)
{
+
+
+
CmnChargerParam._CHR00TCPCLIENT.Send1101();
}
///