From 8c05fe2a84d720e589eadc0e618133a5b933a0ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=B9=8F?= <304594656@qq.com> Date: Wed, 25 Dec 2024 21:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AEWaste.SocketService=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E8=A1=A8Schema=20=3D=20"cap=5Fs";=20A7?= =?UTF-8?q?=E5=8D=8F=E8=AE=AEuuid@=E5=9E=83=E5=9C=BE=E7=B1=BB=E5=9E=8B@?= =?UTF-8?q?=E5=AD=90=E7=B1=BB@=E9=87=8D=E9=87=8F@=E5=8D=95=E4=BB=B7@?= =?UTF-8?q?=E9=87=91=E9=A2=9D@=E6=93=8D=E4=BD=9C=E5=91=98@=E7=89=A9?= =?UTF-8?q?=E5=93=81=E7=BC=96=E7=A0=81@=E6=AF=9B=E9=87=8D@=E7=9A=AE?= =?UTF-8?q?=E9=87=8D@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Waste.SocketService.cs/MyPackageFilter.cs | 97 ++++++++--------------- Waste.SocketService.cs/Program.cs | 6 +- 2 files changed, 39 insertions(+), 64 deletions(-) diff --git a/Waste.SocketService.cs/MyPackageFilter.cs b/Waste.SocketService.cs/MyPackageFilter.cs index 1c2b65f..6b60551 100644 --- a/Waste.SocketService.cs/MyPackageFilter.cs +++ b/Waste.SocketService.cs/MyPackageFilter.cs @@ -194,7 +194,7 @@ namespace Waste.SocketService package.Str = _reader.ReadString(GB2312); - #region 解析头部，头部固定为A9 + #region 解析头部 if (reader.Length >= 2) { keylen = 2; @@ -213,21 +213,7 @@ namespace Waste.SocketService key = keys.BytesToString(GB2312); } #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") { key = "A8";//全部GB2312的A8 @@ -303,29 +289,6 @@ namespace Waste.SocketService Read(package, measurearr); 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 { package.size = arr[6]; @@ -450,9 +413,19 @@ namespace Waste.SocketService } else { - key = "A8";//全部GB2312的A8 - return ReadA7(reader, package, key, GB2312); + 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; } + } catch (Exception ex) { @@ -527,31 +500,29 @@ namespace Waste.SocketService package.Time = $"{arr[4]}{arr[5]}".Replace("-", "").Replace(":", ""); //uuid@datetime@垃圾类型@子类@重量@价格@金额@操作员 var measurearr = arr[6].Split('@'); - if (measurearr.Length == 8) - { - Read(package, measurearr); - package.IsWeight = true; - } - //uuid@datetime@垃圾类型@子类@重量@单价@金额@操作员@物品编码@垃圾桶@毛重@皮重@净重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n - else if (measurearr.Length == 21) + + //uuid@垃圾类型@子类@重量@单价@金额@操作员@物品编码@毛重@皮重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n + if (measurearr.Length == 18) { - 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.UUID = measurearr[0]; + package.WasteType = measurearr[1]; + package.WasteSType = measurearr[2]; + package.Weight = measurearr[3]; + package.Price = measurearr[4]; + package.Amount = measurearr[5]; + package.OpUser = measurearr[6]; + package.DeviceFacEcode = measurearr[7]; + package.GrossWeight = measurearr[8]; + package.Tare = measurearr[9]; + package.ID1 = measurearr[10]; + package.ID2 = measurearr[11]; + package.ID3 = measurearr[12]; + package.ID4 = measurearr[13]; + package.ID5 = measurearr[14]; + package.ID6 = measurearr[15]; + package.ID7 = measurearr[16]; + package.ID8 = measurearr[17]; package.IsWeight = true; } diff --git a/Waste.SocketService.cs/Program.cs b/Waste.SocketService.cs/Program.cs index 3f4c0c2..ec72507 100644 --- a/Waste.SocketService.cs/Program.cs +++ b/Waste.SocketService.cs/Program.cs @@ -103,7 +103,11 @@ namespace Waste.SocketService opt.Password = configuration["RabbitmqSetting:Password"];//Miami }); //sqlserver֧ - x.UseSqlServer(configuration["RabbitmqSetting:DBConnection"]); + x.UseSqlServer(x => + { + x.ConnectionString = configuration["RabbitmqSetting:DBConnection"]; + x.Schema = "cap_s"; + }); x.SucceedMessageExpiredAfter = 3600; }); })