Move entity schema
Move classes for work with DB in root dir. Fix problems with num cycles, after change to Enum
This commit is contained in:
		
							
								
								
									
										24
									
								
								DbCycleVDP/DbFurnace.cs
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										24
									
								
								DbCycleVDP/DbFurnace.cs
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,24 @@
 | 
				
			|||||||
 | 
					using System;
 | 
				
			||||||
 | 
					using Microsoft.EntityFrameworkCore;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace DbCycleVDP
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
					    public class DbFurnace : DbContext
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        public DbSet<TableCycle> Cycles { get; set; }
 | 
				
			||||||
 | 
					        public DbFurnace()
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					            Database.EnsureCreated();
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					//            optionsBuilder.UseMySql("server=127.0.0.1;user=diplom;password=diplom;database=VDPCycles;", new MySqlServerVersion(new Version(8, 0)));
 | 
				
			||||||
 | 
					            optionsBuilder.UseMySql("server=37.79.216.218;user=mytest;password=mytest;database=VDPCycles;", new MySqlServerVersion(new Version(8, 0)));
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        protected override void OnModelCreating(ModelBuilder modelBuilder)
 | 
				
			||||||
 | 
					        {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
@@ -2,10 +2,10 @@
 | 
				
			|||||||
using System.ComponentModel.DataAnnotations.Schema;
 | 
					using System.ComponentModel.DataAnnotations.Schema;
 | 
				
			||||||
using System.ComponentModel.DataAnnotations;
 | 
					using System.ComponentModel.DataAnnotations;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace GenCycleVDP.Db
 | 
					namespace DbCycleVDP
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    [Table("Cycles")]
 | 
					    [Table("Cycles")]
 | 
				
			||||||
    internal class DbCycle
 | 
					    public class TableCycle
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        [Column("idCycle"), Required, Key]
 | 
					        [Column("idCycle"), Required, Key]
 | 
				
			||||||
        public int IdCycle { get; set; }
 | 
					        public int IdCycle { get; set; }
 | 
				
			||||||
@@ -1,23 +0,0 @@
 | 
				
			|||||||
using System;
 | 
					 | 
				
			||||||
using Microsoft.EntityFrameworkCore;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace GenCycleVDP.Db
 | 
					 | 
				
			||||||
{
 | 
					 | 
				
			||||||
    internal class DbFurnace : DbContext
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
        public DbSet<DbCycle> Cycles { get; set; }
 | 
					 | 
				
			||||||
        public DbFurnace()
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            Database.EnsureCreated();
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
            optionsBuilder.UseMySql("server=127.0.0.1;user=diplom;password=diplom;database=VDPCycles;", new MySqlServerVersion(new Version(8, 0)));
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        protected override void OnModelCreating(ModelBuilder modelBuilder)
 | 
					 | 
				
			||||||
        {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
@@ -2,6 +2,7 @@
 | 
				
			|||||||
using System.Linq;
 | 
					using System.Linq;
 | 
				
			||||||
using System.Threading.Tasks;
 | 
					using System.Threading.Tasks;
 | 
				
			||||||
using GenCycleVDP.Resources;
 | 
					using GenCycleVDP.Resources;
 | 
				
			||||||
 | 
					using DbCycleVDP;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
namespace GenCycleVDP
 | 
					namespace GenCycleVDP
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
@@ -78,7 +79,7 @@ namespace GenCycleVDP
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                using var db = new Db.DbFurnace();
 | 
					                using var db = new DbFurnace();
 | 
				
			||||||
                var tmp = (from u in db.Cycles
 | 
					                var tmp = (from u in db.Cycles
 | 
				
			||||||
                           where
 | 
					                           where
 | 
				
			||||||
                              u.NumVdp == vdp
 | 
					                              u.NumVdp == vdp
 | 
				
			||||||
@@ -122,9 +123,8 @@ namespace GenCycleVDP
 | 
				
			|||||||
        {
 | 
					        {
 | 
				
			||||||
            try
 | 
					            try
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                using (var db = new Db.DbFurnace())
 | 
					                using var db = new DbFurnace();
 | 
				
			||||||
                {
 | 
					                var tmp = new TableCycle()
 | 
				
			||||||
                    var tmp = new Db.DbCycle()
 | 
					 | 
				
			||||||
                {
 | 
					                {
 | 
				
			||||||
                    NumVdp = vdp,
 | 
					                    NumVdp = vdp,
 | 
				
			||||||
                    NumCycle = (int)currCycle,
 | 
					                    NumCycle = (int)currCycle,
 | 
				
			||||||
@@ -135,7 +135,6 @@ namespace GenCycleVDP
 | 
				
			|||||||
                db.Cycles.Add(tmp);
 | 
					                db.Cycles.Add(tmp);
 | 
				
			||||||
                db.SaveChanges();
 | 
					                db.SaveChanges();
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            }
 | 
					 | 
				
			||||||
            catch (Exception e)
 | 
					            catch (Exception e)
 | 
				
			||||||
            {
 | 
					            {
 | 
				
			||||||
                Console.WriteLine(e.Message);
 | 
					                Console.WriteLine(e.Message);
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,6 +7,11 @@
 | 
				
			|||||||
    <Nullable>enable</Nullable>
 | 
					    <Nullable>enable</Nullable>
 | 
				
			||||||
  </PropertyGroup>
 | 
					  </PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  <ItemGroup>
 | 
				
			||||||
 | 
					    <Compile Include="..\DbCycleVDP\DbFurnace.cs" Link="Db/DbFurnace.cs" />
 | 
				
			||||||
 | 
						  <Compile Include="..\DbCycleVDP\TableCycle.cs" Link="Db/TableCycle.cs" />
 | 
				
			||||||
 | 
					  </ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  <ItemGroup>
 | 
					  <ItemGroup>
 | 
				
			||||||
    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
 | 
					    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
 | 
				
			||||||
  </ItemGroup>
 | 
					  </ItemGroup>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,7 +17,6 @@ namespace GenCycleVDP
 | 
				
			|||||||
                a.Start();
 | 
					                a.Start();
 | 
				
			||||||
                tasks.Add(a);
 | 
					                tasks.Add(a);
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            Task.Delay(1000 * 5).Wait();
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
            int count = 0;
 | 
					            int count = 0;
 | 
				
			||||||
            while (!isExiting)
 | 
					            while (!isExiting)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
namespace GenCycleVDP.Resources
 | 
					namespace GenCycleVDP.Resources
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
    public enum CycleStatus : ushort
 | 
					    public enum CycleStatus : int
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        EndTechCycle = 0,
 | 
					        EndTechCycle = 0,
 | 
				
			||||||
        LoadUnload = 1,
 | 
					        LoadUnload = 1,
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user