luosheng/Modbus.Net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some Fix

Browse Source
This commit is contained in:
luosheng
2023-02-13 12:49:10 +08:00
parent eb794b85c1
commit 06847a2426
53 changed files with 706 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Samples/Modbus.Net.Modbus.Test/DatabaseWrite.cs Normal file
View File

@@ -0,0 +1,36 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using System.ComponentModel.DataAnnotations;
namespace Modbus.Net.Modbus.Test
{
public class DatabaseWriteContext : DbContext
{
static readonly string connectionString = new ConfigurationBuilder().AddJsonFile($"appsettings.json").Build().GetConnectionString("DatabaseWriteConnectionString")!;
public DbSet<DatabaseWriteEntity> DatabaseWrites { get; set; }
protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
{
optionsBuilder.UseMySql(connectionString, ServerVersion.AutoDetect(connectionString));
}
}
public class DatabaseWriteEntity
{
[Key]
public int Id { get; set; }
public double? Value1 { get; set; }
public double? Value2 { get; set; }
public double? Value3 { get; set; }
public double? Value4 { get; set; }
public double? Value5 { get; set; }
public double? Value6 { get; set; }
public double? Value7 { get; set; }
public double? Value8 { get; set; }
public double? Value9 { get; set; }
public double? Value10 { get; set; }
public DateTime UpdateTime { get; set; }
}
}

71
Samples/Modbus.Net.Modbus.Test/Migrations/20230212103438_InitialCreate.Designer.cs generated Normal file
View File

@@ -0,0 +1,71 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Modbus.Net.Modbus.Test;
#nullable disable
namespace Modbus.Net.Modbus.Test.Migrations
{
[DbContext(typeof(DatabaseWriteContext))]
[Migration("20230212103438_InitialCreate")]
partial class InitialCreate
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Modbus.Net.Modbus.Test.DatabaseWriteEntity", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("UpdateTime")
.HasColumnType("datetime(6)");
b.Property<double?>("Value1")
.HasColumnType("double");
b.Property<double?>("Value10")
.HasColumnType("double");
b.Property<double?>("Value2")
.HasColumnType("double");
b.Property<double?>("Value3")
.HasColumnType("double");
b.Property<double?>("Value4")
.HasColumnType("double");
b.Property<double?>("Value5")
.HasColumnType("double");
b.Property<double?>("Value6")
.HasColumnType("double");
b.Property<double?>("Value7")
.HasColumnType("double");
b.Property<double?>("Value8")
.HasColumnType("double");
b.Property<double?>("Value9")
.HasColumnType("double");
b.HasKey("Id");
b.ToTable("DatabaseWrites");
});
#pragma warning restore 612, 618
}
}
}

50
Samples/Modbus.Net.Modbus.Test/Migrations/20230212103438_InitialCreate.cs Normal file
View File

@@ -0,0 +1,50 @@
using System;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Modbus.Net.Modbus.Test.Migrations
{
/// <inheritdoc />
public partial class InitialCreate : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterDatabase()
.Annotation("MySql:CharSet", "utf8mb4");
migrationBuilder.CreateTable(
name: "DatabaseWrites",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySql:ValueGenerationStrategy", MySqlValueGenerationStrategy.IdentityColumn),
Value1 = table.Column<double>(type: "double", nullable: true),
Value2 = table.Column<double>(type: "double", nullable: true),
Value3 = table.Column<double>(type: "double", nullable: true),
Value4 = table.Column<double>(type: "double", nullable: true),
Value5 = table.Column<double>(type: "double", nullable: true),
Value6 = table.Column<double>(type: "double", nullable: true),
Value7 = table.Column<double>(type: "double", nullable: true),
Value8 = table.Column<double>(type: "double", nullable: true),
Value9 = table.Column<double>(type: "double", nullable: true),
Value10 = table.Column<double>(type: "double", nullable: true),
UpdateTime = table.Column<DateTime>(type: "datetime(6)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_DatabaseWrites", x => x.Id);
})
.Annotation("MySql:CharSet", "utf8mb4");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "DatabaseWrites");
}
}
}

68
Samples/Modbus.Net.Modbus.Test/Migrations/DatabaseWriteContextModelSnapshot.cs Normal file
View File

@@ -0,0 +1,68 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Modbus.Net.Modbus.Test;
#nullable disable
namespace Modbus.Net.Modbus.Test.Migrations
{
[DbContext(typeof(DatabaseWriteContext))]
partial class DatabaseWriteContextModelSnapshot : ModelSnapshot
{
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "7.0.2")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("Modbus.Net.Modbus.Test.DatabaseWriteEntity", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<DateTime>("UpdateTime")
.HasColumnType("datetime(6)");
b.Property<double?>("Value1")
.HasColumnType("double");
b.Property<double?>("Value10")
.HasColumnType("double");
b.Property<double?>("Value2")
.HasColumnType("double");
b.Property<double?>("Value3")
.HasColumnType("double");
b.Property<double?>("Value4")
.HasColumnType("double");
b.Property<double?>("Value5")
.HasColumnType("double");
b.Property<double?>("Value6")
.HasColumnType("double");
b.Property<double?>("Value7")
.HasColumnType("double");
b.Property<double?>("Value8")
.HasColumnType("double");
b.Property<double?>("Value9")
.HasColumnType("double");
b.HasKey("Id");
b.ToTable("DatabaseWrites");
});
#pragma warning restore 612, 618
}
}
}

18
Samples/Modbus.Net.Modbus.Test/Modbus.Net.Modbus.Test.csproj
View File

@@ -7,6 +7,24 @@
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<None Remove="appsettings.json" />
</ItemGroup>
<ItemGroup>
<Content Include="appsettings.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net.Modbus\Modbus.Net.Modbus.csproj" />
<ProjectReference Include="..\..\Modbus.Net\Modbus.Net\Modbus.Net.csproj" />

28
Samples/Modbus.Net.Modbus.Test/Program.cs
View File

@@ -1,8 +1,7 @@
// See https://aka.ms/new-console-template for more information
using Modbus.Net;
using Modbus.Net.Modbus;
using Modbus.Net.Interface;
using Modbus.Net.Job;
using Modbus.Net.Modbus.Test;
List<AddressUnit> _addresses = new List<AddressUnit>
{
@@ -20,7 +19,7 @@ List<AddressUnit> _addresses = new List<AddressUnit>
IMachine<string> machine = new ModbusMachine<string, string>("ModbusMachine1", ModbusType.Tcp, "192.168.0.172:502", _addresses, true, 1, 2, Endian.BigEndianLsb);
await MachineJobSchedulerCreator.CreateScheduler(-1, 5).Result.From(machine.Id, machine, MachineDataType.Name).Result.Query("ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.Run();
await MachineJobSchedulerCreator.CreateScheduler("Trigger1", -1, 5).Result.From(machine.Id, machine, MachineDataType.Name).Result.Query("ConsoleQuery", QueryConsole).Result.To(machine.Id + ".To", machine).Result.Run();
Console.ReadLine();
@@ -29,6 +28,29 @@ Dictionary<string, ReturnUnit> QueryConsole(Dictionary<string, ReturnUnit> value
foreach (var value in values)
{
Console.WriteLine(value.Key + " " + value.Value.DeviceValue);
}
using (var context = new DatabaseWriteContext())
{
context.DatabaseWrites.Add(new DatabaseWriteEntity
{
Value1 = values["Test1"].DeviceValue,
Value2 = values["Test2"].DeviceValue,
Value3 = values["Test3"].DeviceValue,
Value4 = values["Test4"].DeviceValue,
Value5 = values["Test5"].DeviceValue,
Value6 = values["Test6"].DeviceValue,
Value7 = values["Test7"].DeviceValue,
Value8 = values["Test8"].DeviceValue,
Value9 = values["Test9"].DeviceValue,
Value10 = values["Test10"].DeviceValue,
UpdateTime = DateTime.Now,
});
context.SaveChanges();
}
foreach (var value in values)
{
value.Value.DeviceValue = new Random().Next(65536) - 32768;
}

8
Samples/Modbus.Net.Modbus.Test/appsettings.json Normal file
View File

@@ -0,0 +1,8 @@
{
"ConnectionStrings": {
"DatabaseWriteConnectionString": "Server=localhost; User ID=root; Password=123456; Database=modbusnettest;"
},
"Config": {
"FetchSleepTime": "100"
}
}