增加预留字段ID1、ID2、ID3、ID4、ID5、ID6、ID7、ID8

Waste.Application/ResultInfos/Dtos/ResultDto.cs

@@ -21,7 +21,7 @@ namespace Waste.Application
         /// <summary>
         /// 物品小类别
         /// </summary>
-        public string WasteSType { get; set; } = "";
+        public string WasteSType { get; set; } = string.Empty;
 
         /// <summary>
         /// 重量,单位KG
@@ -167,6 +167,16 @@ namespace Waste.Application
         /// 唯一消息ID
         /// </summary>
         public string Measure_UUID { get; set; }
+
+
+        public string ID1 { get; set; }
+        public string ID2 { get; set; }
+        public string ID3 { get; set; }
+        public string ID4 { get; set; }
+        public string ID5 { get; set; }
+        public string ID6 { get; set; }
+        public string ID7 { get; set; }
+        public string ID8 { get; set; }
     }
 
     /// <summary>
@@ -177,7 +187,7 @@ namespace Waste.Application
         /// <summary>
         /// 固定头
         /// </summary>
-        public string Key { get; set; } = "";
+        public string Key { get; set; } = string.Empty;
 
         /// <summary>
         /// 数据体长度
@@ -187,22 +197,22 @@ namespace Waste.Application
         /// <summary>
         /// IMEI
         /// </summary>
-        public string IMEI { get; set; } = "";
+        public string IMEI { get; set; } = string.Empty;
 
         /// <summary>
         /// ICCID
         /// </summary>
-        public string ICCID { get; set; } = "";
+        public string ICCID { get; set; } = string.Empty;
 
         /// <summary>
         /// IMSI
         /// </summary>
-        public string IMSI { get; set; } = "";
+        public string IMSI { get; set; } = string.Empty;
 
         /// <summary>
         /// 信号强度
         /// </summary>
-        public string GSLQ { get; set; } = "";
+        public string GSLQ { get; set; } = string.Empty;
 
         /// <summary>
         /// 时间
@@ -212,27 +222,27 @@ namespace Waste.Application
         /// <summary>
         /// 经度
         /// </summary>
-        public string Longitude { get; set; } = "";
+        public string Longitude { get; set; } = string.Empty;
 
         /// <summary>
         /// 纬度
         /// </summary>
-        public string Latitude { get; set; } = "";
+        public string Latitude { get; set; } = string.Empty;
 
         /// <summary>
         /// 设备地区
         /// </summary>
-        public string City { get; set; } = "";
+        public string City { get; set; } = string.Empty;
 
         /// <summary>
         /// 设备详细地点
         /// </summary>
-        public string Area { get; set; } = "";
+        public string Area { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾类别
         /// </summary>
-        public string WasteType { get; set; } = "";
+        public string WasteType { get; set; } = string.Empty;
 
         /// <summary>
         /// 重量,KG
@@ -242,12 +252,12 @@ namespace Waste.Application
         /// <summary>
         /// 内容
         /// </summary>
-        public string Body { get; set; } = "";
+        public string Body { get; set; } = string.Empty;
 
         /// <summary>
         /// 字符串结果
         /// </summary>
-        public string Str { get; set; } = "";
+        public string Str { get; set; } = string.Empty;
 
         /// <summary>
         /// 是否是否通过校检,true-是,false-否
@@ -273,32 +283,60 @@ namespace Waste.Application
         /// <summary>
         /// 垃圾类别小类
         /// </summary>
-        public string WasteSType { get; set; } = "";
+        public string WasteSType { get; set; } = string.Empty;
 
         /// <summary>
         /// 消息ID
         /// </summary>
-        public string UUID { get; set; } = "";
+        public string UUID { get; set; } = string.Empty;
 
         /// <summary>
         /// 上报时间
         /// </summary>
-        public string UploadTime { get; set; } = "";
+        public string UploadTime { get; set; } = string.Empty;
 
         /// <summary>
         /// 价格
         /// </summary>
-        public string Price { get; set; } = "";
+        public string Price { get; set; } = string.Empty;
 
         /// <summary>
         /// 金额
         /// </summary>
-        public string Amount { get; set; } = "";
+        public string Amount { get; set; } = string.Empty;
 
         /// <summary>
         /// 操作员
         /// </summary>
-        public string OpUser { get; set; } = "";
+        public string OpUser { get; set; } = string.Empty;
+        /// <summary>
+        /// 设备出厂序列号/设备出厂编号
+        /// </summary>
+        public string DeviceFacEcode { get; set; } = string.Empty;
+        /// <summary>
+        /// 车牌号/物品编码/垃圾桶编号
+        /// </summary>
+        public string Registration { get; set; } = string.Empty;
+        /// <summary>
+        /// 毛重,KG
+        /// </summary>
+        public string GrossWeight { get; set; } = string.Empty;
+        /// <summary>
+        /// 皮重,KG
+        /// </summary>
+        public string Tare { get; set; } = string.Empty;
+        /// <summary>
+        /// 净重,KG
+        /// </summary>
+        public string NetWeight { get; set; } = string.Empty;
+        public string ID1 { get; set; } = string.Empty;
+        public string ID2 { get; set; } = string.Empty;
+        public string ID3 { get; set; } = string.Empty;
+        public string ID4 { get; set; } = string.Empty;
+        public string ID5 { get; set; } = string.Empty;
+        public string ID6 { get; set; } = string.Empty;
+        public string ID7 { get; set; } = string.Empty;
+        public string ID8 { get; set; } = string.Empty;
     }
 
     /// <summary>
@@ -309,7 +347,7 @@ namespace Waste.Application
         /// <summary>
         /// 固定头
         /// </summary>
-        public string Key { get; set; } = "";
+        public string Key { get; set; } = string.Empty;
 
         /// <summary>
         /// 数据体长度
@@ -319,22 +357,22 @@ namespace Waste.Application
         /// <summary>
         /// IMEI
         /// </summary>
-        public string IMEI { get; set; } = "";
+        public string IMEI { get; set; } = string.Empty;
 
         /// <summary>
         /// ICCID
         /// </summary>
-        public string ICCID { get; set; } = "";
+        public string ICCID { get; set; } = string.Empty;
 
         /// <summary>
         /// IMSI
         /// </summary>
-        public string IMSI { get; set; } = "";
+        public string IMSI { get; set; } = string.Empty;
 
         /// <summary>
         /// 信号强度
         /// </summary>
-        public string GSLQ { get; set; } = "";
+        public string GSLQ { get; set; } = string.Empty;
 
         /// <summary>
         /// 时间
@@ -344,27 +382,27 @@ namespace Waste.Application
         /// <summary>
         /// 经度
         /// </summary>
-        public string Longitude { get; set; } = "";
+        public string Longitude { get; set; } = string.Empty;
 
         /// <summary>
         /// 纬度
         /// </summary>
-        public string Latitude { get; set; } = "";
+        public string Latitude { get; set; } = string.Empty;
 
         /// <summary>
         /// 桶大小
         /// </summary>
-        public string size { get; set; } = "";
+        public string size { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
-        public string trashcode { get; set; } = "";
+        public string trashcode { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾类别
         /// </summary>
-        public string WasteType { get; set; } = "";
+        public string WasteType { get; set; } = string.Empty;
 
         /// <summary>
         /// 重量,KG
@@ -374,12 +412,12 @@ namespace Waste.Application
         /// <summary>
         /// 内容
         /// </summary>
-        public string Body { get; set; } = "";
+        public string Body { get; set; } = string.Empty;
 
         /// <summary>
         /// 字符串结果
         /// </summary>
-        public string Str { get; set; } = "";
+        public string Str { get; set; } = string.Empty;
 
         /// <summary>
         /// 是否是否通过校检,true-是,false-否
@@ -405,7 +443,7 @@ namespace Waste.Application
         /// <summary>
         /// 固定头
         /// </summary>
-        public string Key { get; set; } = "";
+        public string Key { get; set; } = string.Empty;
 
         /// <summary>
         /// 数据体长度
@@ -415,22 +453,22 @@ namespace Waste.Application
         /// <summary>
         /// IMEI
         /// </summary>
-        public string IMEI { get; set; } = "";
+        public string IMEI { get; set; } = string.Empty;
 
         /// <summary>
         /// ICCID
         /// </summary>
-        public string ICCID { get; set; } = "";
+        public string ICCID { get; set; } = string.Empty;
 
         /// <summary>
         /// IMSI
         /// </summary>
-        public string IMSI { get; set; } = "";
+        public string IMSI { get; set; } = string.Empty;
 
         /// <summary>
         /// 信号强度
         /// </summary>
-        public string GSLQ { get; set; } = "";
+        public string GSLQ { get; set; } = string.Empty;
 
         /// <summary>
         /// 时间
@@ -440,27 +478,27 @@ namespace Waste.Application
         /// <summary>
         /// 经度
         /// </summary>
-        public string Longitude { get; set; } = "";
+        public string Longitude { get; set; } = string.Empty;
 
         /// <summary>
         /// 纬度
         /// </summary>
-        public string Latitude { get; set; } = "";
+        public string Latitude { get; set; } = string.Empty;
 
         /// <summary>
         /// 桶大小
         /// </summary>
-        public string size { get; set; } = "";
+        public string size { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
-        public string trashcode { get; set; } = "";
+        public string trashcode { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾类别
         /// </summary>
-        public string WasteType { get; set; } = "";
+        public string WasteType { get; set; } = string.Empty;
 
         /// <summary>
         /// 重量,KG
@@ -470,12 +508,12 @@ namespace Waste.Application
         /// <summary>
         /// 内容
         /// </summary>
-        public string Body { get; set; } = "";
+        public string Body { get; set; } = string.Empty;
 
         /// <summary>
         /// 字符串结果
         /// </summary>
-        public string Str { get; set; } = "";
+        public string Str { get; set; } = string.Empty;
 
         /// <summary>
         /// 是否是否通过校检,true-是,false-否
@@ -506,17 +544,17 @@ namespace Waste.Application
         /// <summary>
         /// 桶大小
         /// </summary>
-        public string size { get; set; } = "";
+        public string size { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾桶编号
         /// </summary>
-        public string trashcode { get; set; } = "";
+        public string trashcode { get; set; } = string.Empty;
 
         /// <summary>
         /// 垃圾类别
         /// </summary>
-        public string WasteType { get; set; } = "";
+        public string WasteType { get; set; } = string.Empty;
 
         /// <summary>
         /// 重量,KG

Waste.Application/ResultInfos/ResultService.cs

@@ -150,6 +150,15 @@ namespace Waste.Application
                     it.Measure_Amount = ext?.Amount;
                     it.Measure_OpUser = ext?.OpUser;
                     it.Measure_UUID = ext?.UUID;
+
+                    it.ID1 = ext?.ID1;
+                    it.ID2 = ext?.ID2;
+                    it.ID3 = ext?.ID3;
+                    it.ID4 = ext?.ID4;
+                    it.ID5 = ext?.ID5;
+                    it.ID6 = ext?.ID6;
+                    it.ID7 = ext?.ID7;
+                    it.ID8 = ext?.ID8;
                 })
                  .ToPageListAsync(param.offset, param.limit, totalnum);
             return new PageParms<ResultList>
@@ -443,7 +452,22 @@ namespace Waste.Application
                         Amount = amount,
                         OpUser = myPackage.OpUser.ToStr(),
                         Price = price,
-                        UUID = myPackage.UUID
+                        UUID = myPackage.UUID,
+
+                        DeviceFacEcode = myPackage.DeviceFacEcode,
+                        Registration = myPackage.Registration,
+                        GrossWeight = myPackage.GrossWeight,
+                        Tare = myPackage.Tare,
+                        NetWeight = myPackage.NetWeight,
+
+                        ID1 = myPackage.ID1,
+                        ID2 = myPackage.ID2,
+                        ID3 = myPackage.ID3,
+                        ID4 = myPackage.ID4,
+                        ID5 = myPackage.ID5,
+                        ID6 = myPackage.ID6,
+                        ID7 = myPackage.ID7,
+                        ID8 = myPackage.ID8,
                     }).ExecuteCommandAsync();
                 }
                 await SendMessageToThird(new SendThirdMessageSubscribeS2SDto

Waste.Domain/DataModel/W_MeasureResult.cs

@@ -43,5 +43,35 @@ namespace Waste.Domain
         /// </summary>
         [SugarColumn(ColumnDescription = "唯一消息ID", ColumnDataType = "varchar(50)",IndexGroupNameList =new string[] { "index_uuid"})]
         public string UUID { get; set; }
+
+
+        /// <summary>
+        /// 设备出厂序列号/设备出厂编号
+        /// </summary>
+        public string DeviceFacEcode { get; set; }
+        /// <summary>
+        /// 车牌号/物品编码/垃圾桶编号
+        /// </summary>
+        public string Registration { get; set; }
+        /// <summary>
+        /// 毛重,KG
+        /// </summary>
+        public string GrossWeight { get; set; }
+        /// <summary>
+        /// 皮重,KG
+        /// </summary>
+        public string Tare { get; set; }
+        /// <summary>
+        /// 净重,KG
+        /// </summary>
+        public string NetWeight { get; set; }
+        public string ID1 { get; set; }
+        public string ID2 { get; set; }
+        public string ID3 { get; set; }
+        public string ID4 { get; set; }
+        public string ID5 { get; set; }
+        public string ID6 { get; set; }
+        public string ID7 { get; set; }
+        public string ID8 { get; set; }
     }
 }

Waste.SocketService.cs/MyPackage.cs

@@ -11,6 +11,7 @@ namespace Waste.SocketService
     /// </summary>
     public class MyPackage: A8Package
     {
+
         /// <summary>
         /// 固定头
         /// </summary>
@@ -83,8 +84,10 @@ namespace Waste.SocketService
         /// 是否为有效测量
         /// </summary>
         public bool IsWeight { get; set; } = false;
+
+
     }
-    
+
     /// <summary>
     /// A8协议包内容
     /// </summary>
@@ -114,5 +117,34 @@ namespace Waste.SocketService
         /// 操作员 
         /// </summary>
         public string OpUser { get; set; } = "";
+
+        /// <summary>
+        /// 设备出厂序列号/设备出厂编号
+        /// </summary>
+        public string DeviceFacEcode { get; set; }
+        /// <summary>
+        /// 车牌号/物品编码/垃圾桶编号
+        /// </summary>
+        public string Registration { get; set; }
+        /// <summary>
+        /// 毛重,KG
+        /// </summary>
+        public string GrossWeight { get; set; }
+        /// <summary>
+        /// 皮重,KG
+        /// </summary>
+        public string Tare { get; set; }
+        /// <summary>
+        /// 净重,KG
+        /// </summary>
+        public string NetWeight { get; set; }
+        public string ID1 { get; set; }
+        public string ID2 { get; set; }
+        public string ID3 { get; set; }
+        public string ID4 { get; set; }
+        public string ID5 { get; set; }
+        public string ID6 { get; set; }
+        public string ID7 { get; set; }
+        public string ID8 { get; set; }
     }
 }

Waste.SocketService.cs/MyPackageFilter.cs

@@ -302,14 +302,30 @@ namespace Waste.SocketService
                         var measurearr = arr[6].Split('@');
                         if (measurearr.Length == 8)
                         {
-                            package.UUID = measurearr[0];
+                            Read(package, measurearr);
-                            package.UploadTime = measurearr[1];
+                            package.IsWeight = true;
-                            package.WasteType = measurearr[2];
+                        }
-                            package.WasteSType = measurearr[3];
+                        //uuid@datetime@垃圾类型@子类@重量@单价@金额@操作员@物品编码@垃圾桶@毛重@皮重@净重@ID1@ID2@ID3@ID4@ID5@ID6@ID7@ID8\r\n 
-                            package.Weight = measurearr[4];
+                        else if (measurearr.Length == 21)
-                            package.Price = measurearr[5];
+                        {
-                            package.Amount = measurearr[6];
+
-                            package.OpUser = measurearr[7];
+                            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
@@ -438,6 +454,18 @@ namespace Waste.SocketService
                 Console.WriteLine($"数据处理发生异常:{ex.Message}");
                 return new MyPackage();
             }
+
+            void Read(MyPackage package, string[] measurearr)
+            {
+                package.UUID = measurearr[0];
+                package.UploadTime = measurearr[1];
+                package.WasteType = measurearr[2];
+                package.WasteSType = measurearr[3];
+                package.Weight = measurearr[4];
+                package.Price = measurearr[5];
+                package.Amount = measurearr[6];
+                package.OpUser = measurearr[7];
+            }
         }
     }
 }

Waste.Web.Entry/Pages/Result/ResultColumnConfigService.cs

@@ -13,6 +13,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Waste.Application;
 using Waste.Domain;
+using static Google.Protobuf.WellKnownTypes.Field.Types;
 
 namespace Waste.Web.Entry.Pages.Result
 {
@@ -31,19 +32,29 @@ namespace Waste.Web.Entry.Pages.Result
             {nameof(ResultList.DeviceEcode).ToLower(),"机器码"},
             {nameof(ResultList.DeviceName).ToLower(),"设备名称"},
             {nameof(ResultList.BusinessName).ToLower(),"所属商户"},
+            {nameof(ResultList.PostStatus).ToLower(),"状态"},
+            {nameof(ResultList.CreateTime).ToLower(),"回收时间"},
             {nameof(ResultList.WasteType).ToLower(),"物品编码"},
-            {nameof(ResultList.GrossWeight).ToLower(),"毛重(KG)"},
             {nameof(ResultList.Registration).ToLower(),"垃圾桶"},
+            {nameof(ResultList.GrossWeight).ToLower(),"毛重(KG)"},
             {nameof(ResultList.Tare).ToLower(),"皮重(KG)"},
             {nameof(ResultList.NetWeight).ToLower(),"净重(KG)"},
             {nameof(ResultList.DeviceAddress).ToLower(),"地址"},
-            {nameof(ResultList.PostStatus).ToLower(),"状态"},
-            {nameof(ResultList.CreateTime).ToLower(),"回收时间"},
             {nameof(ResultList.Measure_Price).ToLower(),"单价"},
             {nameof(ResultList.Measure_Amount).ToLower(),"金额"},
             {nameof(ResultList.Measure_OpUser).ToLower(),"操作员"},
             {nameof(ResultList.Measure_UUID).ToLower(),"消息ID"},
             {nameof(ResultList.Measure_WasteSType).ToLower(),"物品小类"},
+
+            {nameof(ResultList.ID1).ToLower(),"ID1"},
+            {nameof(ResultList.ID2).ToLower(),"ID2"},
+            {nameof(ResultList.ID3).ToLower(),"ID3"},
+            {nameof(ResultList.ID4).ToLower(),"ID4"},
+            {nameof(ResultList.ID5).ToLower(),"ID5"},
+            {nameof(ResultList.ID6).ToLower(),"ID6"},
+            {nameof(ResultList.ID7).ToLower(),"ID7"},
+            {nameof(ResultList.ID8).ToLower(),"ID8"},
+
         };
 
         public ResultColumnConfigService(ILogger<ResultColumnConfigService> logger, SettingProvider settingProvider, UserSettingValueProvider userSettingValueProvider, GlobalSettingValueProvider globalSettingValueProvider)
@@ -73,10 +84,32 @@ namespace Waste.Web.Entry.Pages.Result
                 var config = JSON.Deserialize<GlobalConfig>(value);
                 if (config.ResultColumn != null && config.ResultColumn.Any())
                 {
-                    return config.ResultColumn.GroupBy(x => x.Name)
+                    #region 以系统顺序为准
+                    var dic = config.ResultColumn.GroupBy(x => x.Name).ToDictionary(x => x.Key, x => x.First());
+                    return def
+                        .Select(x =>
+                        {
+                            if (dic.TryGetValue(x.Key, out var find))
+                            {
+                                return new GlobalColumnConfig
+                                { Name = x.Key, Title = find.Title, IsShow = find.IsShow };
+                            }
+                            return new GlobalColumnConfig { Name = x.Key, Title = string.Empty, IsShow = false };
+                        }).ToList();
+
+                    #endregion
+
+
+                    #region 自定义顺序
+
+                    /*                    return config.ResultColumn.GroupBy(x => x.Name)
                         .Where(x => def.ContainsKey(x.Key))
                         .Select(x =>
-                            new GlobalColumnConfig { Name = x.Key, Title = x.First().Title, IsShow = x.First().IsShow }).ToList();
+                            new GlobalColumnConfig { Name = x.Key, Title = x.First().Title, IsShow = x.First().IsShow }).ToList();                 
+*/
+                    #endregion
+
+
                 }
             }
             catch (Exception e)