diff --git a/BatCharging.Service/ChargerMgrTool.cs b/BatCharging.Service/ChargerMgrTool.cs index 04438f2..f322f40 100644 --- a/BatCharging.Service/ChargerMgrTool.cs +++ b/BatCharging.Service/ChargerMgrTool.cs @@ -1108,11 +1108,11 @@ namespace BatCharging.Service if (CMD104 != null) { - byte chargeNum= 0; + byte chargeNum = 0; bool reportMessage = true; //(CMD=9)后台服务器应答桩上传命令请求(预留) - CmnChargerParam._CHR00TCPCLIENT.Send103(chargeNum,reportMessage); + CmnChargerParam._CHR00TCPCLIENT.Send103(chargeNum, reportMessage); } } @@ -1199,7 +1199,7 @@ namespace BatCharging.Service case 202: case 222: { - CMD202 CMD202 = new MsgReceiveCMDCom().ConCMD202(func,data); + CMD202 CMD202 = new MsgReceiveCMDCom().ConCMD202(func, data); string result = "充电桩上报充电记录信息 - 接收字节内容:" + ByteUtils.BytesToHexStr(data) + ";"; result += "\r\n" + "上报充电记录信息对象:" + JsonConvert.SerializeObject(CMD202); Log.LogInstance.WriteLog(result, LogType.Information, "Charger" + "充电机编码"); @@ -1224,7 +1224,17 @@ namespace BatCharging.Service if (CMD204 != null) { - //CmnChargerParam._CHR00TCPCLIENT.Send203(); + uint value03 = 0; + uint value04 = 0; + ushort value05 = 0; + ushort value06 = 0; + byte value07 = 0; + byte value08 = 0; + byte value09 = 0; + byte value10 = 0; + string value11 = "123"; + string value12 = "456"; + CmnChargerParam._CHR00TCPCLIENT.Send203(CMD204, value03, value04, value05, value06, value07, value08, value09, value10, value11, value12); } } @@ -1238,7 +1248,9 @@ namespace BatCharging.Service if (CMD206 != null) { - //CmnChargerParam._CHR00TCPCLIENT.Send205(); + uint value03 = 0; + uint value04 = 0; + CmnChargerParam._CHR00TCPCLIENT.Send205(value03, value04); } } diff --git a/BatCharging.Service/DataRlt/解析数据/MsgReceiveCMDCom.cs b/BatCharging.Service/DataRlt/解析数据/MsgReceiveCMDCom.cs index 8589eb9..08ba1e0 100644 --- a/BatCharging.Service/DataRlt/解析数据/MsgReceiveCMDCom.cs +++ b/BatCharging.Service/DataRlt/解析数据/MsgReceiveCMDCom.cs @@ -612,9 +612,9 @@ namespace BatCharging.Service.DataRlt CMD208.value02 = ByteUtils.DToUInt16(data, 10); CMD208.value03 = Encoding.ASCII.GetString(data, 12, 32); CMD208.value04 = data[44]; - CMD208.value05 = Encoding.ASCII.GetString(data, 45, 32); - CMD208.value06 = data[77]; - CMD208.value07 = ByteUtils.DToUInt32(data, 78); + CMD208.value05 = Encoding.ASCII.GetString(data, 45, 17); + CMD208.value06 = data[62]; + CMD208.value07 = ByteUtils.DToUInt32(data, 63); } return CMD208; } diff --git a/BatCharging.Service/发送方法/ChargerSendCMD.cs b/BatCharging.Service/发送方法/ChargerSendCMD.cs index cf411a2..904b5cb 100644 --- a/BatCharging.Service/发送方法/ChargerSendCMD.cs +++ b/BatCharging.Service/发送方法/ChargerSendCMD.cs @@ -731,8 +731,8 @@ namespace BatCharging.Service lstContent.AddRange(BitConverter.GetBytes(CMD.value08)); lstContent.AddRange(BitConverter.GetBytes(CMD.value09)); lstContent.AddRange(BitConverter.GetBytes(CMD.value10)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value11)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value12)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value11, 32)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value12, 17)); lstContent.AddRange(BitConverter.GetBytes(CMD.value13)); results = lstContent.ToArray(); @@ -830,11 +830,11 @@ namespace BatCharging.Service lstContent.AddRange(BitConverter.GetBytes(CMD.value01)); lstContent.AddRange(BitConverter.GetBytes(CMD.value02)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value03)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value03, 32)); lstContent.AddRange(BitConverter.GetBytes(CMD.value04)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value05)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value06)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value07)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value05, 17)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value06, 32)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value07, 32)); lstContent.AddRange(BitConverter.GetBytes(CMD.value08)); lstContent.AddRange(BitConverter.GetBytes(CMD.value09)); lstContent.AddRange(BitConverter.GetBytes(CMD.value10)); @@ -883,9 +883,9 @@ namespace BatCharging.Service lstContent.AddRange(BitConverter.GetBytes(CMD.value01)); lstContent.AddRange(BitConverter.GetBytes(CMD.value02)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value03)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value03, 32)); lstContent.AddRange(BitConverter.GetBytes(CMD.value04)); - lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.value05)); + lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value05, 17)); results = lstContent.ToArray(); }