admin/JiShe.CollectBus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

规整命名空间

Browse Source
This commit is contained in:
cli 2025-04-27 09:16:37 +08:00
parent 946dffbaa7
commit 355aad3ee5
77 changed files with 137 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
JiShe.CollectBus.sln
View File

@ -37,15 +37,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.Web", "1.Web", "{A02F7D8A
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.Modules", "4.Modules", "{2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.Modules", "4.Modules", "{2E0FE301-34C3-4561-9CAE-C7A9E65AEE59}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.Protocols", "3.Protocols", "{3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.Protocols", "6.Protocols", "{3C3F9DB2-EC97-4464-B49F-BF1A0C2B46DC}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.Services", "2.Services", "{BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2.Services", "2.Services", "{BA4DA3E7-9AD0-47AD-A0E6-A0BB6700DA23}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Shared", "5.Shared", "{EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3.Shared", "3.Shared", "{EBF7C01F-9B4F-48E6-8418-2CBFDA51EB0B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka.Test", "modules\JiShe.CollectBus.Kafka.Test\JiShe.CollectBus.Kafka.Test.csproj", "{6D6A2A58-7406-9C8C-7B23-3E442CCE3E6B}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka.Test", "modules\JiShe.CollectBus.Kafka.Test\JiShe.CollectBus.Kafka.Test.csproj", "{6D6A2A58-7406-9C8C-7B23-3E442CCE3E6B}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "6.External", "6.External", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.External", "5.External", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Protocol.T1882018", "protocols\JiShe.CollectBus.Protocol.T1882018\JiShe.CollectBus.Protocol.T1882018.csproj", "{430D298B-377E-49B8-83AA-ADC7C0EBDB0F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Protocol.T1882018", "protocols\JiShe.CollectBus.Protocol.T1882018\JiShe.CollectBus.Protocol.T1882018.csproj", "{430D298B-377E-49B8-83AA-ADC7C0EBDB0F}"
EndProject EndProject

7
protocols/JiShe.CollectBus.Protocol.T1882018/JiSheCollectBusProtocolT1882018Module.cs
View File

@ -1,12 +1,9 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using System.Reflection;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol.T1882018
{ {
public class JiSheCollectBusProtocolT1882018Module : AbpModule public class JiSheCollectBusProtocolT1882018Module : AbpModule
{ {

8
protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketBuilder.cs
View File

@ -1,11 +1,7 @@
using FreeSql; using System.Reflection;
using JiShe.CollectBus.Common.BuildSendDatas; using JiShe.CollectBus.Common.BuildSendDatas;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Models;
using System.Reflection;
namespace JiShe.CollectBus.Protocol.SendData namespace JiShe.CollectBus.Protocol.T1882018.SendData
{ {
/// <summary> /// <summary>
/// 构建188-2018下发报文 /// 构建188-2018下发报文

2
protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketRequest.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.SendData namespace JiShe.CollectBus.Protocol.T1882018.SendData
{ {
/// <summary> /// <summary>
/// 构建645报文参数 /// 构建645报文参数

2
protocols/JiShe.CollectBus.Protocol.T1882018/SendData/Telemetry1882018PacketResponse.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.SendData namespace JiShe.CollectBus.Protocol.T1882018.SendData
{ {
/// <summary> /// <summary>
/// 返回645报文结果 /// 返回645报文结果

19
protocols/JiShe.CollectBus.Protocol.T1882018/T1882018ProtocolPlugin.cs
View File

@ -1,23 +1,16 @@
using JiShe.CollectBus.Common.BuildSendDatas; using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Helpers;
using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.Enums;
using JiShe.CollectBus.IotSystems.Devices;
using JiShe.CollectBus.IotSystems.MessageReceiveds;
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Protocol.Models;
using JiShe.CollectBus.Protocol.Contracts.SendData; using JiShe.CollectBus.Protocol.T1882018.SendData;
using JiShe.CollectBus.Protocol.SendData; using JiShe.CollectBus.Protocol.T37612012;
using JiShe.CollectBus.Protocol.T37612012.SendData;
using Mapster; using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TouchSocket.Sockets; using TouchSocket.Sockets;
using Volo.Abp.Domain.Repositories;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol.T1882018
{ {
/// <summary> /// <summary>
/// T1882018协议插件 /// T1882018协议插件

2
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F1_Analysis.cs
View File

@ -3,7 +3,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
{ {
/// <summary> /// <summary>
/// 5.1.3.1 F1：全部确认：对收到报文中的全部数据单元标识进行确认 /// 5.1.3.1 F1：全部确认：对收到报文中的全部数据单元标识进行确认

2
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_00H/AFN0_F2_Analysis.cs
View File

@ -3,7 +3,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_00H namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_00H
{ {
/// <summary> /// <summary>
/// 5.1.3.2 F2：全部否认 /// 5.1.3.2 F2：全部否认

6
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F1_Analysis.cs
View File

@ -1,12 +1,12 @@
using JiShe.CollectBus.Common.Extensions; using System.Text;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Text;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
{ {
/// <summary> /// <summary>
/// 5.9.1.2 F1:终端版本信息 /// 5.9.1.2 F1:终端版本信息

6
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_09H/AFN9_F9_Analysis.cs
View File

@ -1,11 +1,11 @@
using JiShe.CollectBus.Common.Extensions; using System.Text;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Dto; using JiShe.CollectBus.Protocol.Dto;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Text;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_09H namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_09H
{ {
/// <summary> /// <summary>
/// 5.9.2.4.9 F9：远程通信模块版本信息(只读解析SIM卡号) /// 5.9.2.4.9 F9：远程通信模块版本信息(只读解析SIM卡号)

2
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F10_Analysis.cs
View File

@ -5,7 +5,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
{ {
/// <summary> /// <summary>
/// 5.10.1.3.1 F10：终端电能表/交流采样装置配置参数 /// 5.10.1.3.1 F10：终端电能表/交流采样装置配置参数

4
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F66_Analysis.cs
View File

@ -1,13 +1,11 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.Protocol.Contracts.Abstracts;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
{ {
/// <summary> /// <summary>
/// 5.5.1.3.53 F66：定时上报 2 类数据任务设置 /// 5.5.1.3.53 F66：定时上报 2 类数据任务设置

2
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0AH/AFN10_F68_Analysis.cs
View File

@ -3,7 +3,7 @@ using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0AH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0AH
{ {
/// <summary> /// <summary>
/// 5.5.1.3.55 F68：定时上报 2 类数据任务启动/停止设置 /// 5.5.1.3.55 F68：定时上报 2 类数据任务启动/停止设置

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F129_Analysis.cs
View File

@ -4,15 +4,14 @@ using JiShe.CollectBus.IoTDB.Interface;
using JiShe.CollectBus.IoTDB.Options; using JiShe.CollectBus.IoTDB.Options;
using JiShe.CollectBus.IoTDB.Provider; using JiShe.CollectBus.IoTDB.Provider;
using JiShe.CollectBus.IotSystems.MeterReadingRecords; using JiShe.CollectBus.IotSystems.MeterReadingRecords;
using JiShe.CollectBus.Protocol.AnalysisData.Appendix;
using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.85 F129：当前正向有功电能示值（总、费率1～M） /// 5.12.2.4.85 F129：当前正向有功电能示值（总、费率1～M）

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F130_Analysis.cs
View File

@ -1,12 +1,11 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Contracts;
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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.86 F130：当前正向无功（组合无功 1）电能示值（总、费率 1～M） /// 5.12.2.4.86 F130：当前正向无功（组合无功 1）电能示值（总、费率 1～M）

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F131_Analysis.cs
View File

@ -1,12 +1,11 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Contracts;
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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.87 F131：当前反向有功电能示值（总、费率 1～M） /// 5.12.2.4.87 F131：当前反向有功电能示值（总、费率 1～M）

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F132_Analysis.cs
View File

@ -1,12 +1,11 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Contracts;
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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.88 F132：当前反向无功（组合无功 2）电能示值（总、费率 1～M） /// 5.12.2.4.88 F132：当前反向无功（组合无功 2）电能示值（总、费率 1～M）

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F145_Analysis.cs
View File

@ -1,13 +1,12 @@
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.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.101 F145：当月正向有功最大需量及发生时间（总、费率 1～M） /// 5.12.2.4.101 F145：当月正向有功最大需量及发生时间（总、费率 1～M）

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F149_Analysis.cs
View File

@ -1,13 +1,12 @@
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.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.105 F149：上月（上一结算日）正向有功最大需量及发生时间（总、费率 1～M） /// 5.12.2.4.105 F149：上月（上一结算日）正向有功最大需量及发生时间（总、费率 1～M）

3
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F188_Analysis.cs
View File

@ -1,12 +1,11 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 水表抄读取 /// 水表抄读取

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F25_Analysis.cs
View File

@ -1,13 +1,12 @@
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.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.22 F25：当前三相及总有/无功功率、功率因数，三相电压、电流、零序电流、视在功率 /// 5.12.2.4.22 F25：当前三相及总有/无功功率、功率因数，三相电压、电流、零序电流、视在功率

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F2_Analysis.cs
View File

@ -1,13 +1,12 @@
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.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.1 F2：终端日历时钟 /// 5.12.2.4.1 F2：终端日历时钟

7
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F33_Analysis.cs
View File

@ -1,12 +1,11 @@
using JiShe.CollectBus.Protocol.AnalysisData.Appendix; using JiShe.CollectBus.Protocol.Contracts.Protocol.Dto;
using JiShe.CollectBus.Protocol.Contracts;
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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.30 F33：当前正向有/无功电能示值、一/四象限无功电能示值（总、费率 1～M，1≤M≤12） /// 5.12.2.4.30 F33：当前正向有/无功电能示值、一/四象限无功电能示值（总、费率 1～M，1≤M≤12）

5
protocols/JiShe.CollectBus.Protocol.T37612012/AnalysisData/AFN_0CH/AFN12_F49_Analysis.cs
View File

@ -1,13 +1,12 @@
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.Protocol.Dto; 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.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.T37612012.Appendix;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.AFN_0CH namespace JiShe.CollectBus.Protocol.T37612012.AnalysisData.AFN_0CH
{ {
/// <summary> /// <summary>
/// 5.12.2.4.46 F49：当前电压、电流相位角 /// 5.12.2.4.46 F49：当前电压、电流相位角

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_02800002.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 2 日时段表数据 /// 第一套第 2 日时段表数据

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000201.cs
View File

@ -2,7 +2,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 年时区数 p≤14 /// 年时区数 p≤14

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000202.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 日时段表数 q≤8 /// 日时段表数 q≤8

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000203.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 日时段数(每日切换数) m≤14 /// 日时段数(每日切换数) m≤14

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04000204.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 费率数 k≤63 /// 费率数 k≤63

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010000.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套时区表数据 /// 第一套时区表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010001.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 1 日时段表数据： /// 第一套第 1 日时段表数据：

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010002.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 2 日时段表数据 /// 第一套第 2 日时段表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010003.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 3 日时段表数据 /// 第一套第 3 日时段表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010004.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 4 日时段表数据 /// 第一套第 4 日时段表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010005.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 5 日时段表数据 /// 第一套第 5 日时段表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010006.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 6 日时段表数据 /// 第一套第 6 日时段表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010007.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 7 日时段表数据 /// 第一套第 7 日时段表数据

5
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_04010008.cs
View File

@ -1,8 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 第一套第 8 日时段表数据 /// 第一套第 8 日时段表数据

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A1.cs
View File

@ -2,7 +2,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A1 : IAnalysisStrategy<List<string>, string> public class Appendix_A1 : IAnalysisStrategy<List<string>, string>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A11.cs
View File

@ -2,7 +2,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 附录A.11数据格式 /// 附录A.11数据格式

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A13.cs
View File

@ -2,7 +2,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 附录A.13数据格式 /// 附录A.13数据格式

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A14.cs
View File

@ -2,7 +2,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
/// <summary> /// <summary>
/// 附录A.14数据格式 /// 附录A.14数据格式

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A15.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A15 : IAnalysisStrategy<List<string>, string> public class Appendix_A15 : IAnalysisStrategy<List<string>, string>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A17.cs
View File

@ -1,6 +1,6 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A17 : IAnalysisStrategy<List<string>, string> public class Appendix_A17 : IAnalysisStrategy<List<string>, string>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A23.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A23 : IAnalysisStrategy<List<string>, decimal> public class Appendix_A23 : IAnalysisStrategy<List<string>, decimal>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A25.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A25 : IAnalysisStrategy<List<string>, decimal> public class Appendix_A25 : IAnalysisStrategy<List<string>, decimal>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A5.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A5 : IAnalysisStrategy<List<string>, decimal> public class Appendix_A5 : IAnalysisStrategy<List<string>, decimal>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A7.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A7 : IAnalysisStrategy<List<string>, decimal> public class Appendix_A7 : IAnalysisStrategy<List<string>, decimal>
{ {

2
protocols/JiShe.CollectBus.Protocol.T37612012/Appendix/Appendix_A9.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
namespace JiShe.CollectBus.Protocol.AnalysisData.Appendix namespace JiShe.CollectBus.Protocol.T37612012.Appendix
{ {
public class Appendix_A9 : IAnalysisStrategy<List<string>, decimal> public class Appendix_A9 : IAnalysisStrategy<List<string>, decimal>
{ {

6
protocols/JiShe.CollectBus.Protocol.T37612012/CollectBusProtocolT37612012Module.cs
View File

@ -1,11 +1,11 @@
using JiShe.CollectBus.Protocol.Interfaces; using System.Reflection;
using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Reflection;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace JiShe.CollectBus.Protocol.Contracts namespace JiShe.CollectBus.Protocol.T37612012
{ {
public class CollectBusProtocolT37612012Module : AbpModule public class CollectBusProtocolT37612012Module : AbpModule
{ {

11
protocols/JiShe.CollectBus.Protocol.T37612012/Protocol3761Extensions.cs
View File

@ -1,12 +1,7 @@
using JiShe.CollectBus.Common.Extensions; using System.Text.RegularExpressions;
using System; using JiShe.CollectBus.Common.Extensions;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol.T37612012
{ {
public static class Protocol3761Extensions public static class Protocol3761Extensions
{ {

6
protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketBuilder.cs
View File

@ -1,9 +1,9 @@
using JiShe.CollectBus.Common.BuildSendDatas; using System.Reflection;
using JiShe.CollectBus.Common.BuildSendDatas;
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.Common.Models;
using System.Reflection;
namespace JiShe.CollectBus.Protocol.Contracts.SendData namespace JiShe.CollectBus.Protocol.T37612012.SendData
{ {
/// <summary> /// <summary>
/// 构建3761下发报文 /// 构建3761下发报文

2
protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketRequest.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.Contracts.SendData namespace JiShe.CollectBus.Protocol.T37612012.SendData
{ {
/// <summary> /// <summary>
/// 构建3761报文参数 /// 构建3761报文参数

2
protocols/JiShe.CollectBus.Protocol.T37612012/SendData/Telemetry3761PacketResponse.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.Contracts.SendData namespace JiShe.CollectBus.Protocol.T37612012.SendData
{ {
/// <summary> /// <summary>
/// 返回3761报文结果 /// 返回3761报文结果

7
protocols/JiShe.CollectBus.Protocol.T37612012/T37612012ProtocolPlugin.cs
View File

@ -9,8 +9,9 @@ using JiShe.CollectBus.IotSystems.Devices;
using JiShe.CollectBus.IotSystems.MessageReceiveds; using JiShe.CollectBus.IotSystems.MessageReceiveds;
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Kafka.Producer;
using JiShe.CollectBus.Protocol.Contracts.Abstracts; using JiShe.CollectBus.Protocol.Abstracts;
using JiShe.CollectBus.Protocol.Contracts.SendData; using JiShe.CollectBus.Protocol.Models;
using JiShe.CollectBus.Protocol.T37612012.SendData;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol3761;
using Mapster; using Mapster;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
@ -18,7 +19,7 @@ using Microsoft.Extensions.Logging;
using TouchSocket.Sockets; using TouchSocket.Sockets;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol.T37612012
{ {
public class T37612012ProtocolPlugin : ProtocolPlugin public class T37612012ProtocolPlugin : ProtocolPlugin
{ {

3
protocols/JiShe.CollectBus.Protocol.T6452007/JiSheCollectBusProtocolT6452007Module.cs
View File

@ -1,10 +1,9 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using System.Reflection;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.Modularity; using Volo.Abp.Modularity;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol.T6452007
{ {
public class JiSheCollectBusProtocolT6452007Module : AbpModule public class JiSheCollectBusProtocolT6452007Module : AbpModule
{ {

7
protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketBuilder.cs
View File

@ -1,11 +1,8 @@
using FreeSql; using System.Reflection;
using JiShe.CollectBus.Common.BuildSendDatas; using JiShe.CollectBus.Common.BuildSendDatas;
using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Models;
using System.Reflection;
namespace JiShe.CollectBus.Protocol.SendData namespace JiShe.CollectBus.Protocol.T6452007.SendData
{ {
/// <summary> /// <summary>
/// 构建645-2007下发报文 /// 构建645-2007下发报文

2
protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketRequest.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.SendData namespace JiShe.CollectBus.Protocol.T6452007.SendData
{ {
/// <summary> /// <summary>
/// 构建645报文参数 /// 构建645报文参数

2
protocols/JiShe.CollectBus.Protocol.T6452007/SendData/Telemetry6452007PacketResponse.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.SendData namespace JiShe.CollectBus.Protocol.T6452007.SendData
{ {
/// <summary> /// <summary>
/// 返回645报文结果 /// 返回645报文结果

13
protocols/JiShe.CollectBus.Protocol.T6452007/T6452007ProtocolPlugin.cs
View File

@ -1,19 +1,16 @@
using JiShe.CollectBus.Common.Enums; using JiShe.CollectBus.Common.Enums;
using JiShe.CollectBus.Common.Extensions; using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.IotSystems.Devices;
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Protocol.Models;
using JiShe.CollectBus.Protocol.Contracts.Abstracts; using JiShe.CollectBus.Protocol.T37612012;
using JiShe.CollectBus.Protocol.Contracts.SendData; using JiShe.CollectBus.Protocol.T37612012.SendData;
using JiShe.CollectBus.Protocol.SendData; using JiShe.CollectBus.Protocol.T6452007.SendData;
using Mapster; using Mapster;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TouchSocket.Sockets; using TouchSocket.Sockets;
using Volo.Abp.Domain.Repositories;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol.T6452007
{ {
/// <summary> /// <summary>
/// T6452007协议插件 /// T6452007协议插件

3
protocols/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs
View File

@ -1,5 +1,6 @@
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Protocol.Contracts.SendData; using JiShe.CollectBus.Protocol.Models;
using JiShe.CollectBus.Protocol.T37612012;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TouchSocket.Sockets; using TouchSocket.Sockets;

6
protocols/JiShe.CollectBus.Protocol/Abstracts/ProtocolPlugin.cs
View File

@ -1,16 +1,14 @@
using JiShe.CollectBus.Common.Consts; using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.Common.Extensions;
using JiShe.CollectBus.FreeRedis; using JiShe.CollectBus.FreeRedis;
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Protocol.Contracts.SendData;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using JiShe.CollectBus.Protocol3761; using JiShe.CollectBus.Protocol.Models;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using TouchSocket.Sockets; using TouchSocket.Sockets;
using Volo.Abp.Domain.Repositories; using Volo.Abp.Domain.Repositories;
namespace JiShe.CollectBus.Protocol.Contracts.Abstracts namespace JiShe.CollectBus.Protocol.Abstracts
{ {
public abstract class ProtocolPlugin : IProtocolPlugin public abstract class ProtocolPlugin : IProtocolPlugin
{ {

9
protocols/JiShe.CollectBus.Protocol/Adapters/StandardFixedHeaderDataHandlingAdapter.cs
View File

@ -1,12 +1,7 @@
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TouchSocket.Core; using TouchSocket.Core;
namespace JiShe.CollectBus.Protocol.Contracts.Adapters namespace JiShe.CollectBus.Protocol.Adapters
{ {
public class StandardFixedHeaderDataHandlingAdapter : CustomFixedHeaderDataHandlingAdapter<CustomFixedHeaderRequestInfo> public class StandardFixedHeaderDataHandlingAdapter : CustomFixedHeaderDataHandlingAdapter<CustomFixedHeaderRequestInfo>
{ {

9
protocols/JiShe.CollectBus.Protocol/AnalysisData/Appendix.cs
View File

@ -1,11 +1,6 @@
using System; using JiShe.CollectBus.Common.Extensions;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using JiShe.CollectBus.Common.Extensions;
namespace JiShe.CollectBus.Protocol.Contracts.AnalysisData namespace JiShe.CollectBus.Protocol.AnalysisData
{ {
/// <summary> /// <summary>
/// 附录 /// 附录

2
protocols/JiShe.CollectBus.Protocol/AnalysisStrategyContext.cs
View File

@ -1,7 +1,7 @@
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
namespace JiShe.CollectBus.Protocol.Contracts namespace JiShe.CollectBus.Protocol
{ {
public class AnalysisStrategyContext(IServiceProvider provider) public class AnalysisStrategyContext(IServiceProvider provider)

4
protocols/JiShe.CollectBus.Protocol/Attributes/ProtocolNameAttribute.cs
View File

@ -1,6 +1,4 @@
using System; namespace JiShe.CollectBus.Protocol.Attributes
namespace JiShe.CollectBus.Protocol.Contracts.Attributes
{ {
[AttributeUsage(AttributeTargets.Class)] [AttributeUsage(AttributeTargets.Class)]
public class ProtocolNameAttribute(string name) : Attribute public class ProtocolNameAttribute(string name) : Attribute

7
protocols/JiShe.CollectBus.Protocol/CollectBusProtocolModule.cs
View File

@ -1,9 +1,6 @@
using JiShe.CollectBus.FreeRedis.Options; using Volo.Abp.Modularity;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Modularity;
namespace JiShe.CollectBus.Protocol.Contracts namespace JiShe.CollectBus.Protocol
{ {
public class CollectBusProtocolModule : AbpModule public class CollectBusProtocolModule : AbpModule
{ {

3
protocols/JiShe.CollectBus.Protocol/Interfaces/IProtocolPlugin.cs
View File

@ -3,8 +3,7 @@ using System.Threading.Tasks;
using JiShe.CollectBus.Common.Models; using JiShe.CollectBus.Common.Models;
using JiShe.CollectBus.IotSystems.MessageReceiveds; using JiShe.CollectBus.IotSystems.MessageReceiveds;
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Models;
using JiShe.CollectBus.Protocol.Contracts.SendData;
using TouchSocket.Sockets; using TouchSocket.Sockets;
namespace JiShe.CollectBus.Protocol.Interfaces namespace JiShe.CollectBus.Protocol.Interfaces

9
protocols/JiShe.CollectBus.Protocol/Models/CustomFixedHeaderRequestInfo.cs
View File

@ -1,11 +1,6 @@
using System; using TouchSocket.Core;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using TouchSocket.Core;
namespace JiShe.CollectBus.Protocol.Contracts.Models namespace JiShe.CollectBus.Protocol.Models
{ {
public class CustomFixedHeaderRequestInfo : IFixedHeaderRequestInfo public class CustomFixedHeaderRequestInfo : IFixedHeaderRequestInfo
{ {

4
protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildRequest.cs
View File

@ -1,6 +1,4 @@
using JiShe.CollectBus.Protocol.Contracts.Models; namespace JiShe.CollectBus.Protocol.Models
namespace JiShe.CollectBus.Protocol.Contracts.SendData
{ {
/// <summary> /// <summary>
/// 报文构建参数 /// 报文构建参数

2
protocols/JiShe.CollectBus.Protocol/Models/ProtocolBuildResponse.cs
View File

@ -1,4 +1,4 @@
namespace JiShe.CollectBus.Protocol.Contracts.SendData namespace JiShe.CollectBus.Protocol.Models
{ {
/// <summary> /// <summary>
/// 报文构建返回结果 /// 报文构建返回结果

8
protocols/JiShe.CollectBus.Protocol/Models/SubProtocolBuildRequest.cs
View File

@ -1,10 +1,4 @@
using System; namespace JiShe.CollectBus.Protocol.Models
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace JiShe.CollectBus.Protocol.Contracts.Models
{ {
/// <summary> /// <summary>
/// 子协议构建参数 /// 子协议构建参数

6
protocols/JiShe.CollectBus.Protocol/Services/ProtocolService.cs
View File

@ -1,14 +1,14 @@
using JiShe.CollectBus.Common.Consts; using System.Text.RegularExpressions;
using JiShe.CollectBus.Common.Consts;
using JiShe.CollectBus.FreeRedis; using JiShe.CollectBus.FreeRedis;
using JiShe.CollectBus.IotSystems.Protocols; using JiShe.CollectBus.IotSystems.Protocols;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System.Text.RegularExpressions;
using Volo.Abp; using Volo.Abp;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
namespace JiShe.CollectBus.Protocol.Contracts.Services namespace JiShe.CollectBus.Protocol.Services
{ {
public class ProtocolService : IProtocolService, ISingletonDependency public class ProtocolService : IProtocolService, ISingletonDependency
{ {

1
services/JiShe.CollectBus.Application/CollectBusApplicationModule.cs
View File

@ -9,6 +9,7 @@ using JiShe.CollectBus.Interceptors;
using JiShe.CollectBus.IoTDB; using JiShe.CollectBus.IoTDB;
using JiShe.CollectBus.Kafka; using JiShe.CollectBus.Kafka;
using JiShe.CollectBus.Mappers; using JiShe.CollectBus.Mappers;
using JiShe.CollectBus.Protocol;
using JiShe.CollectBus.Protocol.Contracts; using JiShe.CollectBus.Protocol.Contracts;
using JiShe.CollectBus.ScheduledMeterReading; using JiShe.CollectBus.ScheduledMeterReading;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;

3
services/JiShe.CollectBus.Application/ScheduledMeterReading/BasicScheduledMeterReadingService.cs
View File

@ -18,8 +18,6 @@ using JiShe.CollectBus.IotSystems.MeterReadingRecords;
using JiShe.CollectBus.IotSystems.Watermeter; using JiShe.CollectBus.IotSystems.Watermeter;
using JiShe.CollectBus.Kafka.Internal; using JiShe.CollectBus.Kafka.Internal;
using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Kafka.Producer;
using JiShe.CollectBus.Protocol.Contracts.Models;
using JiShe.CollectBus.Protocol.Contracts.SendData;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
@ -28,6 +26,7 @@ using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using JiShe.CollectBus.Protocol.Models;
namespace JiShe.CollectBus.ScheduledMeterReading namespace JiShe.CollectBus.ScheduledMeterReading
{ {

3
services/JiShe.CollectBus.Application/ScheduledMeterReading/EnergySystemScheduledMeterReadingService.cs
View File

@ -15,8 +15,6 @@ using JiShe.CollectBus.IotSystems.MeterReadingRecords;
using JiShe.CollectBus.IotSystems.Watermeter; using JiShe.CollectBus.IotSystems.Watermeter;
using JiShe.CollectBus.Kafka.Internal; using JiShe.CollectBus.Kafka.Internal;
using JiShe.CollectBus.Kafka.Producer; using JiShe.CollectBus.Kafka.Producer;
using JiShe.CollectBus.Protocol.Contracts.Models;
using JiShe.CollectBus.Protocol.Contracts.SendData;
using JiShe.CollectBus.Protocol.Interfaces; using JiShe.CollectBus.Protocol.Interfaces;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -25,6 +23,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using JiShe.CollectBus.Protocol.Models;
namespace JiShe.CollectBus.ScheduledMeterReading namespace JiShe.CollectBus.ScheduledMeterReading

1
services/JiShe.CollectBus.Application/Subscribers/SubscriberAnalysisAppService.cs
View File

@ -12,6 +12,7 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
using JiShe.CollectBus.Protocol;
using TouchSocket.Sockets; using TouchSocket.Sockets;
namespace JiShe.CollectBus.Subscribers namespace JiShe.CollectBus.Subscribers