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:
Dai Mr 2024-10-12 23:42:15 +08:00
parent ff4b635de4
commit 4b9db3351f
7 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
JiShe.CollectBus.Console/JiShe.CollectBus.Console.csproj
View File

@ -37,4 +37,8 @@
</None> </None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Folder Include="Plugins\" />
</ItemGroup>
</Project> </Project>

2
JiShe.CollectBus.Core/Plugins/TcpServiceReceivedPlugin.cs
View File

@ -12,7 +12,7 @@ namespace JiShe.CollectBus.Core.Plugins
{ {
//TODO:电表： 376.1 645-07 modbus 水表： 118 645-97 //TODO:电表： 376.1 645-07 modbus 水表： 118 645-97
const string protocolType = "TestProtocol"; const string protocolType = "StandardProtocol";
switch (protocolType) switch (protocolType)
{ {
//case "376": //case "376":

3
JiShe.CollectBus.Protocol.Contracts/Abstracts/BaseProtocolPlugin.cs
View File

@ -2,6 +2,7 @@
using JiShe.CollectBus.Protocol.Contracts.Interfaces; using JiShe.CollectBus.Protocol.Contracts.Interfaces;
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Contracts.Models;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using TouchSocket.Sockets;
namespace JiShe.CollectBus.Protocol.Contracts.Abstracts namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
{ {
@ -16,7 +17,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Abstracts
public abstract ProtocolInfo Get(); public abstract ProtocolInfo Get();
public abstract void Received(); public abstract void Received(ReceivedDataEventArgs e);
public abstract void Send(); public abstract void Send();

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

@ -1,4 +1,5 @@
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Contracts.Models;
using TouchSocket.Sockets;
namespace JiShe.CollectBus.Protocol.Contracts.Interfaces namespace JiShe.CollectBus.Protocol.Contracts.Interfaces
{ {
@ -8,7 +9,7 @@ namespace JiShe.CollectBus.Protocol.Contracts.Interfaces
void Load(); void Load();
void Received(); void Received(ReceivedDataEventArgs e);
void Send(); void Send();
} }

1
JiShe.CollectBus.Protocol.Contracts/JiShe.CollectBus.Protocol.Contracts.csproj
View File

@ -7,6 +7,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
<PackageReference Include="TouchSocket" Version="2.1.5" />
</ItemGroup> </ItemGroup>
</Project> </Project>

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

@ -3,6 +3,7 @@ using JiShe.CollectBus.Protocol.Contracts.Attributes;
using JiShe.CollectBus.Protocol.Contracts.DependencyInjection; using JiShe.CollectBus.Protocol.Contracts.DependencyInjection;
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Contracts.Models;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using TouchSocket.Sockets;
namespace JiShe.CollectBus.Protocol.Test namespace JiShe.CollectBus.Protocol.Test
{ {
@ -14,7 +15,7 @@ namespace JiShe.CollectBus.Protocol.Test
return new ProtocolInfo("Test", "376.1", "TCP", "376.1协议", "DTSU1980"); return new ProtocolInfo("Test", "376.1", "TCP", "376.1协议", "DTSU1980");
} }
public override void Received() public override void Received(ReceivedDataEventArgs e)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }

3
JiShe.CollectBus.Protocol/StandardProtocolPlugin.cs
View File

@ -3,6 +3,7 @@ using JiShe.CollectBus.Protocol.Contracts.Attributes;
using JiShe.CollectBus.Protocol.Contracts.DependencyInjection; using JiShe.CollectBus.Protocol.Contracts.DependencyInjection;
using JiShe.CollectBus.Protocol.Contracts.Models; using JiShe.CollectBus.Protocol.Contracts.Models;
using Microsoft.Extensions.Caching.Distributed; using Microsoft.Extensions.Caching.Distributed;
using TouchSocket.Sockets;
namespace JiShe.CollectBus.Protocol namespace JiShe.CollectBus.Protocol
{ {
@ -19,7 +20,7 @@ namespace JiShe.CollectBus.Protocol
base.Load(); base.Load();
} }
public override void Received() public override void Received(ReceivedDataEventArgs e)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
} }