暂存
This commit is contained in:
parent
b5f929910c
commit
2625d076d4
@ -35,6 +35,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Kafka", "s
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.IoTDBProvider", "src\JiShe.CollectBus.IoTDBProvider\JiShe.CollectBus.IoTDBProvider.csproj", "{A3F3C092-0A25-450B-BF6A-5983163CBEF5}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.IoTDBProvider", "src\JiShe.CollectBus.IoTDBProvider\JiShe.CollectBus.IoTDBProvider.csproj", "{A3F3C092-0A25-450B-BF6A-5983163CBEF5}"
|
||||||
EndProject
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiShe.CollectBus.Protocol.Test", "src\JiShe.CollectBus.Protocol.Test\JiShe.CollectBus.Protocol.Test.csproj", "{A377955E-7EA1-6F29-8CF7-774569E93925}"
|
||||||
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
Debug|Any CPU = Debug|Any CPU
|
Debug|Any CPU = Debug|Any CPU
|
||||||
@ -93,18 +95,18 @@ Global
|
|||||||
{C06C4082-638F-2996-5FED-7784475766C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{C06C4082-638F-2996-5FED-7784475766C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{C06C4082-638F-2996-5FED-7784475766C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{C06C4082-638F-2996-5FED-7784475766C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{C06C4082-638F-2996-5FED-7784475766C1}.Release|Any CPU.Build.0 = Release|Any CPU
|
{C06C4082-638F-2996-5FED-7784475766C1}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
{919F4CDB-5C82-4371-B209-403B408DA248}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{919F4CDB-5C82-4371-B209-403B408DA248}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{919F4CDB-5C82-4371-B209-403B408DA248}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{919F4CDB-5C82-4371-B209-403B408DA248}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
|
||||||
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
|
||||||
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
|
||||||
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Release|Any CPU.Build.0 = Release|Any CPU
|
|
||||||
{F0288175-F0EC-48BD-945F-CF1512850943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
{F0288175-F0EC-48BD-945F-CF1512850943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
{F0288175-F0EC-48BD-945F-CF1512850943}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
{F0288175-F0EC-48BD-945F-CF1512850943}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
{F0288175-F0EC-48BD-945F-CF1512850943}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
{F0288175-F0EC-48BD-945F-CF1512850943}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
{F0288175-F0EC-48BD-945F-CF1512850943}.Release|Any CPU.Build.0 = Release|Any CPU
|
{F0288175-F0EC-48BD-945F-CF1512850943}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{A3F3C092-0A25-450B-BF6A-5983163CBEF5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{A377955E-7EA1-6F29-8CF7-774569E93925}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{A377955E-7EA1-6F29-8CF7-774569E93925}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{A377955E-7EA1-6F29-8CF7-774569E93925}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{A377955E-7EA1-6F29-8CF7-774569E93925}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@ -123,9 +125,9 @@ Global
|
|||||||
{8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
{8BA01C3D-297D-42DF-BD63-EF07202A0A67} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
||||||
{FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
{FE0457D9-4038-4A17-8808-DCAD06CFC0A0} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
||||||
{C06C4082-638F-2996-5FED-7784475766C1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
{C06C4082-638F-2996-5FED-7784475766C1} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
||||||
{919F4CDB-5C82-4371-B209-403B408DA248} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
|
||||||
{A3F3C092-0A25-450B-BF6A-5983163CBEF5} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
|
||||||
{F0288175-F0EC-48BD-945F-CF1512850943} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
{F0288175-F0EC-48BD-945F-CF1512850943} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
||||||
|
{A3F3C092-0A25-450B-BF6A-5983163CBEF5} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
||||||
|
{A377955E-7EA1-6F29-8CF7-774569E93925} = {649A3FFA-182F-4E56-9717-E6A9A2BEC545}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}
|
SolutionGuid = {4324B3B4-B60B-4E3C-91D8-59576B4E26DD}
|
||||||
|
|||||||
@ -103,7 +103,7 @@ public class CollectBusApplicationModule : AbpModule
|
|||||||
|
|
||||||
//默认初始化表计信息
|
//默认初始化表计信息
|
||||||
dbContext.InitAmmeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult();
|
dbContext.InitAmmeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult();
|
||||||
dbContext.InitWatermeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult();
|
//dbContext.InitWatermeterCacheData().ConfigureAwait(false).GetAwaiter().GetResult();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,6 +14,8 @@ using Microsoft.Extensions.Options;
|
|||||||
using JiShe.CollectBus.IoTDBProvider.Context;
|
using JiShe.CollectBus.IoTDBProvider.Context;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using JiShe.CollectBus.Common.Helpers;
|
using JiShe.CollectBus.Common.Helpers;
|
||||||
|
using JiShe.CollectBus.Protocol.Contracts.Interfaces;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
|
||||||
namespace JiShe.CollectBus.Samples;
|
namespace JiShe.CollectBus.Samples;
|
||||||
|
|
||||||
@ -136,4 +138,11 @@ public class SampleAppService : CollectBusAppService, ISampleAppService
|
|||||||
var ammeterList = await SqlProvider.Instance.Change(DbEnum.PrepayDB).Select<Vi_BaseAmmeterInfo>().Where(d => d.TB_CustomerID == 5).Take(10).ToListAsync();
|
var ammeterList = await SqlProvider.Instance.Change(DbEnum.PrepayDB).Select<Vi_BaseAmmeterInfo>().Where(d => d.TB_CustomerID == 5).Take(10).ToListAsync();
|
||||||
return ammeterList;
|
return ammeterList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[AllowAnonymous]
|
||||||
|
public bool GetTestProtocol()
|
||||||
|
{
|
||||||
|
var aa = LazyServiceProvider.GetKeyedService<IProtocolPlugin>("TestProtocolPlugin");
|
||||||
|
return aa == null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,5 @@
|
|||||||
using Volo.Abp.Modularity.PlugIns;
|
using TouchSocket.Core;
|
||||||
|
using Volo.Abp.Modularity.PlugIns;
|
||||||
|
|
||||||
namespace JiShe.CollectBus.Host
|
namespace JiShe.CollectBus.Host
|
||||||
{
|
{
|
||||||
@ -40,6 +41,8 @@ namespace JiShe.CollectBus.Host
|
|||||||
{
|
{
|
||||||
app.InitializeApplication();
|
app.InitializeApplication();
|
||||||
//await app.InitializeApplicationAsync();
|
//await app.InitializeApplicationAsync();
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -0,0 +1,28 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<BaseOutputPath></BaseOutputPath>
|
||||||
|
<LangVersion>preview</LangVersion>
|
||||||
|
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="DotNetCore.CAP" Version="8.3.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
|
||||||
|
<PackageReference Include="Volo.Abp.Core" Version="8.3.3" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\JiShe.CollectBus.Common\JiShe.CollectBus.Common.csproj" />
|
||||||
|
<ProjectReference Include="..\JiShe.CollectBus.Domain\JiShe.CollectBus.Domain.csproj" />
|
||||||
|
<ProjectReference Include="..\JiShe.CollectBus.Protocol.Contracts\JiShe.CollectBus.Protocol.Contracts.csproj" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
|
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
|
||||||
|
<Exec Command="copy $(TargetDir)JiShe.CollectBus.Protocol.Test.dll $(ProjectDir)..\JiShe.CollectBus.Host\Plugins\" />
|
||||||
|
</Target>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@ -0,0 +1,21 @@
|
|||||||
|
using JiShe.CollectBus.Protocol.Contracts.Interfaces;
|
||||||
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Volo.Abp;
|
||||||
|
using Volo.Abp.Modularity;
|
||||||
|
|
||||||
|
namespace JiShe.CollectBus.Protocol.Test
|
||||||
|
{
|
||||||
|
public class JiSheCollectBusProtocolModule : AbpModule
|
||||||
|
{
|
||||||
|
public override void ConfigureServices(ServiceConfigurationContext context)
|
||||||
|
{
|
||||||
|
context.Services.AddKeyedSingleton<IProtocolPlugin, TestProtocolPlugin>(nameof(TestProtocolPlugin));
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void OnApplicationInitialization(ApplicationInitializationContext context)
|
||||||
|
{
|
||||||
|
var protocol = context.ServiceProvider.GetRequiredKeyedService<IProtocolPlugin>(nameof(TestProtocolPlugin));
|
||||||
|
protocol.AddAsync();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
155
src/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs
Normal file
155
src/JiShe.CollectBus.Protocol.Test/TestProtocolPlugin.cs
Normal file
@ -0,0 +1,155 @@
|
|||||||
|
using JiShe.CollectBus.Common.Enums;
|
||||||
|
using JiShe.CollectBus.Common.Extensions;
|
||||||
|
using JiShe.CollectBus.Common.Models;
|
||||||
|
using JiShe.CollectBus.IotSystems.MessageReceiveds;
|
||||||
|
using JiShe.CollectBus.IotSystems.Protocols;
|
||||||
|
using JiShe.CollectBus.Protocol.Contracts.Abstracts;
|
||||||
|
|
||||||
|
namespace JiShe.CollectBus.Protocol.Test
|
||||||
|
{
|
||||||
|
public class TestProtocolPlugin : BaseProtocolPlugin
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="TestProtocolPlugin"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="serviceProvider">The service provider.</param>
|
||||||
|
public TestProtocolPlugin(IServiceProvider serviceProvider) : base(serviceProvider)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public sealed override ProtocolInfo Info => new(nameof(TestProtocolPlugin), "Test", "TCP", "Test协议", "DTS1980-Test");
|
||||||
|
|
||||||
|
public override async Task<T> AnalyzeAsync<T>(MessageReceived messageReceived, Action<byte[]>? sendAction = null)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
#region 上行命令
|
||||||
|
|
||||||
|
//68
|
||||||
|
//32 00
|
||||||
|
//32 00
|
||||||
|
//68
|
||||||
|
//C9 1100'1001. 控制域C。
|
||||||
|
// D7=1, （终端发送）上行方向。
|
||||||
|
// D6=1, 此帧来自启动站。
|
||||||
|
// D5=0, (上行方向)要求访问位。表示终端无事件数据等待访问。
|
||||||
|
// D4=0, 保留
|
||||||
|
// D3~D0=9, 功能码。链路测试
|
||||||
|
|
||||||
|
//20 32 行政区划码
|
||||||
|
//90 26 终端地址
|
||||||
|
//00 主站地址和组地址标志。终端为单地址。 //3220 09 87 2
|
||||||
|
// 终端启动的发送帧的 MSA 应为 0, 其主站响应帧的 MSA 也应为 0.
|
||||||
|
//02 应用层功能码。AFN=2, 链路接口检测
|
||||||
|
//70 0111'0000. 帧序列域。无时间标签、单帧、需要确认。
|
||||||
|
//00 00 信息点。DA1和DA2全为“0”时，表示终端信息点。
|
||||||
|
//01 00 信息类。F1, 登录。
|
||||||
|
//44 帧尾，包含用户区数据校验和
|
||||||
|
//16 帧结束标志
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析上行命令
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="cmd"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
public CommandReulst? AnalysisCmd(string cmd)
|
||||||
|
{
|
||||||
|
CommandReulst? commandReulst = null;
|
||||||
|
var hexStringList = cmd.StringToPairs();
|
||||||
|
|
||||||
|
if (hexStringList.Count < hearderLen)
|
||||||
|
{
|
||||||
|
return commandReulst;
|
||||||
|
}
|
||||||
|
//验证起始字符
|
||||||
|
if (!hexStringList[0].IsStartStr() || !hexStringList[5].IsStartStr())
|
||||||
|
{
|
||||||
|
return commandReulst;
|
||||||
|
}
|
||||||
|
|
||||||
|
var lenHexStr = $"{hexStringList[2]}{hexStringList[1]}";
|
||||||
|
var lenBin = lenHexStr.HexToBin();
|
||||||
|
var len = lenBin.Remove(lenBin.Length - 2).BinToDec();
|
||||||
|
//验证长度
|
||||||
|
if (hexStringList.Count - 2 != hearderLen + len)
|
||||||
|
return commandReulst;
|
||||||
|
|
||||||
|
var userDataIndex = hearderLen;
|
||||||
|
var c = hexStringList[userDataIndex];//控制域 1字节
|
||||||
|
userDataIndex += 1;
|
||||||
|
|
||||||
|
var aHexList = hexStringList.Skip(userDataIndex).Take(5).ToList();//地址域 5字节
|
||||||
|
var a = AnalysisA(aHexList);
|
||||||
|
var a3Bin = aHexList[4].HexToBin().PadLeft(8, '0');
|
||||||
|
var mSA = a3Bin.Substring(0, 7).BinToDec();
|
||||||
|
userDataIndex += 5;
|
||||||
|
|
||||||
|
var aFN = (AFN)hexStringList[userDataIndex].HexToDec();//1字节
|
||||||
|
userDataIndex += 1;
|
||||||
|
|
||||||
|
var seq = hexStringList[userDataIndex].HexToBin().PadLeft(8, '0');
|
||||||
|
var tpV = (TpV)Convert.ToInt32(seq.Substring(0, 1));
|
||||||
|
var fIRFIN = (FIRFIN)Convert.ToInt32(seq.Substring(1, 2));
|
||||||
|
var cON = (CON)Convert.ToInt32(seq.Substring(3, 1));
|
||||||
|
var prseqBin = seq.Substring(4, 4);
|
||||||
|
userDataIndex += 1;
|
||||||
|
|
||||||
|
// (DA2 - 1) * 8 + DA1 = pn
|
||||||
|
var da1Bin = hexStringList[userDataIndex].HexToBin();
|
||||||
|
var da1 = da1Bin == "0" ? 0 : da1Bin.Length;
|
||||||
|
userDataIndex += 1;
|
||||||
|
var da2 = hexStringList[userDataIndex].HexToDec();
|
||||||
|
var pn = da2 == 0 ? 0 : (da2 - 1) * 8 + da1;
|
||||||
|
userDataIndex += 1;
|
||||||
|
//(DT2*8)+DT1=fn
|
||||||
|
var dt1Bin = hexStringList[userDataIndex].HexToBin();
|
||||||
|
var dt1 = dt1Bin != "0" ? dt1Bin.Length : 0;
|
||||||
|
userDataIndex += 1;
|
||||||
|
var dt2 = hexStringList[userDataIndex].HexToDec();
|
||||||
|
var fn = dt2 * 8 + dt1;
|
||||||
|
userDataIndex += 1;
|
||||||
|
|
||||||
|
//数据单元
|
||||||
|
var datas = hexStringList.Skip(userDataIndex).Take(len + hearderLen - userDataIndex).ToList();
|
||||||
|
|
||||||
|
//EC
|
||||||
|
//Tp
|
||||||
|
commandReulst = new CommandReulst()
|
||||||
|
{
|
||||||
|
A = a,
|
||||||
|
MSA = mSA,
|
||||||
|
AFN = aFN,
|
||||||
|
Seq = new Seq()
|
||||||
|
{
|
||||||
|
TpV = tpV,
|
||||||
|
FIRFIN = fIRFIN,
|
||||||
|
CON = cON,
|
||||||
|
PRSEQ = prseqBin.BinToDec(),
|
||||||
|
},
|
||||||
|
CmdLength = len,
|
||||||
|
Pn = pn,
|
||||||
|
Fn = fn,
|
||||||
|
HexDatas = datas
|
||||||
|
};
|
||||||
|
|
||||||
|
return commandReulst;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 解析地址
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="aHexList"></param>
|
||||||
|
/// <returns></returns>
|
||||||
|
private string AnalysisA(List<string> aHexList)
|
||||||
|
{
|
||||||
|
var a1 = aHexList[1] + aHexList[0];
|
||||||
|
var a2 = aHexList[3] + aHexList[2];
|
||||||
|
var a2Dec = a2.HexToDec();
|
||||||
|
var a3 = aHexList[4];
|
||||||
|
var a = $"{a1}{a2Dec.ToString().PadLeft(5, '0')}";
|
||||||
|
return a;
|
||||||
|
}
|
||||||
|
#endregion
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user