diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
index 364542a..0871607 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
@@ -1,13 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
-using JiShe.CollectBus.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;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
index 2e76ae5..60ededf 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
@@ -1,18 +1,10 @@
-using DeviceDetectorNET.Class;
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.AFN_00H;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
+using JiShe.CollectBus.Common.Extensions;
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;
-using System.Linq;
using System.Text;
-using System.Threading.Tasks;
-using TouchSocket.Core;
-using YamlDotNet.Core;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
index fefe177..ca64928 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
@@ -1,15 +1,9 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.AFN_00H;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-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;
-using System.Linq;
using System.Text;
-using System.Threading.Tasks;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
index 9f2e384..b410abe 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
@@ -1,16 +1,9 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.AFN_09H;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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 Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
index ce2cf12..a9763f4 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
@@ -1,10 +1,10 @@
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.Protocol.Contracts.Abstracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
index 8b32e24..f87aaf3 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
@@ -1,13 +1,7 @@
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
-using JiShe.CollectBus.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;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
index 6aea2ff..0032770 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
@@ -1,22 +1,16 @@
-using FreeSql.Internal.CommonProvider;
-using JiShe.CollectBus.Common.Consts;
-using JiShe.CollectBus.Common.Encrypt;
-using JiShe.CollectBus.Common.Enums;
+using JiShe.CollectBus.Common.Encrypt;
using JiShe.CollectBus.Common.Helpers;
-using JiShe.CollectBus.EnergySystems.Entities;
using JiShe.CollectBus.IoTDB.Interface;
using JiShe.CollectBus.IoTDB.Options;
using JiShe.CollectBus.IoTDB.Provider;
-using JiShe.CollectBus.IotSystems.Ammeters;
using JiShe.CollectBus.IotSystems.MeterReadingRecords;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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 NUglify.JavaScript.Syntax;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
{
@@ -129,13 +123,13 @@ namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
return list;
}
- ///
- /// 生成最终结果
- ///
- ///
- public Task SaveIotDbAsync()
- {
+ /////
+ ///// 生成最终结果
+ /////
+ /////
+ //public Task SaveIotDbAsync()
+ //{
- }
+ //}
}
}
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
index 0afadc6..a7c65a9 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
@@ -1,9 +1,9 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
index c52e7e3..977b8f0 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
@@ -1,9 +1,9 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
index 85c3f88..c6a0fc7 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
@@ -1,9 +1,9 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
index 6a3d126..a718674 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
@@ -1,10 +1,10 @@
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git 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
index 986d52b..a79ed99 100644
--- 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
@@ -1,13 +1,11 @@
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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.Threading.Tasks;
-using Volo.Abp.Domain.Entities;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
index 45f455d..2d2b0c8 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
@@ -1,9 +1,9 @@
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
index f3fd66b..94b1085 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
@@ -1,17 +1,11 @@
-using JiShe.CollectBus.Common.Enums;
-using JiShe.CollectBus.Common.Extensions;
+using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
-using System.Threading.Tasks;
-using Volo.Abp.Domain.Entities;
-using YamlDotNet.Core.Tokens;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
index bd034c6..f636e92 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
@@ -1,10 +1,10 @@
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
index 12d49fc..054c2c2 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
@@ -1,12 +1,10 @@
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
+using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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.Threading.Tasks;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
index 14b46ad..e6e42ec 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
@@ -1,10 +1,10 @@
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
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;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
index c197e04..1c6372b 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
@@ -1,10 +1,5 @@
-using JiShe.CollectBus.Protocol.AnalysisData.AFN_09H;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
index 9cc7b92..c56d7fc 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
index 2fbe5d5..465d461 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
index e3d2248..f35f34f 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
index 69e7a5c..cbbb021 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
@@ -1,4 +1,4 @@
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
index c6aa07f..4e3ecd4 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
index f7ac153..31a5f45 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
index 39c32f6..d4588d7 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
index fa5958c..f16bf26 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
@@ -1,8 +1,5 @@
-using JiShe.CollectBus.Protocol.AnalysisData.AFN_09H;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using JiShe.CollectBus.Protocol.Contracts.Models;
-using JiShe.CollectBus.Protocol.Dto;
+using JiShe.CollectBus.Protocol.Contracts;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
index 0905d45..ebeb20e 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
index f97be46..6660605 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
index 7546af9..50220f9 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
index 2ca689c..c6da235 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
index cd17247..22127e3 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
@@ -1,6 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
index 9989bf4..16655ec 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
index ca45b2b..47d8413 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
index d4179c6..4ffb948 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
index c2c3859..c8049cd 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
@@ -1,5 +1,4 @@
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
index 2753afd..e2b40e6 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
@@ -1,6 +1,4 @@
-using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using Microsoft.Extensions.Logging;
+using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
index a8415e4..f63bb10 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
index daebff2..05847d1 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
index a305fa2..9e7a8ad 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
{
diff --git a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
index f290932..9f99a80 100644
--- a/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
+++ b/protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
@@ -1,5 +1,5 @@
using JiShe.CollectBus.Common.Extensions;
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
+using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix
{
diff --git a/protocols/JiShe.CollectBus.Protocol.Test/JiSheCollectBusTestProtocolModule.cs b/protocols/JiShe.CollectBus.Protocol.Test/JiSheCollectBusTestProtocolModule.cs
index 225179a..45818f1 100644
--- a/protocols/JiShe.CollectBus.Protocol.Test/JiSheCollectBusTestProtocolModule.cs
+++ b/protocols/JiShe.CollectBus.Protocol.Test/JiSheCollectBusTestProtocolModule.cs
@@ -1,6 +1,4 @@
-using JiShe.CollectBus.Protocol.Contracts.Interfaces;
-using Microsoft.Extensions.DependencyInjection;
-using System;
+using Microsoft.Extensions.DependencyInjection;
using Volo.Abp;
using Volo.Abp.Modularity;
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN10_F10_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN10_F10_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN10_F10_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN10_F10_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN10_F66_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN10_F66_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN10_F66_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN10_F66_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F129_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F129_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F129_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F129_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F130_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F130_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F130_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F130_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F131_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F131_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F131_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F131_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F132_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F132_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F132_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F132_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F145_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F145_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F145_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F145_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F149_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F149_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F149_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F149_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F188_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F188_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F188_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F188_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F25_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F25_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F25_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F25_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F2_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F2_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F2_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F2_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F33_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F33_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F33_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F33_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F49_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F49_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN12_F49_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN12_F49_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN9_F1_AnalysisDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN9_F1_AnalysisDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AFN9_F1_AnalysisDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AFN9_F1_AnalysisDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AnalysisBaseDto.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs
similarity index 100%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/AnalysisBaseDto.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/AnalysisBaseDto.cs
diff --git a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/UnitDataAnalysis.cs b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs
similarity index 70%
rename from protocols/JiShe.CollectBus.Protocol/Protocol/Dto/UnitDataAnalysis.cs
rename to services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs
index 3a03923..d10594b 100644
--- a/protocols/JiShe.CollectBus.Protocol/Protocol/Dto/UnitDataAnalysis.cs
+++ b/services/JiShe.CollectBus.Domain/Protocol3761/Dto/UnitDataAnalysis.cs
@@ -5,7 +5,7 @@
///
/// 集中器地址
///
- public string? Code { get; set; }
+ public string Code { get; set; } = null!;
///
/// AFN功能码
@@ -22,7 +22,16 @@
///
public int Fn { get; set; }
-
+ ///
+ /// 主站地址 MSA
+ ///
+ public int MSA { get; set; }
+
+ ///
+ /// 响应帧序号
+ ///
+ public int PSEQ { get; set; }
+
}
public class UnitDataAnalysis: UnitDataAnalysis