cz
/
CDJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://180.76.133.253:16300/cz/CDJ

Browse Source
master
CZ 8 months ago
parent 8cef64ddbd 31d2ce3041
commit 76d5b7aea3
10 changed files with 119 additions and 250 deletions
Show Stats Download Patch File Download Diff File

2
BatCharging.Model/客户端发送/CMD1001.cs
Unescape View File

@ -13,6 +13,6 @@ namespace BatCharging.Model
/// 擦除:0xaa55 有效 /// 擦除:0xaa55 有效
/// 查询:0x0000 有效 /// 查询:0x0000 有效
/// </summary> /// </summary>
public Int32 eraseOrQueryInstructions { get; set; } public uint eraseOrQueryInstructions { get; set; }
} }
} }

24
BatCharging.Model/客户端接收/CMD1102.cs
Unescape View File

@ -27,72 +27,72 @@ namespace BatCharging.Model
/// <summary> /// <summary>
/// 费率1 该时段内每度电的电费，用整型值表示，要乘 0.01才能得到真实的值 /// 费率1 该时段内每度电的电费，用整型值表示，要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate1 { get; set; } public uint rate1 { get; set; }
public byte startHour2 { get; set; } public byte startHour2 { get; set; }
public byte startMinute2 { get; set; } public byte startMinute2 { get; set; }
public byte endHour2 { get; set; } public byte endHour2 { get; set; }
public byte endMinute2 { get; set; } public byte endMinute2 { get; set; }
public int rate2 { get; set; } public uint rate2 { get; set; }
public byte startHour3 { get; set; } public byte startHour3 { get; set; }
public byte startMinute3 { get; set; } public byte startMinute3 { get; set; }
public byte endHour3 { get; set; } public byte endHour3 { get; set; }
public byte endMinute3 { get; set; } public byte endMinute3 { get; set; }
public int rate3 { get; set; } public uint rate3 { get; set; }
public byte startHour4 { get; set; } public byte startHour4 { get; set; }
public byte startMinute4 { get; set; } public byte startMinute4 { get; set; }
public byte endHour4 { get; set; } public byte endHour4 { get; set; }
public byte endMinute4 { get; set; } public byte endMinute4 { get; set; }
public int rate4 { get; set; } public uint rate4 { get; set; }
public byte startHour5 { get; set; } public byte startHour5 { get; set; }
public byte startMinute5 { get; set; } public byte startMinute5 { get; set; }
public byte endHour5 { get; set; } public byte endHour5 { get; set; }
public byte endMinute5 { get; set; } public byte endMinute5 { get; set; }
public int rate5 { get; set; } public uint rate5 { get; set; }
public byte startHour6 { get; set; } public byte startHour6 { get; set; }
public byte startMinute6 { get; set; } public byte startMinute6 { get; set; }
public byte endHour6 { get; set; } public byte endHour6 { get; set; }
public byte endMinute6 { get; set; } public byte endMinute6 { get; set; }
public int rate6 { get; set; } public uint rate6 { get; set; }
public byte startHour7 { get; set; } public byte startHour7 { get; set; }
public byte startMinute7 { get; set; } public byte startMinute7 { get; set; }
public byte endHour7 { get; set; } public byte endHour7 { get; set; }
public byte endMinute7 { get; set; } public byte endMinute7 { get; set; }
public int rate7 { get; set; } public uint rate7 { get; set; }
public byte startHour8 { get; set; } public byte startHour8 { get; set; }
public byte startMinute8 { get; set; } public byte startMinute8 { get; set; }
public byte endHour8 { get; set; } public byte endHour8 { get; set; }
public byte endMinute8 { get; set; } public byte endMinute8 { get; set; }
public int rate8 { get; set; } public uint rate8 { get; set; }
public byte startHour9 { get; set; } public byte startHour9 { get; set; }
public byte startMinute9 { get; set; } public byte startMinute9 { get; set; }
public byte endHour9 { get; set; } public byte endHour9 { get; set; }
public byte endMinute9 { get; set; } public byte endMinute9 { get; set; }
public int rate9 { get; set; } public uint rate9 { get; set; }
public byte startHour10 { get; set; } public byte startHour10 { get; set; }
public byte startMinute10 { get; set; } public byte startMinute10 { get; set; }
public byte endHour10 { get; set; } public byte endHour10 { get; set; }
public byte endMinute10 { get; set; } public byte endMinute10 { get; set; }
public int rate10 { get; set; } public uint rate10 { get; set; }
public byte startHour11 { get; set; } public byte startHour11 { get; set; }
public byte startMinute11 { get; set; } public byte startMinute11 { get; set; }
public byte endHour11 { get; set; } public byte endHour11 { get; set; }
public byte endMinute11 { get; set; } public byte endMinute11 { get; set; }
public int rate11 { get; set; } public uint rate11 { get; set; }
public byte startHour12 { get; set; } public byte startHour12 { get; set; }
public byte startMinute12 { get; set; } public byte startMinute12 { get; set; }
public byte endHour12 { get; set; } public byte endHour12 { get; set; }
public byte endMinute12 { get; set; } public byte endMinute12 { get; set; }
public int rate12 { get; set; } public uint rate12 { get; set; }
} }
} }

4
BatCharging.Model/客户端接收/CMD1503.cs
Unescape View File

@ -19,11 +19,11 @@ namespace BatCharging.Model
/// <summary> /// <summary>
/// 本次数据长度 /// 本次数据长度
/// </summary> /// </summary>
public int value03 {get; set; } public uint value03 {get; set; }
/// <summary> /// <summary>
/// 本次报文编号 新文件数据上传的第一包的数据从1 开始累加，服务器收到重复的编号要丢弃掉 /// 本次报文编号 新文件数据上传的第一包的数据从1 开始累加，服务器收到重复的编号要丢弃掉
/// </summary> /// </summary>
public int value04 { get; set; } public uint value04 { get; set; }
/// <summary> /// <summary>
/// 日志数据 /// 日志数据
/// </summary> /// </summary>

86
BatCharging.Service/ChargerMgrTool.cs
Unescape View File

@ -1593,10 +1593,10 @@ namespace BatCharging.Service
if (CMD1503 != null) if (CMD1503 != null)
{ {
//要加防止重复（未加） //要加防止重复（未加）
//要判断是否接收成功 //要判断是否接收成功 logo=0-成功接收、logo=1-接收出错
UInt32 logo = 0;
//(CMD=9)后台服务器应答桩上传命令请求(预留) //
CmnChargerParam._CHR00TCPCLIENT.Send1504(0, (uint)CMD1503.value04); CmnChargerParam._CHR00TCPCLIENT.Send1504(logo, CMD1503.value04);
Log.LogInstance.WriteLog(CMD1503.value05, LogType.Information, PublicProgram.failName01); Log.LogInstance.WriteLog(CMD1503.value05, LogType.Information, PublicProgram.failName01);
} }
@ -1611,7 +1611,7 @@ namespace BatCharging.Service
if (CMD1505 != null) if (CMD1505 != null)
{ {
//(CMD=9)后台服务器应答桩上传命令请求(预留) //
CmnChargerParam._CHR00TCPCLIENT.Send1506(); CmnChargerParam._CHR00TCPCLIENT.Send1506();
} }
@ -1625,80 +1625,6 @@ namespace BatCharging.Service
} }
} }
/// <summary>
/// 获取故障报警编号列表
/// </summary>
/// <param name="nowRemoteData"></param>
/// <param name="preRemoteData"></param>
/// <returns></returns>
private void GetFalutAlarmNoList(RemoteData nowRemoteData)
{
if (nowRemoteData != null)
{
//总告警【3】
ProcFaultResult(nowRemoteData.CommonAlarm, 3);
//急停按钮动作故障【4】
ProcFaultResult(nowRemoteData.EmergencyStop, 4);
//烟感故障【5】
ProcFaultResult(nowRemoteData.SmokeFault, 5);
//直流母线正极输出 接触器拒动/误 动故障【7】
ProcFaultResult(nowRemoteData.AGunPositiveFault, 7);
//直流母线负极输出 接触器拒动/误 动故障【8】
ProcFaultResult(nowRemoteData.AGunNegativeEleFault, 8);
//直流母线正级输出 熔断器故障【9】
ProcFaultResult(nowRemoteData.AGunPFuseFaulty, 9);
//直流母线负级输出 熔断器故障【10】
ProcFaultResult(nowRemoteData.AGunNPositiveFuseFaulty, 10);
//充电桩风扇故障【12】
ProcFaultResult(nowRemoteData.FanFailure, 12);
//绝缘监测故障【15】
ProcFaultResult(nowRemoteData.InsMonFault, 15);
//电池极性反接故障【16】
ProcFaultResult(nowRemoteData.BatPReverseConFault, 16);
//充电中车辆控制导引故障【17】
ProcFaultResult(nowRemoteData.VeConGuidanceFailure, 17);
//充电桩过温故障【18】
ProcFaultResult(nowRemoteData.OveCausesBarrier, 18);
//充电接口过温故障【19】
ProcFaultResult(nowRemoteData.InterfaceOverFaulty, 19);
//BMS通信故障【22】
ProcFaultResult(nowRemoteData.BMSComFaulty, 22);
//充电桩输入电压过压故障【23】
ProcFaultResult(nowRemoteData.ChaPilePnpVolOveFault, 23);
//充电桩输入电压欠压故障【24】
ProcFaultResult(nowRemoteData.InputVoltageUndFault, 24);
//直流母线输出过压故障【25】
ProcFaultResult(nowRemoteData.OvervoltageFault, 25);
//直流母线输出欠压故障【26】
ProcFaultResult(nowRemoteData.UndervoltageFault, 26);
//门禁故障【33】
ProcFaultResult(nowRemoteData.AccessConFailure, 33);
//正极直流输出接触器粘连故障【34】
ProcFaultResult(nowRemoteData.AGunPConA3dhesionFailure, 34);
//负极直流输出接触器粘连故故障【35】
ProcFaultResult(nowRemoteData.AGunNConadhesionFailure, 35);
//泄放回路故障【36】
ProcFaultResult(nowRemoteData.DischargeLoopFaulty, 36);
//充电桩交流输入接触器据动/误动故(预留位置供其他适用) 【37】
ProcFaultResult(nowRemoteData.ConActivated, 37);
//充电桩交流输入接触器粘连故障(预留位置供其他适用) 【38】
ProcFaultResult(nowRemoteData.ConAdhesionFailure, 38);
//辅助电源故障【39】
ProcFaultResult(nowRemoteData.OutputReverseCon, 39);
//模块输出反接【40】
ProcFaultResult(nowRemoteData.ModuleOutputRev, 40);
//充电枪过温告警【42】
ProcFaultResult(nowRemoteData.ChaGunOvertAlarmGen, 42);
//充电桩过温告警【43】
ProcFaultResult(nowRemoteData.ChaPileOvertAlarm, 43);
//电表通信异常【44】
ProcFaultResult(nowRemoteData.AGunMeterComAbnormal, 44);
//电表电度异常【45】
ProcFaultResult(nowRemoteData.AGunMeterAbnormal, 45);
//水浸告警【46】
ProcFaultResult(nowRemoteData.FloodingAlarm, 46);
}
}
/// <summary> /// <summary>
/// 故障记录处理 /// 故障记录处理
@ -2348,7 +2274,7 @@ namespace BatCharging.Service
#region 升级命令 #region 升级命令
public void Send1001(int instruct) public void Send1001(uint instruct)
{ {
if (_chr_client != null) if (_chr_client != null)
{ {

2
BatCharging.Service/ChargerSendMsg.cs
Unescape View File

@ -754,7 +754,7 @@ namespace BatCharging.Service
#region 升级命令 #region 升级命令
internal void Send1001(TcpClientChargerTool tcp_client, int instruct) internal void Send1001(TcpClientChargerTool tcp_client, uint instruct)
{ {
CMD1001 CMD = new CMD1001(); CMD1001 CMD = new CMD1001();
CMD.eraseOrQueryInstructions = instruct; CMD.eraseOrQueryInstructions = instruct;

78
BatCharging.Service/DataRlt/解析数据/MsgReceiveCMDCom.cs
Unescape View File

@ -1144,73 +1144,73 @@ namespace BatCharging.Service.DataRlt
CMD1102.startMinute1 = data[9]; CMD1102.startMinute1 = data[9];
CMD1102.endHour1 = data[10]; CMD1102.endHour1 = data[10];
CMD1102.endMinute1 = data[11]; CMD1102.endMinute1 = data[11];
CMD1102.rate1 = (int)ByteUtils.DToUInt32(data, 12); CMD1102.rate1 = ByteUtils.DToUInt32(data, 12);
CMD1102.startHour2 = data[16]; CMD1102.startHour2 = data[16];
CMD1102.startMinute2 = data[17]; CMD1102.startMinute2 = data[17];
CMD1102.endHour2 = data[18]; CMD1102.endHour2 = data[18];
CMD1102.endMinute2 = data[19]; CMD1102.endMinute2 = data[19];
CMD1102.rate2 = ByteUtils.DToUInt16(data, 20); CMD1102.rate2 = ByteUtils.DToUInt32(data, 20);
CMD1102.startHour3 = data[24]; CMD1102.startHour3 = data[24];
CMD1102.startMinute3 = data[25]; CMD1102.startMinute3 = data[25];
CMD1102.endHour3 = data[26]; CMD1102.endHour3 = data[26];
CMD1102.endMinute3 = data[27]; CMD1102.endMinute3 = data[27];
CMD1102.rate3 = ByteUtils.DToUInt16(data, 28); CMD1102.rate3 = ByteUtils.DToUInt32(data, 28);
CMD1102.startHour4 = data[32]; CMD1102.startHour4 = data[32];
CMD1102.startMinute4 = data[33]; CMD1102.startMinute4 = data[33];
CMD1102.endHour4 = data[34]; CMD1102.endHour4 = data[34];
CMD1102.endMinute4 = data[35]; CMD1102.endMinute4 = data[35];
CMD1102.rate4 = ByteUtils.DToUInt16(data, 36); CMD1102.rate4 = ByteUtils.DToUInt32(data, 36);
CMD1102.startHour5 = data[40]; CMD1102.startHour5 = data[40];
CMD1102.startMinute5 = data[41]; CMD1102.startMinute5 = data[41];
CMD1102.endHour5 = data[42]; CMD1102.endHour5 = data[42];
CMD1102.endMinute5 = data[43]; CMD1102.endMinute5 = data[43];
CMD1102.rate5 = ByteUtils.DToUInt16(data, 44); CMD1102.rate5 = ByteUtils.DToUInt32(data, 44);
CMD1102.startHour6 = data[48]; CMD1102.startHour6 = data[48];
CMD1102.startMinute6 = data[49]; CMD1102.startMinute6 = data[49];
CMD1102.endHour6 = data[50]; CMD1102.endHour6 = data[50];
CMD1102.endMinute6 = data[51]; CMD1102.endMinute6 = data[51];
CMD1102.rate6 = ByteUtils.DToUInt16(data, 52); CMD1102.rate6 = ByteUtils.DToUInt32(data, 52);
CMD1102.startHour7 = data[56]; CMD1102.startHour7 = data[56];
CMD1102.startMinute7 = data[57]; CMD1102.startMinute7 = data[57];
CMD1102.endHour7 = data[58]; CMD1102.endHour7 = data[58];
CMD1102.endMinute7 = data[59]; CMD1102.endMinute7 = data[59];
CMD1102.rate7 = ByteUtils.DToUInt16(data, 60); CMD1102.rate7 = ByteUtils.DToUInt32(data, 60);
CMD1102.startHour8 = data[64]; CMD1102.startHour8 = data[64];
CMD1102.startMinute8 = data[65]; CMD1102.startMinute8 = data[65];
CMD1102.endHour8 = data[66]; CMD1102.endHour8 = data[66];
CMD1102.endMinute8 = data[67]; CMD1102.endMinute8 = data[67];
CMD1102.rate8 = ByteUtils.DToUInt16(data, 68); CMD1102.rate8 = ByteUtils.DToUInt32(data, 68);
CMD1102.startHour9 = data[72]; CMD1102.startHour9 = data[72];
CMD1102.startMinute9 = data[73]; CMD1102.startMinute9 = data[73];
CMD1102.endHour9 = data[74]; CMD1102.endHour9 = data[74];
CMD1102.endMinute9 = data[75]; CMD1102.endMinute9 = data[75];
CMD1102.rate9 = ByteUtils.DToUInt16(data, 76); CMD1102.rate9 = ByteUtils.DToUInt32(data, 76);
CMD1102.startHour10 = data[80]; CMD1102.startHour10 = data[80];
CMD1102.startMinute10 = data[81]; CMD1102.startMinute10 = data[81];
CMD1102.endHour10 = data[82]; CMD1102.endHour10 = data[82];
CMD1102.endMinute10 = data[83]; CMD1102.endMinute10 = data[83];
CMD1102.rate10 = ByteUtils.DToUInt16(data, 84); CMD1102.rate10 = ByteUtils.DToUInt32(data, 84);
CMD1102.startHour11 = data[88]; CMD1102.startHour11 = data[88];
CMD1102.startMinute11 = data[89]; CMD1102.startMinute11 = data[89];
CMD1102.endHour11 = data[90]; CMD1102.endHour11 = data[90];
CMD1102.endMinute11 = data[91]; CMD1102.endMinute11 = data[91];
CMD1102.rate11 = ByteUtils.DToUInt16(data, 92); CMD1102.rate11 = ByteUtils.DToUInt32(data, 92);
CMD1102.startHour12 = data[96]; CMD1102.startHour12 = data[96];
CMD1102.startMinute12 = data[97]; CMD1102.startMinute12 = data[97];
CMD1102.endHour12 = data[98]; CMD1102.endHour12 = data[98];
CMD1102.endMinute12 = data[99]; CMD1102.endMinute12 = data[99];
CMD1102.rate12 = ByteUtils.DToUInt16(data, 100); CMD1102.rate12 = ByteUtils.DToUInt32(data, 100);
} }
return CMD1102; return CMD1102;
} }
@ -1250,67 +1250,67 @@ namespace BatCharging.Service.DataRlt
CMD1108.startMinute2 = data[17]; CMD1108.startMinute2 = data[17];
CMD1108.endHour2 = data[18]; CMD1108.endHour2 = data[18];
CMD1108.endMinute2 = data[19]; CMD1108.endMinute2 = data[19];
CMD1108.rate2 = ByteUtils.DToUInt16(data, 20); CMD1108.rate2 = ByteUtils.DToUInt32(data, 20);
CMD1108.startHour3 = data[24]; CMD1108.startHour3 = data[24];
CMD1108.startMinute3 = data[25]; CMD1108.startMinute3 = data[25];
CMD1108.endHour3 = data[26]; CMD1108.endHour3 = data[26];
CMD1108.endMinute3 = data[27]; CMD1108.endMinute3 = data[27];
CMD1108.rate3 = ByteUtils.DToUInt16(data, 28); CMD1108.rate3 = ByteUtils.DToUInt32(data, 28);
CMD1108.startHour4 = data[32]; CMD1108.startHour4 = data[32];
CMD1108.startMinute4 = data[33]; CMD1108.startMinute4 = data[33];
CMD1108.endHour4 = data[34]; CMD1108.endHour4 = data[34];
CMD1108.endMinute4 = data[35]; CMD1108.endMinute4 = data[35];
CMD1108.rate4 = ByteUtils.DToUInt16(data, 36); CMD1108.rate4 = ByteUtils.DToUInt32(data, 36);
CMD1108.startHour5 = data[40]; CMD1108.startHour5 = data[40];
CMD1108.startMinute5 = data[41]; CMD1108.startMinute5 = data[41];
CMD1108.endHour5 = data[42]; CMD1108.endHour5 = data[42];
CMD1108.endMinute5 = data[43]; CMD1108.endMinute5 = data[43];
CMD1108.rate5 = ByteUtils.DToUInt16(data, 44); CMD1108.rate5 = ByteUtils.DToUInt32(data, 44);
CMD1108.startHour6 = data[48]; CMD1108.startHour6 = data[48];
CMD1108.startMinute6 = data[49]; CMD1108.startMinute6 = data[49];
CMD1108.endHour6 = data[50]; CMD1108.endHour6 = data[50];
CMD1108.endMinute6 = data[51]; CMD1108.endMinute6 = data[51];
CMD1108.rate6 = ByteUtils.DToUInt16(data, 52); CMD1108.rate6 = ByteUtils.DToUInt32(data, 52);
CMD1108.startHour7 = data[56]; CMD1108.startHour7 = data[56];
CMD1108.startMinute7 = data[57]; CMD1108.startMinute7 = data[57];
CMD1108.endHour7 = data[58]; CMD1108.endHour7 = data[58];
CMD1108.endMinute7 = data[59]; CMD1108.endMinute7 = data[59];
CMD1108.rate7 = ByteUtils.DToUInt16(data, 60); CMD1108.rate7 = ByteUtils.DToUInt32(data, 60);
CMD1108.startHour8 = data[64]; CMD1108.startHour8 = data[64];
CMD1108.startMinute8 = data[65]; CMD1108.startMinute8 = data[65];
CMD1108.endHour8 = data[66]; CMD1108.endHour8 = data[66];
CMD1108.endMinute8 = data[67]; CMD1108.endMinute8 = data[67];
CMD1108.rate8 = ByteUtils.DToUInt16(data, 68); CMD1108.rate8 = ByteUtils.DToUInt32(data, 68);
CMD1108.startHour9 = data[72]; CMD1108.startHour9 = data[72];
CMD1108.startMinute9 = data[73]; CMD1108.startMinute9 = data[73];
CMD1108.endHour9 = data[74]; CMD1108.endHour9 = data[74];
CMD1108.endMinute9 = data[75]; CMD1108.endMinute9 = data[75];
CMD1108.rate9 = ByteUtils.DToUInt16(data, 76); CMD1108.rate9 = ByteUtils.DToUInt32(data, 76);
CMD1108.startHour10 = data[80]; CMD1108.startHour10 = data[80];
CMD1108.startMinute10 = data[81]; CMD1108.startMinute10 = data[81];
CMD1108.endHour10 = data[82]; CMD1108.endHour10 = data[82];
CMD1108.endMinute10 = data[83]; CMD1108.endMinute10 = data[83];
CMD1108.rate10 = ByteUtils.DToUInt16(data, 84); CMD1108.rate10 = ByteUtils.DToUInt32(data, 84);
CMD1108.startHour11 = data[88]; CMD1108.startHour11 = data[88];
CMD1108.startMinute11 = data[89]; CMD1108.startMinute11 = data[89];
CMD1108.endHour11 = data[90]; CMD1108.endHour11 = data[90];
CMD1108.endMinute11 = data[91]; CMD1108.endMinute11 = data[91];
CMD1108.rate11 = ByteUtils.DToUInt16(data, 92); CMD1108.rate11 = ByteUtils.DToUInt32(data, 92);
CMD1108.startHour12 = data[96]; CMD1108.startHour12 = data[96];
CMD1108.startMinute12 = data[97]; CMD1108.startMinute12 = data[97];
CMD1108.endHour12 = data[98]; CMD1108.endHour12 = data[98];
CMD1108.endMinute12 = data[99]; CMD1108.endMinute12 = data[99];
CMD1108.rate12 = ByteUtils.DToUInt16(data, 100); CMD1108.rate12 = ByteUtils.DToUInt32(data, 100);
} }
return CMD1108; return CMD1108;
@ -1321,8 +1321,7 @@ namespace BatCharging.Service.DataRlt
if (data != null && data.Length > 0) if (data != null && data.Length > 0)
{ {
CMD1302 = new CMD1302(); CMD1302 = new CMD1302();
CMD1302.value01 = ByteUtils.DToUInt16(data, 8);
CMD1302.value02 = ByteUtils.DToUInt16(data, 10);
CMD1302.value03 = Encoding.ASCII.GetString(data, 12, 32); CMD1302.value03 = Encoding.ASCII.GetString(data, 12, 32);
CMD1302.value04 = data[44]; CMD1302.value04 = data[44];
CMD1302.value05 = data[45]; CMD1302.value05 = data[45];
@ -1337,8 +1336,7 @@ namespace BatCharging.Service.DataRlt
if (data != null && data.Length > 0) if (data != null && data.Length > 0)
{ {
CMD1402 = new CMD1402(); CMD1402 = new CMD1402();
CMD1402.value01 = ByteUtils.DToUInt16(data, 8);
CMD1402.value02 = ByteUtils.DToUInt16(data, 10);
CMD1402.value03 = data[12]; CMD1402.value03 = data[12];
} }
return CMD1402; return CMD1402;
@ -1349,8 +1347,7 @@ namespace BatCharging.Service.DataRlt
if (data != null && data.Length > 0) if (data != null && data.Length > 0)
{ {
CMD1403 = new CMD1403(); CMD1403 = new CMD1403();
CMD1403.value01 = ByteUtils.DToUInt16(data, 8);
CMD1403.value02 = ByteUtils.DToUInt16(data, 10);
CMD1403.value03 = data[12]; CMD1403.value03 = data[12];
} }
return CMD1403; return CMD1403;
@ -1361,8 +1358,7 @@ namespace BatCharging.Service.DataRlt
if (data != null && data.Length > 0) if (data != null && data.Length > 0)
{ {
CMD1407 = new CMD1407(); CMD1407 = new CMD1407();
CMD1407.value01 = ByteUtils.DToUInt16(data, 8);
CMD1407.value02 = ByteUtils.DToUInt16(data, 10);
CMD1407.value03 = data[12]; CMD1407.value03 = data[12];
} }
return CMD1407; return CMD1407;
@ -1385,10 +1381,9 @@ namespace BatCharging.Service.DataRlt
if (data != null && data.Length > 0) if (data != null && data.Length > 0)
{ {
CMD1503 = new CMD1503(); CMD1503 = new CMD1503();
CMD1503.value01 = ByteUtils.DToUInt16(data, 8);
CMD1503.value02 = ByteUtils.DToUInt16(data, 10); CMD1503.value03 = ByteUtils.DToUInt32(data, 12);
CMD1503.value03 = ByteUtils.DToUInt16(data, 12); CMD1503.value04 = ByteUtils.DToUInt32(data, 16);
CMD1503.value04 = ByteUtils.DToUInt16(data, 16);
CMD1503.value05 = Encoding.ASCII.GetString(data, 20, (data.Length - 21)); ; CMD1503.value05 = Encoding.ASCII.GetString(data, 20, (data.Length - 21)); ;
} }
return CMD1503; return CMD1503;
@ -1399,21 +1394,8 @@ namespace BatCharging.Service.DataRlt
if (data != null && data.Length > 0) if (data != null && data.Length > 0)
{ {
CMD1505 = new CMD1505(); CMD1505 = new CMD1505();
CMD1505.value01 = ByteUtils.DToUInt16(data, 8);
CMD1505.value02 = ByteUtils.DToUInt16(data, 10);
} }
return CMD1505; return CMD1505;
} }
public CMD1506 ConCMD1506(byte[] data)
{
CMD1506 CMD1506 = null;
if (data != null && data.Length > 0)
{
CMD1506 = new CMD1506();
CMD1506.value01 = ByteUtils.DToUInt16(data, 8);
CMD1506.value02 = ByteUtils.DToUInt16(data, 10);
}
return CMD1506;
}
} }
} }

17
BatCharging.Service/发送方法/ChargerSendCMD.cs
Unescape View File

@ -1157,7 +1157,7 @@ namespace BatCharging.Service
{ {
List<byte> lstContent = new List<byte>(); List<byte> lstContent = new List<byte>();
lstContent.AddRange(ByteUtils.ToByteByHexStr(CMD.fileName)); lstContent.AddRange(Encoding.ASCII.GetBytes(CMD.fileName));
results = lstContent.ToArray(); results = lstContent.ToArray();
} }
@ -1930,10 +1930,6 @@ namespace BatCharging.Service
model.CMD = 1502; model.CMD = 1502;
model.checksumDomain = 0x01; model.checksumDomain = 0x01;
//CMD1502 CMD = new CMD1502();
//CMD.reserved1 = 0;
//CMD.reserved2 = 0;
//CMD.responseCode = 0;
model.dataDomain = GetRCMD1502DataInfo(CMD); //数据域 model.dataDomain = GetRCMD1502DataInfo(CMD); //数据域
model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度 model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度
@ -1979,12 +1975,6 @@ namespace BatCharging.Service
model.CMD = 1504; model.CMD = 1504;
model.checksumDomain = 0x01; model.checksumDomain = 0x01;
//CMD1504 CMD = new CMD1504();
//CMD.reserved1 = 0;
//CMD.reserved2 = 0;
//CMD.logo = 0;
//CMD.successReservedMessageNum = 0;
model.dataDomain = GetRCMD1504DataInfo(CMD); //数据域 model.dataDomain = GetRCMD1504DataInfo(CMD); //数据域
model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度 model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度
@ -2030,11 +2020,6 @@ namespace BatCharging.Service
model.CMD = 1506; model.CMD = 1506;
model.checksumDomain = 0x01; model.checksumDomain = 0x01;
//CMD1504 CMD = new CMD1504();
//CMD.reserved1 = 0;
//CMD.reserved2 = 0;
//CMD.logo = 0;
//CMD.successReservedMessageNum = 0;
model.dataDomain = GetRCMD1506DataInfo(CMD); //数据域 model.dataDomain = GetRCMD1506DataInfo(CMD); //数据域
model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度 model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度

53
Monitor.ChargeTest/FrmChargeResult.Designer.cs generated
Unescape View File

@ -56,13 +56,9 @@
button5 = new System.Windows.Forms.Button(); button5 = new System.Windows.Forms.Button();
button6 = new System.Windows.Forms.Button(); button6 = new System.Windows.Forms.Button();
button7 = new System.Windows.Forms.Button(); button7 = new System.Windows.Forms.Button();
button8 = new System.Windows.Forms.Button();
button9 = new System.Windows.Forms.Button();
button10 = new System.Windows.Forms.Button();
groupBox4 = new System.Windows.Forms.GroupBox(); groupBox4 = new System.Windows.Forms.GroupBox();
groupBox6 = new System.Windows.Forms.GroupBox(); groupBox6 = new System.Windows.Forms.GroupBox();
groupBox7 = new System.Windows.Forms.GroupBox(); groupBox7 = new System.Windows.Forms.GroupBox();
groupBox10 = new System.Windows.Forms.GroupBox();
groupBox13 = new System.Windows.Forms.GroupBox(); groupBox13 = new System.Windows.Forms.GroupBox();
button32 = new System.Windows.Forms.Button(); button32 = new System.Windows.Forms.Button();
button11 = new System.Windows.Forms.Button(); button11 = new System.Windows.Forms.Button();
@ -91,7 +87,6 @@
groupBox4.SuspendLayout(); groupBox4.SuspendLayout();
groupBox6.SuspendLayout(); groupBox6.SuspendLayout();
groupBox7.SuspendLayout(); groupBox7.SuspendLayout();
groupBox10.SuspendLayout();
groupBox13.SuspendLayout(); groupBox13.SuspendLayout();
groupBox14.SuspendLayout(); groupBox14.SuspendLayout();
groupBox15.SuspendLayout(); groupBox15.SuspendLayout();
@ -403,36 +398,6 @@
button7.UseVisualStyleBackColor = true; button7.UseVisualStyleBackColor = true;
button7.Click += button7_Click; button7.Click += button7_Click;
// //
// button8
//
button8.Location = new System.Drawing.Point(5, 26);
button8.Name = "button8";
button8.Size = new System.Drawing.Size(115, 37);
button8.TabIndex = 125;
button8.Text = "1502";
button8.UseVisualStyleBackColor = true;
button8.Click += button8_Click;
//
// button9
//
button9.Location = new System.Drawing.Point(147, 26);
button9.Name = "button9";
button9.Size = new System.Drawing.Size(115, 37);
button9.TabIndex = 126;
button9.Text = "1504";
button9.UseVisualStyleBackColor = true;
button9.Click += button9_Click;
//
// button10
//
button10.Location = new System.Drawing.Point(289, 26);
button10.Name = "button10";
button10.Size = new System.Drawing.Size(115, 37);
button10.TabIndex = 127;
button10.Text = "1506";
button10.UseVisualStyleBackColor = true;
button10.Click += button10_Click;
//
// groupBox4 // groupBox4
// //
groupBox4.Controls.Add(button3); groupBox4.Controls.Add(button3);
@ -467,18 +432,6 @@
groupBox7.TabStop = false; groupBox7.TabStop = false;
groupBox7.Text = "FTP远程升级、FTP日志上传"; groupBox7.Text = "FTP远程升级、FTP日志上传";
// //
// groupBox10
//
groupBox10.Controls.Add(button9);
groupBox10.Controls.Add(button8);
groupBox10.Controls.Add(button10);
groupBox10.Location = new System.Drawing.Point(1034, 381);
groupBox10.Name = "groupBox10";
groupBox10.Size = new System.Drawing.Size(410, 75);
groupBox10.TabIndex = 130;
groupBox10.TabStop = false;
groupBox10.Text = "协议方式日志上传";
//
// groupBox13 // groupBox13
// //
groupBox13.Controls.Add(button32); groupBox13.Controls.Add(button32);
@ -701,7 +654,6 @@
Controls.Add(groupBox15); Controls.Add(groupBox15);
Controls.Add(groupBox14); Controls.Add(groupBox14);
Controls.Add(groupBox13); Controls.Add(groupBox13);
Controls.Add(groupBox10);
Controls.Add(groupBox7); Controls.Add(groupBox7);
Controls.Add(groupBox6); Controls.Add(groupBox6);
Controls.Add(groupBox4); Controls.Add(groupBox4);
@ -722,7 +674,6 @@
groupBox4.ResumeLayout(false); groupBox4.ResumeLayout(false);
groupBox6.ResumeLayout(false); groupBox6.ResumeLayout(false);
groupBox7.ResumeLayout(false); groupBox7.ResumeLayout(false);
groupBox10.ResumeLayout(false);
groupBox13.ResumeLayout(false); groupBox13.ResumeLayout(false);
groupBox14.ResumeLayout(false); groupBox14.ResumeLayout(false);
groupBox15.ResumeLayout(false); groupBox15.ResumeLayout(false);
@ -759,13 +710,9 @@
private System.Windows.Forms.Button button5; private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button button6; private System.Windows.Forms.Button button6;
private System.Windows.Forms.Button button7; private System.Windows.Forms.Button button7;
private System.Windows.Forms.Button button8;
private System.Windows.Forms.Button button9;
private System.Windows.Forms.Button button10;
private System.Windows.Forms.GroupBox groupBox4; private System.Windows.Forms.GroupBox groupBox4;
private System.Windows.Forms.GroupBox groupBox6; private System.Windows.Forms.GroupBox groupBox6;
private System.Windows.Forms.GroupBox groupBox7; private System.Windows.Forms.GroupBox groupBox7;
private System.Windows.Forms.GroupBox groupBox10;
private System.Windows.Forms.GroupBox groupBox13; private System.Windows.Forms.GroupBox groupBox13;
private System.Windows.Forms.Button button11; private System.Windows.Forms.Button button11;
private System.Windows.Forms.Button button13; private System.Windows.Forms.Button button13;

41
Monitor.ChargeTest/FrmChargeResult.cs
Unescape View File

@ -379,7 +379,8 @@ namespace Monitor.ChargeTest
/// <param name="e"></param> /// <param name="e"></param>
private void button38_Click(object sender, EventArgs e) private void button38_Click(object sender, EventArgs e)
{ {
int instruct = 0; uint instruct = 43605;//擦除0xaa55有效
//uint instruct = 0;//查询0x0000有效
CmnChargerParam._CHR00TCPCLIENT.Send1001(instruct); CmnChargerParam._CHR00TCPCLIENT.Send1001(instruct);
} }
@ -390,6 +391,7 @@ namespace Monitor.ChargeTest
/// <param name="e"></param> /// <param name="e"></param>
private void button39_Click(object sender, EventArgs e) private void button39_Click(object sender, EventArgs e)
{ {
//服务器下发升级文件 文件名
string fileName = ""; string fileName = "";
@ -402,6 +404,7 @@ namespace Monitor.ChargeTest
/// <param name="e"></param> /// <param name="e"></param>
private void button37_Click(object sender, EventArgs e) private void button37_Click(object sender, EventArgs e)
{ {
//下发文件长度
uint fileLen = 0; uint fileLen = 0;
@ -414,6 +417,7 @@ namespace Monitor.ChargeTest
/// <param name="e"></param> /// <param name="e"></param>
private void button40_Click(object sender, EventArgs e) private void button40_Click(object sender, EventArgs e)
{ {
//要升级的文件数据 16进制字符
string updata = ""; string updata = "";
CmnChargerParam._CHR00TCPCLIENT.Send1007(updata); CmnChargerParam._CHR00TCPCLIENT.Send1007(updata);
@ -604,42 +608,7 @@ namespace Monitor.ChargeTest
} }
#endregion #endregion
#region 协议方式日志上传
/// <summary>
/// 1502
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button8_Click(object sender, EventArgs e)
{
ushort responseCode = 0;
CmnChargerParam._CHR00TCPCLIENT.Send1502(responseCode);
}
/// <summary>
/// 1504
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button9_Click(object sender, EventArgs e)
{
uint logo = 0;
uint successReservedMessageNum = 0;
CmnChargerParam._CHR00TCPCLIENT.Send1504(logo, successReservedMessageNum);
}
/// <summary>
/// 1506
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void button10_Click(object sender, EventArgs e)
{
CmnChargerParam._CHR00TCPCLIENT.Send1506();
}
#endregion
private void button12_Click(object sender, EventArgs e) private void button12_Click(object sender, EventArgs e)
{ {

62
Monitor.ChargeTest/FrmChargeResult.resx
Unescape View File

@ -1,4 +1,64 @@
<root> <?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true"> <xsd:element name="root" msdata:IsDataSet="true">

Write Preview
Loading…
Cancel
Save