统一字段名称

统一解析字段名称
2025-05-08 09:25:41 +08:00 · 2025-05-08 09:25:17 +08:00
63 changed files with 197 additions and 81 deletions
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F1_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.FocusId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.Address;
                    data.DeviceType = MeterTypeEnum.Focus;
                }
                UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F2_Analysis.cs
@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.FocusId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.Address;
                    data.DeviceType = MeterTypeEnum.Focus;
                }
                UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_02H/AFN2_F3_Analysis.cs
@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_02H
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.FocusId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.Address;
                    data.DeviceType = MeterTypeEnum.Focus;
                }
                UnitDataAnalysis<AnalysisBaseDto<string>> dto = new UnitDataAnalysis<AnalysisBaseDto<string>>
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
@ -46,7 +46,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AFN_0CH
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.MeterId;
                    data.DatabaseBusiID=ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress= ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress= ammeterInfo.AmmerterAddress;
                }
                UnitDataAnalysis<AnalysisBaseDto<decimal>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal>>
                {
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F100_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F101_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F102_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F103_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F104_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F105_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F106_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F107_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F108_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F11_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F145_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F146_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F147_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F148_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F161_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F162_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F163_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F164_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F165_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F166_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F167_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F168_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F177_Analysis.cs
@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F178_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F179_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F180_Analysis.cs
@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F181_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F182_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F183_Analysis.cs
@ -47,7 +47,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F184_Analysis.cs
@ -48,7 +48,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F189_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F190_Analysis.cs
@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.MeterId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.AmmerterAddress;
                }
                UnitDataAnalysis<AnalysisBaseDto<decimal>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal>>
                {
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F193_Analysis.cs
@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.MeterId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.AmmerterAddress;
                }
                UnitDataAnalysis<AnalysisBaseDto<decimal>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal>>
                {
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F195_Analysis.cs
@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.MeterId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.AmmerterAddress;
                }
                UnitDataAnalysis<AnalysisBaseDto<decimal>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal>>
                {
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F19_Analysis.cs
@ -49,7 +49,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F3_Analysis.cs
@ -53,7 +53,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F4_Analysis.cs
@ -52,7 +52,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F81_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F82_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F83_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F84_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F85_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F86_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F87_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F88_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F89_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F90_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F91_Analysis.cs
@ -50,7 +50,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F92_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F93_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F94_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F95_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F97_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F98_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0DH/AFN13_F99_Analysis.cs
@ -51,7 +51,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0DH
                            item.ProjectId = ammeterInfo.ProjectID;
                            item.DeviceId = ammeterInfo.MeterId;
                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                            item.MeterAddress = ammeterInfo.AmmerterAddress;
+                            item.DeviceAddress = ammeterInfo.AmmerterAddress;
                        });
                    }
                }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0EH/AFN14_F1_Analysis.cs
@ -1,9 +1,13 @@
 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;
 using JiShe.CollectBus.Protocol3761;
 using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;

 namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
 {
@ -15,13 +19,14 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
    public class AFN14_F1_Analysis : IAnalysisStrategy<TB3761>
    {
        private readonly ILogger<AFN14_F1_Analysis> _logger;
-
-        public AFN14_F1_Analysis(ILogger<AFN14_F1_Analysis> logger)
+        private readonly DataStorage _dataStorage;
+        public AFN14_F1_Analysis(ILogger<AFN14_F1_Analysis> logger, DataStorage dataStorage)
        {
            _logger = logger;
+            _dataStorage= dataStorage;
        }

-        public Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
+        public async Task<bool> ExecuteAsync(TB3761 input, Action<dynamic>? result = null)
        {
            try
            {
@ -31,15 +36,35 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
                bool isOnOffPower = erc.Equals(14) ? true : false;
                if (!isOnOffPower)
                {
-                    throw new Exception($"ERC{erc}非上掉电事件");
+                    // TODO：非终端停/上电事件直接确认
+                    _logger.LogWarning($"0E_1解析ERC{erc}非终端停/上电事件:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString}");
+                    return await Task.FromResult(true);
                }
-                UnitDataAnalysis<Tuple<string, string>> dto = new UnitDataAnalysis<Tuple<string, string>>
+
+                List<AnalysisBaseDto<string>> data = AnalysisDataUnit(input.UnitData.HexMessageList);
+                if (data.Count > 0)
+                {
+                    // 查询电表信息
+                    AmmeterInfo ammeterInfo = await _dataStorage.GetMeterInfoAsync(data[0].DeviceType.ToString(), "15");
+                    if (ammeterInfo != null)
+                    {
+                        data.ForEach(item =>
+                        {
+                            item.ProjectId = ammeterInfo.ProjectID;
+                            item.DeviceId = ammeterInfo.FocusId;
+                            item.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
+                            item.DeviceAddress = ammeterInfo.Address;
+                            item.DeviceType = MeterTypeEnum.Focus;
+                        });
+                    }
+                }
+                UnitDataAnalysis<List<AnalysisBaseDto<string>>> dto = new UnitDataAnalysis<List<AnalysisBaseDto<string>>>
                {
                    Code = input.A.Code!,
                    AFN = input.AFN_FC.AFN,
                    Fn = input.DT.Fn,
                    Pn = input.DA.Pn,
-                    Data = AnalysisDataUnit(input.UnitData.HexMessageList),
+                    Data = data,
                    HexMessage = input.BaseHexMessage.HexMessageString,
                    MessageId = input.MessageId,
                    ReceivedTime = input.ReceivedTime,
@ -48,37 +73,55 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0EH
                };
                //  meterData.DataType = "0E_1";
                result?.Invoke(dto);
-                return Task.FromResult(true);
+                await _dataStorage.SaveMultipleStatusToIotDbAsync<string>(dto);
+                return await Task.FromResult(true);
            }
            catch (Exception ex)
            {
                _logger.LogError(ex, $"0E_1解析失败:{input.A.Code}-{input.DT.Fn}-{input.BaseHexMessage.HexMessageString},{ex.Message}");
            }
-            return Task.FromResult(false);
+            return await Task.FromResult(false);
        }

-        private Tuple<string, string> AnalysisDataUnit(List<string> hexMessageList)
+        private List<AnalysisBaseDto<string>> AnalysisDataUnit(List<string> hexMessageList)
        {
            /// Item1=停电事件
            /// Item2=上电事件
-            return Tuple.Create(HandlerTime(hexMessageList.GetRange(10, 5)), HandlerTime(hexMessageList.GetRange(15, 5)));
+            List <AnalysisBaseDto<string>> values = new List<AnalysisBaseDto<string>>
+            {
+                new AnalysisBaseDto<string>
+                {
+                    FiledDesc = "停电事件",
+                    FiledName = "Type",
+                    DataValue = "PowerDownEvent",
+                    TimeSpan=HandlerTime(hexMessageList.GetRange(10, 5))
+                },
+                new AnalysisBaseDto<string>
+                {
+                    FiledDesc = "上电事件",
+                    FiledName = "Type",
+                    DataValue = "PowerOnEvent",
+                    TimeSpan=HandlerTime(hexMessageList.GetRange(15, 5))
+                }
+            };
+            return values;
        }
        /// <summary>
        /// /解析时间
        /// </summary>
        /// <param name="times"></param>
-        /// <param name="isSetCurTime">时间验证失败是否默认为当前时间</param>
        /// <returns></returns>
-        private string HandlerTime(List<string> times)
+        private DateTime? HandlerTime(List<string> times)
        {
-            var time = string.Empty;
            try
            {
                times.Reverse();
-                time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00";
+                string time = $"{DateTime.Now.ToString("yyyy").Substring(0, 2)}{times[0]}-{times[1]}-{times[2]} {times[3]}:{times[4]}:00";
+                DateTime.TryParse(time, out DateTime dateTime);
+                return dateTime;
            }
            catch { }
-            return time;
+            return null;
        }
    }
 }
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_10H/AFN16_F97_Analysis.cs
@ -45,7 +45,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_10H
                    data.ProjectId = ammeterInfo.ProjectID;
                    data.DeviceId = ammeterInfo.MeterId;
                    data.DatabaseBusiID = ammeterInfo.DatabaseBusiID;
-                    data.MeterAddress = ammeterInfo.AmmerterAddress;
+                    data.DeviceAddress = ammeterInfo.AmmerterAddress;
                }
                UnitDataAnalysis<AnalysisBaseDto<decimal>> unitDataAnalysis = new UnitDataAnalysis<AnalysisBaseDto<decimal>>
                {
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/DataStorage.cs
@ -123,7 +123,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                    DatabaseBusiID = data.DatabaseBusiID,
                    PendingCopyReadTime = data.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), 
                    CreationTime = currentTime,
-                    MeterAddress = data.MeterAddress,
+                    MeterAddress = data.DeviceAddress,
                    AFN = analysisBaseDto.AFN,
                    Fn = analysisBaseDto.Fn,
                    Seq = analysisBaseDto.PSEQ,
@ -226,7 +226,7 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
                        DatabaseBusiID = item.DatabaseBusiID,
                        PendingCopyReadTime = item.TimeSpan.Value.GetFormatTime(analysisBaseDto.DensityUnit, analysisBaseDto.TimeDensity), 
                        CreationTime = currentTime,
-                        MeterAddress = item.MeterAddress,
+                        MeterAddress = item.DeviceAddress,
                        AFN = analysisBaseDto.AFN,
                        Fn = analysisBaseDto.Fn,
                        Seq = analysisBaseDto.PSEQ,
@ -269,8 +269,8 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
        public async Task<bool> SaveStatusToIotDbAsync<T>(UnitDataAnalysis<AnalysisBaseDto<T>> analysisBaseDto)
        {
            ArgumentNullException.ThrowIfNull(nameof(analysisBaseDto.Data));
-            ArgumentNullException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.FiledName));
-            ArgumentNullException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.DataValue));
+            ArgumentException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.FiledName));
+            ArgumentException.ThrowIfNullOrWhiteSpace(nameof(analysisBaseDto.Data.DataValue));
            var data = analysisBaseDto.Data!;
            if (!data.TimeSpan.HasValue)
                data.TimeSpan = analysisBaseDto.ReceivedTime;
@ -329,5 +329,78 @@ namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData
            return await Task.FromResult(true);
        }

+        /// <summary>
+        /// 保存状态到IotDb
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="analysisBaseDto"></param>
+        /// <returns></returns>
+        public async Task<bool> SaveMultipleStatusToIotDbAsync<T>(UnitDataAnalysis<List<AnalysisBaseDto<T>>> analysisBaseDto)
+        {
+            ArgumentNullException.ThrowIfNull(nameof(analysisBaseDto.Data));
+           
+            var data = analysisBaseDto.Data!;
+            foreach (var item in data)
+            {
+                ArgumentException.ThrowIfNullOrWhiteSpace(nameof(item.FiledName));
+                ArgumentException.ThrowIfNullOrWhiteSpace(nameof(item.DataValue));
+
+                if (!item.TimeSpan.HasValue)
+                    item.TimeSpan = analysisBaseDto.ReceivedTime;
+                // 类型(心跳，登录，上电，掉电)
+                long timestamps = DateTime.Now.GetDateTimeOffset().ToUnixTimeNanoseconds();
+                var treeData = new TreeModelSingleMeasuringEntity<T>()
+                {
+                    SystemName = _applicationOptions.SystemType,
+                    DeviceId = $"{item.DeviceId}",
+                    DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}",
+                    ProjectId = $"{item.ProjectId}",
+                    Timestamps = timestamps,
+                    SingleMeasuring = new Tuple<string, T>(item.FiledName!, item.DataValue!)
+                };
+                _runtimeContext.UseTableSessionPool = false; // 使树模型池
+                await _dbProvider.InsertAsync(treeData);
+                // 数据帧
+                var treeFrameData = new TreeModelSingleMeasuringEntity<string>()
+                {
+                    SystemName = _applicationOptions.SystemType,
+                    DeviceId = $"{item.DeviceId}",
+                    DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}",
+                    ProjectId = $"{item.ProjectId}",
+                    Timestamps = timestamps,
+                    SingleMeasuring = new Tuple<string, string>(ConcentratorStatusFieldConst.FrameData, analysisBaseDto.HexMessage ?? string.Empty)
+                };
+
+                _runtimeContext.UseTableSessionPool = false; // 使树模型池
+                await _dbProvider.InsertAsync(treeFrameData);
+
+                // 时间
+                var treeRecordingTimeData = new TreeModelSingleMeasuringEntity<long>()
+                {
+                    SystemName = _applicationOptions.SystemType,
+                    DeviceId = $"{item.DeviceId}",
+                    DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}",
+                    ProjectId = $"{item.ProjectId}",
+                    Timestamps = timestamps,
+                    SingleMeasuring = new Tuple<string, long>(ConcentratorStatusFieldConst.RecordingTime, (data.TimeSpan.HasValue ? data.TimeSpan.Value : DateTime.Now).GetDateTimeOffset().ToUnixTimeNanoseconds())
+                };
+                _runtimeContext.UseTableSessionPool = false; // 使树模型池
+                await _dbProvider.InsertAsync(treeRecordingTimeData);
+                // 备注
+                var treeRemarkData = new TreeModelSingleMeasuringEntity<string>()
+                {
+                    SystemName = _applicationOptions.SystemType,
+                    DeviceId = $"{item.DeviceId}",
+                    DeviceType = $"{item.DeviceType}.{IOTDBDataType.Status}",
+                    ProjectId = $"{item.ProjectId}",
+                    Timestamps = timestamps,
+                    SingleMeasuring = new Tuple<string, string>(ConcentratorStatusFieldConst.Remark, data.FiledDesc ?? string.Empty)
+                };
+                _runtimeContext.UseTableSessionPool = false; // 使树模型池
+                await _dbProvider.InsertAsync(treeRemarkData);
+
+            }
+            return await Task.FromResult(true);
+        }
    }
 }
--- a/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs
+++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs
@ -63,9 +63,9 @@ namespace JiShe.CollectBus.Protocol.Contracts.Protocol.Dto
        public int DatabaseBusiID { get; set; }

        /// <summary>
-        /// 表地址
+        /// 设备地址(电表地址,水表地址，气表地址，集中器地址等)
        /// </summary>
-        public string MeterAddress { get; set; } = null!;
+        public string DeviceAddress { get; set; } = null!;

    }
Author	SHA1	Message	Date
zenghongyao	7a18dc4df9	统一字段名称	2025-05-08 09:25:41 +08:00
zenghongyao	0de5177472	统一解析字段名称	2025-05-08 09:25:17 +08:00