master
CZ 8 months ago
commit 267f4f416d

@ -29,7 +29,7 @@ namespace BatCharging.Model
/// 费率1 /// 费率1
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate1 { get; set; } public uint rate1 { get; set; }
#endregion 1 #endregion 1
#region 2 #region 2
@ -53,7 +53,7 @@ namespace BatCharging.Model
/// 费率2 /// 费率2
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate2 { get; set; } public uint rate2 { get; set; }
#endregion 2 #endregion 2
#region 3 #region 3
@ -77,7 +77,7 @@ namespace BatCharging.Model
/// 费率3 /// 费率3
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate3 { get; set; } public uint rate3 { get; set; }
#endregion 3 #endregion 3
#region 4 #region 4
@ -101,7 +101,7 @@ namespace BatCharging.Model
/// 费率4 /// 费率4
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate4 { get; set; } public uint rate4 { get; set; }
#endregion 4 #endregion 4
#region 5 #region 5
@ -125,7 +125,7 @@ namespace BatCharging.Model
/// 费率5 /// 费率5
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate5 { get; set; } public uint rate5 { get; set; }
#endregion 5 #endregion 5
#region 6 #region 6
@ -149,7 +149,7 @@ namespace BatCharging.Model
/// 费率6 /// 费率6
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate6 { get; set; } public uint rate6 { get; set; }
#endregion 6 #endregion 6
#region 7 #region 7
@ -173,7 +173,7 @@ namespace BatCharging.Model
/// 费率7 /// 费率7
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate7 { get; set; } public uint rate7 { get; set; }
#endregion 7 #endregion 7
#region 8 #region 8
@ -197,7 +197,7 @@ namespace BatCharging.Model
/// 费率8 /// 费率8
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate8 { get; set; } public uint rate8 { get; set; }
#endregion 8 #endregion 8
#region 9 #region 9
@ -221,7 +221,7 @@ namespace BatCharging.Model
/// 费率9 /// 费率9
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate9 { get; set; } public uint rate9 { get; set; }
#endregion 9 #endregion 9
#region 10 #region 10
@ -245,7 +245,7 @@ namespace BatCharging.Model
/// 费率10 /// 费率10
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate10 { get; set; } public uint rate10 { get; set; }
#endregion 10 #endregion 10
#region 11 #region 11
@ -269,7 +269,7 @@ namespace BatCharging.Model
/// 费率11 /// 费率11
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate11 { get; set; } public uint rate11 { get; set; }
#endregion 11 #endregion 11
#region 12 #region 12
@ -293,7 +293,7 @@ namespace BatCharging.Model
/// 费率12 /// 费率12
/// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值 /// 该时段内每度电的电费,用整型值表示,要乘 0.01才能得到真实的值
/// </summary> /// </summary>
public int rate12 { get; set; } public uint rate12 { get; set; }
#endregion 12 #endregion 12
} }
} }

@ -67,7 +67,7 @@ namespace BatCharging.Model
/// <summary> /// <summary>
/// 用户卡号/用户识别号(内容只能”0~9、A~Z、a~z 字符 ASCII 码,不够长度填’\0) /// 用户卡号/用户识别号(内容只能”0~9、A~Z、a~z 字符 ASCII 码,不够长度填’\0)
/// </summary> /// </summary>
public UInt32 value10 { get; set; } public string value10 { get; set; }
/// <summary> /// <summary>
/// 断网充电标志 /// 断网充电标志
/// <para>0-不允许</para> /// <para>0-不允许</para>

@ -170,12 +170,12 @@ namespace BatCharging.Service
{ {
Array.Copy(byteArray, 0, bytes, 0, byteArray.Length); Array.Copy(byteArray, 0, bytes, 0, byteArray.Length);
} }
else if (byteArray.Length > leng) //else if (byteArray.Length > leng)
{ //{
// 长度超过32字节可以截断或者抛出异常 // // 长度超过32字节可以截断或者抛出异常
Array.Copy(byteArray, 0, new byte[leng], 0, leng); // 截断数组到32字节 // Array.Copy(byteArray, 0, new byte[leng], 0, leng); // 截断数组到32字节
} //}
return byteArray; return bytes;
} }
/// <summary> /// <summary>

@ -50,9 +50,9 @@ namespace BatCharging.Service
lstContent.AddRange(BitConverter.GetBytes(CMD1.value1)); lstContent.AddRange(BitConverter.GetBytes(CMD1.value1));
lstContent.AddRange(BitConverter.GetBytes(CMD1.value2)); lstContent.AddRange(BitConverter.GetBytes(CMD1.value2));
lstContent.Add(CMD1.value3); lstContent.Add(CMD1.value3);
lstContent.AddRange(BitConverter.GetBytes(CMD1.value4)); lstContent.AddRange(BitConverter.GetBytes(CMD1.value4));//起始地址
lstContent.Add(CMD1.value5); lstContent.Add(CMD1.value5);//查询个数
lstContent.AddRange(BitConverter.GetBytes(CMD1.value6)); lstContent.AddRange(BitConverter.GetBytes(CMD1.value6));//参数字节数
if (CMD1.value3 == 1) if (CMD1.value3 == 1)
{ {
lstContent.AddRange(CMD1.value7); lstContent.AddRange(CMD1.value7);
@ -199,19 +199,20 @@ namespace BatCharging.Service
lstContent.AddRange(BitConverter.GetBytes(CMD.value01)); lstContent.AddRange(BitConverter.GetBytes(CMD.value01));
lstContent.AddRange(BitConverter.GetBytes(CMD.value02)); lstContent.AddRange(BitConverter.GetBytes(CMD.value02));
lstContent.AddRange(BitConverter.GetBytes(CMD.value03)); lstContent.Add(CMD.value03);
lstContent.AddRange(BitConverter.GetBytes(CMD.value04)); lstContent.AddRange(BitConverter.GetBytes(CMD.value04));
lstContent.AddRange(BitConverter.GetBytes(CMD.value05)); lstContent.AddRange(BitConverter.GetBytes(CMD.value05));
lstContent.AddRange(BitConverter.GetBytes(CMD.value06));
lstContent.AddRange(BitConverter.GetBytes(CMD.value07)); lstContent.AddRange(BitConverter.GetBytes(CMD.value07));
lstContent.AddRange(BitConverter.GetBytes(CMD.value08)); lstContent.AddRange(BitConverter.GetBytes(CMD.value08));
lstContent.AddRange(BitConverter.GetBytes(CMD.value09)); lstContent.Add(CMD.value09);
lstContent.AddRange(BitConverter.GetBytes(CMD.value10)); lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value10, 32));
lstContent.AddRange(BitConverter.GetBytes(CMD.value11)); lstContent.Add(CMD.value11);
lstContent.AddRange(BitConverter.GetBytes(CMD.value12)); lstContent.AddRange(BitConverter.GetBytes(CMD.value12));
lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value13, 32)); lstContent.AddRange(ByteUtils.ToByteByHexStr32(CMD.value13, 32));
lstContent.AddRange(BitConverter.GetBytes(CMD.value14)); lstContent.Add(CMD.value14);
lstContent.AddRange(BitConverter.GetBytes(CMD.value15)); lstContent.AddRange(BitConverter.GetBytes(CMD.value15));
lstContent.AddRange(BitConverter.GetBytes(CMD.value16)); lstContent.Add(CMD.value16);
results = lstContent.ToArray(); results = lstContent.ToArray();
} }
return results; return results;
@ -356,8 +357,8 @@ namespace BatCharging.Service
lstContent.AddRange(BitConverter.GetBytes(CMD.value01)); lstContent.AddRange(BitConverter.GetBytes(CMD.value01));
lstContent.AddRange(BitConverter.GetBytes(CMD.value02)); lstContent.AddRange(BitConverter.GetBytes(CMD.value02));
lstContent.AddRange(BitConverter.GetBytes(CMD.value03)); lstContent.Add(CMD.value03);
lstContent.AddRange(BitConverter.GetBytes(CMD.value04)); lstContent.Add(Convert.ToByte(CMD.value04));
results = lstContent.ToArray(); results = lstContent.ToArray();
} }
@ -571,8 +572,6 @@ namespace BatCharging.Service
model.CMD = 113; model.CMD = 113;
model.checksumDomain = 0x01; model.checksumDomain = 0x01;
model.dataDomain = GetRCMD113DataInfo(CMD); //数据域 model.dataDomain = GetRCMD113DataInfo(CMD); //数据域
model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度 model.LengthDomain = Convert.ToUInt16(9 + model.dataDomain.Length); //报文长度
@ -598,8 +597,8 @@ namespace BatCharging.Service
lstContent.AddRange(BitConverter.GetBytes(CMD.value01)); lstContent.AddRange(BitConverter.GetBytes(CMD.value01));
lstContent.AddRange(BitConverter.GetBytes(CMD.value02)); lstContent.AddRange(BitConverter.GetBytes(CMD.value02));
lstContent.AddRange(BitConverter.GetBytes(CMD.value03)); lstContent.Add(CMD.value03);
lstContent.AddRange(BitConverter.GetBytes(CMD.value04)); lstContent.Add(Convert.ToByte(CMD.value04));
results = lstContent.ToArray(); results = lstContent.ToArray();
} }
@ -1436,7 +1435,7 @@ namespace BatCharging.Service
public byte[] SendRCMD1103(out APDUModel APDUModel, CMD1103 CMD) public byte[] SendRCMD1103(out APDUModel APDUModel, CMD1103 CMD)
{ {
byte[] result = null; byte[] result;
APDUModel model = new APDUModel(); APDUModel model = new APDUModel();
model.OriginDomain1 = 0xAA; model.OriginDomain1 = 0xAA;

@ -226,7 +226,7 @@ namespace Monitor.ChargeTest
{ {
byte type = 1;//类型 0-查询/1-设置 byte type = 1;//类型 0-查询/1-设置
uint startAddress = 2;//设置/查询参数起始地址 uint startAddress = 2;//设置/查询参数起始地址
byte num = 3;//设置/查询个数 byte num = 2;//设置/查询个数
byte[] setData = new byte[8];//设置数据 byte[] setData = new byte[8];//设置数据
setData[0] = 0; setData[0] = 0;
setData[1] = 1; setData[1] = 1;
@ -265,10 +265,18 @@ namespace Monitor.ChargeTest
/// <param name="e"></param> /// <param name="e"></param>
private void button16_Click(object sender, EventArgs e) private void button16_Click(object sender, EventArgs e)
{ {
byte type = 0; byte type = 1;//充电枪口
uint startAddress = 9; uint startAddress = 1;//启始命令地址
byte num = 10; byte num = 2;//命令个数
byte[] setData = null; byte[] setData = new byte[8];//命令参数
setData[0] = 0;
setData[1] = 1;
setData[2] = 2;
setData[3] = 3;
setData[4] = 4;
setData[5] = 5;
setData[6] = 6;
setData[7] = 7;
CmnChargerParam._CHR00TCPCLIENT.Send5(type, startAddress, num, setData); CmnChargerParam._CHR00TCPCLIENT.Send5(type, startAddress, num, setData);
} }
#endregion #endregion
@ -449,9 +457,6 @@ namespace Monitor.ChargeTest
/// <param name="e"></param> /// <param name="e"></param>
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
CmnChargerParam._CHR00TCPCLIENT.Send1101(); CmnChargerParam._CHR00TCPCLIENT.Send1101();
} }
/// <summary> /// <summary>
@ -462,8 +467,23 @@ namespace Monitor.ChargeTest
private void button2_Click(object sender, EventArgs e) private void button2_Click(object sender, EventArgs e)
{ {
CMD1103 cMD1103 = new CMD1103(); CMD1103 cMD1103 = new CMD1103();
cMD1103.startHour1 = 00;
cMD1103.startMinute1 = 00;
cMD1103.startHour1 = 10;
cMD1103.endHour1 = 30;
cMD1103.rate1 = 120;
cMD1103.startHour2 = 10;
cMD1103.startMinute2 = 30;
cMD1103.startHour2 = 20;
cMD1103.endHour2 = 00;
cMD1103.rate2 = 100;
cMD1103.startHour3 = 20;
cMD1103.startMinute3 = 00;
cMD1103.startHour3 = 24;
cMD1103.endHour3 = 00;
cMD1103.rate3 = 160;
CmnChargerParam._CHR00TCPCLIENT.Send1103(cMD1103); CmnChargerParam._CHR00TCPCLIENT.Send1103(cMD1103);
} }
@ -579,7 +599,7 @@ namespace Monitor.ChargeTest
CMD.value07 = 5; CMD.value07 = 5;
CMD.value08 = 6; CMD.value08 = 6;
CMD.value09 = 7; CMD.value09 = 7;
CMD.value10 = 8; CMD.value10 = "123456789";
CMD.value11 = 9; CMD.value11 = 9;
CMD.value12 = 10; CMD.value12 = 10;
CMD.value13 = "12345678"; CMD.value13 = "12345678";

Loading…
Cancel
Save