优化存储

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs

@@ -46,6 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId= ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs

@@ -43,6 +43,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs

@@ -45,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs

@@ -45,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs

@@ -45,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<AFN9_F1_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN9_F1_AnalysisDto?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs

@@ -45,6 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<string?>> dto = new UnitDataAnalysis<AnalysisBaseDto<string?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<AFN10_F10_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN10_F10_AnalysisDto?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs

@@ -49,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<AFN10_F66_AnalysisDto?>> dto = new UnitDataAnalysis<AnalysisBaseDto<AFN10_F66_AnalysisDto?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs

@@ -44,6 +44,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.Address;
                     data.DeviceType = MeterTypeEnum.Focus;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<bool?>> dto = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs

@@ -65,6 +65,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs

@@ -8,6 +8,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
@@ -47,6 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs

@@ -10,6 +10,7 @@ using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
 using YamlDotNet.Core.Tokens;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
@@ -48,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs

@@ -11,6 +11,7 @@ using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using System.Diagnostics.Metrics;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
 {
@@ -39,7 +40,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                 List<string> datas = await AnalysisDataUnitAsync(input.UnitData.HexMessageList);
                 string itemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}";
 
-                AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", dataType);
+                AnalysisBaseDto<decimal?> data = GenerateFinalResult(datas, "当月正向有功最大需量及发生时间", itemType);
                  // 查询电表信息
                 AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
                 if (ammeterInfo != null)
@@ -48,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
-                       
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs

@@ -10,6 +10,7 @@ using JiShe.CollectBus.Protocol.T37612012.AnalysisData;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
 {
@@ -48,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID=ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress= ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs

@@ -10,6 +10,7 @@ using JiShe.CollectBus.Protocol.T37612012.AnalysisData;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 using YamlDotNet.Core.Tokens;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
 {
@@ -48,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
-
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> dto = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs

@@ -78,6 +78,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs

@@ -11,6 +11,7 @@ using System.Diagnostics.Metrics;
 using JiShe.CollectBus.Protocol.T37612012.AnalysisData;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Common.Consts;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
 {
@@ -47,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
-
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs

@@ -10,6 +10,7 @@ using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
 using System;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
 {
@@ -53,6 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<AFN12_F33_AnalysisDto?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<AFN12_F33_AnalysisDto?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs

@@ -74,6 +74,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs

@@ -49,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs

@@ -49,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs

@@ -49,6 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs

@@ -50,6 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs

@@ -9,6 +9,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
 using JiShe.CollectBus.Protocol.T37612012.Appendix;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -46,6 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs

@@ -10,6 +10,7 @@ using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.Common.Consts;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -47,6 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs

@@ -10,6 +10,7 @@ using JiShe.CollectBus.Common.Extensions;
 using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Common.Helpers;
 using JiShe.CollectBus.Common.Consts;
+using static FreeSql.Internal.GlobalFilter;
 
 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
 {
@@ -47,6 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs

@@ -55,6 +55,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs

@@ -54,6 +54,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs

@@ -52,6 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs

@@ -53,6 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                             item.DeviceId = ammeterInfo.MeterId;
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.AmmerterAddress;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs

@@ -56,6 +56,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
                             item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                             item.DeviceAddress = ammeterInfo.Address;
                             item.DeviceType = MeterTypeEnum.Focus;
+                            item.FocusId = ammeterInfo.FocusId;
                         });
                     }
                 }

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F101_Analysis.cs

@@ -1,6 +1,7 @@
 using JiShe.CollectBus.Common.Consts;
 using JiShe.CollectBus.Common.Enums;
 using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.IotSystems.Ammeters;
 using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Dto;
 using JiShe.CollectBus.Protocol.Interfaces;
@@ -36,6 +37,16 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
                     DataValue = AnalysisDataUnit(input.UnitData.HexMessageList),
                     ItemType = $"{input.AFN_FC.AFN.HexToDecStr().PadLeft(2, '0')}_{input.DT.Fn}"
                 };
+                // 查询电表信息
+                AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data.DeviceType.ToString(), "15");
+                if (ammeterInfo != null)
+                {
+                    data.ProjectId = ammeterInfo.ProjectID;
+                    data.DeviceId = ammeterInfo.MeterId;
+                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
+                    data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
+                }
                 UnitDataAnalysis<AnalysisBaseDto<string?>> dto = new UnitDataAnalysis<AnalysisBaseDto<string?>>
                 {
                     Code = input.A.Code!,

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs

@@ -51,6 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<decimal?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F98_Analysis.cs

@@ -52,6 +52,7 @@ namespace GatherService.WattMeter.AnalysisData.AFN_10H
                     data.DeviceId = ammeterInfo.MeterId;
                     data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
                     data.DeviceAddress = ammeterInfo.AmmerterAddress;
+                    data.FocusId = ammeterInfo.FocusId;
                 }
                 UnitDataAnalysis<AnalysisBaseDto<bool?>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<bool?>>
                 {

protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs

@@ -149,11 +149,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                     DeviceType = $"{data.DeviceType}",
                     DeviceId = $"{data.DeviceId}",
                     DataType = analysisBaseDto.DataType,
+                    FocusId = data.FocusId,
+                    FocusAddress = analysisBaseDto.Code,
                     Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
                     DatabaseBusiID = data.DatabaseBusiID,
                     PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
                     CreationTime = currentTime,
-                    MeterAddress = data.DeviceAddress,
+                    MeterAddress = analysisBaseDto.Code == data.DeviceAddress ? "" : data.DeviceAddress, // 判断是否能取到表地址
                     AFN = analysisBaseDto.AFN,
                     Fn = analysisBaseDto.Fn,
                     Seq = analysisBaseDto.PSEQ,
@@ -255,12 +257,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                         ProjectId = $"{item.ProjectId}",
                         DeviceType = $"{item.DeviceType}",
                         DeviceId = $"{item.DeviceId}",
-                        DataType = analysisBaseDto.DataType,
+                        DataType = IOTDBDataTypeConst.Log, // 匹配不到下发记录标记为LOG
                         Timestamps = DateTime.Now.CheckTimePoint().GetDateTimeOffset().ToUnixTimeNanoseconds(),
                         DatabaseBusiID = item.DatabaseBusiID,
                         PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), 
                         CreationTime = currentTime,
-                        MeterAddress = item.DeviceAddress,
+                        FocusId = item.FocusId,
+                        FocusAddress = analysisBaseDto.Code,
+                        MeterAddress = analysisBaseDto.Code == item.DeviceAddress ? "" : item.DeviceAddress, // 判断是否能取到表地址
                         AFN = analysisBaseDto.AFN,
                         Fn = analysisBaseDto.Fn,
                         Seq = analysisBaseDto.PSEQ,
@@ -365,11 +369,13 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                 DeviceType = $"{data.DeviceType}",
                 DeviceId = $"{data.DeviceId}",
                 DataType = analysisBaseDto.DataType,
+                FocusId = data.FocusId,
+                FocusAddress = analysisBaseDto.Code,
                 Timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds(),
                 DatabaseBusiID = data.DatabaseBusiID,
                 PendingCopyReadTime = data.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
                 CreationTime = currentTime,
-                MeterAddress = data.DeviceAddress,
+                MeterAddress = analysisBaseDto.Code == data.DeviceAddress ? "" : data.DeviceAddress,// 判断是否能取到表地址
                 AFN = analysisBaseDto.AFN,
                 Fn = analysisBaseDto.Fn,
                 Seq = analysisBaseDto.PSEQ,
@@ -466,7 +472,9 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                     DatabaseBusiID = item.DatabaseBusiID,
                     PendingCopyReadTime = item.TimeSpan!.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity),
                     CreationTime = currentTime,
-                    MeterAddress = item.DeviceAddress,
+                    FocusId = item.FocusId,
+                    FocusAddress = analysisBaseDto.Code,
+                    MeterAddress= analysisBaseDto.Code== item.DeviceAddress?"": item.DeviceAddress,// 判断是否能取到表地址
                     AFN = analysisBaseDto.AFN,
                     Fn = analysisBaseDto.Fn,
                     Seq = analysisBaseDto.PSEQ,

services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs

@@ -67,6 +67,10 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto
         /// </summary>
         public string DeviceAddress { get; set; } = null!;
 
+        /// <summary>
+        /// 集中器ID
+        /// </summary>
+        public int FocusId { get; set; }
     }
 
     public class AnalysisBaseDto<T> : AnalysisBaseDto 

web/JiShe.CollectBus.Host/Pages/Monitor.cshtml

@@ -16,6 +16,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link href="libs/bootstrap/css/bootstrap.min.css" rel="stylesheet" />
     <title>后端服务</title>
+
 </head>
    
 <body>

web/JiShe.CollectBus.Host/appsettings.json

@@ -88,7 +88,7 @@
     "ClusterList": [ "192.168.1.9:6667" ],
     "PoolSize": 32,
     "DataBaseName": "energy",
-    "OpenDebugMode": false,
+    "OpenDebugMode": true,
     "UseTableSessionPoolByDefault": false
   },
   "Cassandra": {