配置Waste.SocketService数据库表Schema = "cap_s";

A7协议uuid@垃圾类型@子类@重量@单价@金额@操作员@物品编码@毛重@皮重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8
This commit is contained in:
李鹏鹏 2024-12-25 21:39:28 +08:00
parent 4ee083a1c8
commit 8c05fe2a84
2 changed files with 39 additions and 64 deletions

View File

@ -194,7 +194,7 @@ namespace Waste.SocketService
package.Str = _reader.ReadString(GB2312); package.Str = _reader.ReadString(GB2312);
#region A9 #region
if (reader.Length >= 2) if (reader.Length >= 2)
{ {
keylen = 2; keylen = 2;
@ -213,21 +213,7 @@ namespace Waste.SocketService
key = keys.BytesToString(GB2312); key = keys.BytesToString(GB2312);
} }
#endregion #endregion
if (key != "A9" && key != "A8" && key != "A7")
{
//var len = reader.Length;
//string msg = "";
reader.Rewind(keylen);
//for (var i = 0; i < len; i++)
//{
// reader.TryRead(out byte msgByte);
// msg += msgByte.ByteToHexStr();
//}
//package.IsChecked = false;
//package.Body = msg;
//return package;
}
if (key == "A7") if (key == "A7")
{ {
key = "A8";//全部GB2312的A8 key = "A8";//全部GB2312的A8
@ -303,29 +289,6 @@ namespace Waste.SocketService
Read(package, measurearr); Read(package, measurearr);
package.IsWeight = true; package.IsWeight = true;
} }
//uuid@datetime@垃圾类型@子类@重量@单价@金额@操作员@物品编码@垃圾桶@毛重@皮重@净重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n
else if (measurearr.Length == 21)
{
Read(package, measurearr);
package.DeviceFacEcode = measurearr[8];
package.Registration = measurearr[9];
package.GrossWeight = measurearr[10];
package.Tare = measurearr[11];
package.NetWeight = measurearr[12];
package.ID1 = measurearr[13];
package.ID2 = measurearr[14];
package.ID3 = measurearr[15];
package.ID4 = measurearr[16];
package.ID5 = measurearr[17];
package.ID6 = measurearr[18];
package.ID7 = measurearr[19];
package.ID8 = measurearr[20];
package.IsWeight = true;
}
else else
{ {
package.size = arr[6]; package.size = arr[6];
@ -450,9 +413,19 @@ namespace Waste.SocketService
} }
else else
{ {
key = "A8";//全部GB2312的A8 var len = reader.Length;
return ReadA7(reader, package, key, GB2312); string msg = "";
reader.Rewind(keylen);
for (var i = 0; i < len; i++)
{
reader.TryRead(out byte msgByte);
msg += msgByte.ByteToHexStr();
} }
package.IsChecked = false;
package.Body = msg;
return package;
}
} }
catch (Exception ex) catch (Exception ex)
{ {
@ -527,31 +500,29 @@ namespace Waste.SocketService
package.Time = $"{arr[4]}{arr[5]}".Replace("-", "").Replace(":", ""); package.Time = $"{arr[4]}{arr[5]}".Replace("-", "").Replace(":", "");
//uuid@datetime@垃圾类型@子类@重量@价格@金额@操作员 //uuid@datetime@垃圾类型@子类@重量@价格@金额@操作员
var measurearr = arr[6].Split('@'); var measurearr = arr[6].Split('@');
if (measurearr.Length == 8)
{ //uuid@垃圾类型@子类@重量@单价@金额@操作员@物品编码@毛重@皮重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n
Read(package, measurearr); if (measurearr.Length == 18)
package.IsWeight = true;
}
//uuid@datetime@垃圾类型@子类@重量@单价@金额@操作员@物品编码@垃圾桶@毛重@皮重@净重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n
else if (measurearr.Length == 21)
{ {
Read(package, measurearr); package.UUID = measurearr[0];
package.WasteType = measurearr[1];
package.DeviceFacEcode = measurearr[8]; package.WasteSType = measurearr[2];
package.Registration = measurearr[9]; package.Weight = measurearr[3];
package.GrossWeight = measurearr[10]; package.Price = measurearr[4];
package.Tare = measurearr[11]; package.Amount = measurearr[5];
package.NetWeight = measurearr[12]; package.OpUser = measurearr[6];
package.DeviceFacEcode = measurearr[7];
package.ID1 = measurearr[13]; package.GrossWeight = measurearr[8];
package.ID2 = measurearr[14]; package.Tare = measurearr[9];
package.ID3 = measurearr[15]; package.ID1 = measurearr[10];
package.ID4 = measurearr[16]; package.ID2 = measurearr[11];
package.ID5 = measurearr[17]; package.ID3 = measurearr[12];
package.ID6 = measurearr[18]; package.ID4 = measurearr[13];
package.ID7 = measurearr[19]; package.ID5 = measurearr[14];
package.ID8 = measurearr[20]; package.ID6 = measurearr[15];
package.ID7 = measurearr[16];
package.ID8 = measurearr[17];
package.IsWeight = true; package.IsWeight = true;
} }

View File

@ -103,7 +103,11 @@ namespace Waste.SocketService
opt.Password = configuration["RabbitmqSetting:Password"];//ÅäÖÃMiami opt.Password = configuration["RabbitmqSetting:Password"];//ÅäÖÃMiami
}); });
//ÅäÖÃsqlserverÖ§³Ö //ÅäÖÃsqlserverÖ§³Ö
x.UseSqlServer(configuration["RabbitmqSetting:DBConnection"]); x.UseSqlServer(x =>
{
x.ConnectionString = configuration["RabbitmqSetting:DBConnection"];
x.Schema = "cap_s";
});
x.SucceedMessageExpiredAfter = 3600; x.SucceedMessageExpiredAfter = 3600;
}); });
}) })