mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'ol' into dev

Browse Source
This commit is contained in:
Mikhail Trubnikov
2023-10-24 10:40:06 +10:00
parent 57a72cfd9f 2dcae0239b
commit 50e165bdc3
21 changed files with 5875 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PARR.DAL/Context/DataContext.cs
View File

@@ -46,6 +46,9 @@ namespace PARR.DAL.Context
public DbSet<AgentHistory> AgentHistories { get; set; }
public DbSet<AgentHistoryLevel> AgentHistoryLevels { get; set; }
public DbSet<Order> Orders { get; set; }
public DbSet<OrderStatus> OrderStatuses { get; set; }
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);
@@ -330,6 +333,17 @@ namespace PARR.DAL.Context
);
});
modelBuilder.Entity<OrderStatus>(f =>
{
f.HasData(
new { Code = (int)OrderStatusEnum.New, Name = OrderStatusEnum.New.ToString(), Description = "1-Направлен в группу" },
new { Code = (int)OrderStatusEnum.InWork, Name = OrderStatusEnum.InWork.ToString(), Description = "2-В работе" },
new { Code = (int)OrderStatusEnum.Stop, Name = OrderStatusEnum.Stop.ToString(), Description = "3-Приостановлен" },
new { Code = (int)OrderStatusEnum.Complete, Name = OrderStatusEnum.Complete.ToString(), Description = "4-Выполнен" },
new { Code = (int)OrderStatusEnum.Closed, Name = OrderStatusEnum.Closed.ToString(), Description = "5-Закрыт" }
);
});
}

30
PARR.DAL/Contracts/OrderStatusEnum.cs Normal file
View File

@@ -0,0 +1,30 @@
namespace PARR.DAL.Contracts
{
public enum OrderStatusEnum
{
/// <summary>
/// 1-Направлен в группу
/// </summary>
New = 1,
/// <summary>
/// 2-В работе
/// </summary>
InWork = 2,
/// <summary>
/// 3-Приостановлен
/// </summary>
Stop = 3,
/// <summary>
/// 4-Выполнен
/// </summary>
Complete = 4,
/// <summary>
/// 5-Закрыт
/// </summary>
Closed = 5
}
}

2625
PARR.DAL/Migrations/20231023052610_TblOrdersAndStatus.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

91
PARR.DAL/Migrations/20231023052610_TblOrdersAndStatus.cs Normal file
View File

@@ -0,0 +1,91 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
#nullable disable
#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class TblOrdersAndStatus : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "OrderStatuses",
columns: table => new
{
Code = table.Column<int>(type: "integer", nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
Name = table.Column<string>(type: "text", nullable: false),
Description = table.Column<string>(type: "text", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_OrderStatuses", x => x.Code);
});
migrationBuilder.CreateTable(
name: "Orders",
columns: table => new
{
Id = table.Column<Guid>(type: "uuid", nullable: false),
DateCreated = table.Column<DateTimeOffset>(type: "timestamp with time zone", nullable: false),
Number = table.Column<string>(type: "text", nullable: false),
WorkGroup = table.Column<string>(type: "text", nullable: true),
TemplateId = table.Column<Guid>(type: "uuid", nullable: true),
OrderStatusCode = table.Column<int>(type: "integer", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_Orders", x => x.Id);
table.ForeignKey(
name: "FK_Orders_OrderStatuses_OrderStatusCode",
column: x => x.OrderStatusCode,
principalTable: "OrderStatuses",
principalColumn: "Code",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_Orders_Templates_TemplateId",
column: x => x.TemplateId,
principalTable: "Templates",
principalColumn: "Id");
});
migrationBuilder.InsertData(
table: "OrderStatuses",
columns: new[] { "Code", "Description", "Name" },
values: new object[,]
{
{ 1, "1-Направлен в группу", "New" },
{ 2, "2-В работе", "InWork" },
{ 3, "3-Приостановлен", "Stop" },
{ 4, "4-Выполнен", "Complete" },
{ 5, "5-Закрыт", "Closed" }
});
migrationBuilder.CreateIndex(
name: "IX_Orders_OrderStatusCode",
table: "Orders",
column: "OrderStatusCode");
migrationBuilder.CreateIndex(
name: "IX_Orders_TemplateId",
table: "Orders",
column: "TemplateId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "Orders");
migrationBuilder.DropTable(
name: "OrderStatuses");
}
}
}

2648
PARR.DAL/Migrations/20231024002524_TblOrdersAndAgentHistory.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

70
PARR.DAL/Migrations/20231024002524_TblOrdersAndAgentHistory.cs Normal file
View File

@@ -0,0 +1,70 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace PARR.DAL.Migrations
{
/// <inheritdoc />
public partial class TblOrdersAndAgentHistory : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTimeOffset>(
name: "DateModified",
table: "Orders",
type: "timestamp with time zone",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "ShortName",
table: "Orders",
type: "text",
nullable: false,
defaultValue: "");
migrationBuilder.AddColumn<Guid>(
name: "OrderId",
table: "AgentHistories",
type: "uuid",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_AgentHistories_OrderId",
table: "AgentHistories",
column: "OrderId");
migrationBuilder.AddForeignKey(
name: "FK_AgentHistories_Orders_OrderId",
table: "AgentHistories",
column: "OrderId",
principalTable: "Orders",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_AgentHistories_Orders_OrderId",
table: "AgentHistories");
migrationBuilder.DropIndex(
name: "IX_AgentHistories_OrderId",
table: "AgentHistories");
migrationBuilder.DropColumn(
name: "DateModified",
table: "Orders");
migrationBuilder.DropColumn(
name: "ShortName",
table: "Orders");
migrationBuilder.DropColumn(
name: "OrderId",
table: "AgentHistories");
}
}
}

131
PARR.DAL/Migrations/DataContextModelSnapshot.cs
View File

@@ -384,6 +384,9 @@ namespace PARR.DAL.Migrations
b.Property<string>("Message")
.HasColumnType("text");
b.Property<Guid?>("OrderId")
.HasColumnType("uuid");
b.Property<Guid>("TemplateId")
.HasColumnType("uuid");
@@ -391,6 +394,8 @@ namespace PARR.DAL.Migrations
b.HasIndex("HistoryLevelId");
b.HasIndex("OrderId");
b.HasIndex("TemplateId");
b.ToTable("AgentHistories");
@@ -1547,6 +1552,97 @@ namespace PARR.DAL.Migrations
b.ToTable("Hosts");
});
modelBuilder.Entity("PARR.DAL.Models.Order", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uuid");
b.Property<DateTimeOffset>("DateCreated")
.HasColumnType("timestamp with time zone");
b.Property<DateTimeOffset?>("DateModified")
.HasColumnType("timestamp with time zone");
b.Property<string>("Number")
.IsRequired()
.HasColumnType("text");
b.Property<int>("OrderStatusCode")
.HasColumnType("integer");
b.Property<string>("ShortName")
.IsRequired()
.HasColumnType("text");
b.Property<Guid?>("TemplateId")
.HasColumnType("uuid");
b.Property<string>("WorkGroup")
.HasColumnType("text");
b.HasKey("Id");
b.HasIndex("OrderStatusCode");
b.HasIndex("TemplateId");
b.ToTable("Orders");
});
modelBuilder.Entity("PARR.DAL.Models.OrderStatus", b =>
{
b.Property<int>("Code")
.ValueGeneratedOnAdd()
.HasColumnType("integer");
NpgsqlPropertyBuilderExtensions.UseIdentityByDefaultColumn(b.Property<int>("Code"));
b.Property<string>("Description")
.IsRequired()
.HasColumnType("text");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("text");
b.HasKey("Code");
b.ToTable("OrderStatuses");
b.HasData(
new
{
Code = 1,
Description = "1-Направлен в группу",
Name = "New"
},
new
{
Code = 2,
Description = "2-В работе",
Name = "InWork"
},
new
{
Code = 3,
Description = "3-Приостановлен",
Name = "Stop"
},
new
{
Code = 4,
Description = "4-Выполнен",
Name = "Complete"
},
new
{
Code = 5,
Description = "5-Закрыт",
Name = "Closed"
});
});
modelBuilder.Entity("PARR.DAL.Models.Process", b =>
{
b.Property<Guid>("Id")
@@ -2142,6 +2238,10 @@ namespace PARR.DAL.Migrations
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PARR.DAL.Models.Order", "Order")
.WithMany("AgentHistories")
.HasForeignKey("OrderId");
b.HasOne("PARR.DAL.Models.Template", "Template")
.WithMany("AgentHistories")
.HasForeignKey("TemplateId")
@@ -2150,6 +2250,8 @@ namespace PARR.DAL.Migrations
b.Navigation("AgentHistoryLevel");
b.Navigation("Order");
b.Navigation("Template");
});
@@ -2278,6 +2380,23 @@ namespace PARR.DAL.Migrations
b.Navigation("ResponseArea");
});
modelBuilder.Entity("PARR.DAL.Models.Order", b =>
{
b.HasOne("PARR.DAL.Models.OrderStatus", "OrderStatus")
.WithMany("Orders")
.HasForeignKey("OrderStatusCode")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("PARR.DAL.Models.Template", "Template")
.WithMany("Orders")
.HasForeignKey("TemplateId");
b.Navigation("OrderStatus");
b.Navigation("Template");
});
modelBuilder.Entity("PARR.DAL.Models.RobotConfiguration", b =>
{
b.HasOne("PARR.DAL.Models.Robot", "Robot")
@@ -2450,6 +2569,16 @@ namespace PARR.DAL.Migrations
b.Navigation("Templates");
});
modelBuilder.Entity("PARR.DAL.Models.Order", b =>
{
b.Navigation("AgentHistories");
});
modelBuilder.Entity("PARR.DAL.Models.OrderStatus", b =>
{
b.Navigation("Orders");
});
modelBuilder.Entity("PARR.DAL.Models.Process", b =>
{
b.Navigation("Subprocesses");
@@ -2496,6 +2625,8 @@ namespace PARR.DAL.Migrations
{
b.Navigation("AgentHistories");
b.Navigation("Orders");
b.Navigation("RobotConfigurations");
});

4
PARR.DAL/Models/AgentHistory.cs
View File

@@ -24,10 +24,14 @@ namespace PARR.DAL.Models
public Guid TemplateId { get; set; }
public Guid? OrderId { get; set; }
[ForeignKey(nameof(TemplateId))]
public Template? Template { get; set; }
[ForeignKey(nameof(HistoryLevelId))]
public AgentHistoryLevel? AgentHistoryLevel { get; set; }
public Order? Order { get; set; }
}
}

38
PARR.DAL/Models/Order.cs Normal file
View File

@@ -0,0 +1,38 @@
using PARR.DAL.Models.Base;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
/// <summary>
/// Наряды ЕСПП
/// </summary>
[Table("Orders")]
public class Order : IBase
{
[Key]
public Guid Id { get; set; }
public DateTimeOffset DateCreated { get; set; }
public DateTimeOffset? DateModified { get; set; }
public required string Number { get; set; }
public required string ShortName { get; set; }
public string? WorkGroup { get; set; }
public Guid? TemplateId { get; set; }
public int OrderStatusCode { get; set; }
[ForeignKey(nameof(TemplateId))]
public Template? Template { get; set; }
[ForeignKey(nameof(OrderStatusCode))]
public OrderStatus? OrderStatus { get; set; }
public ICollection<AgentHistory> AgentHistories { get; set; } = new HashSet<AgentHistory>();
}
}

18
PARR.DAL/Models/OrderStatus.cs Normal file
View File

@@ -0,0 +1,18 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace PARR.DAL.Models
{
[Table("OrderStatuses")]
public class OrderStatus
{
[Key]
public int Code { get; set; }
public required string Name { get; set; }
public required string Description { get; set; }
public ICollection<Order> Orders { get; set; } = new HashSet<Order>();
}
}

2
PARR.DAL/Models/Template.cs
View File

@@ -53,5 +53,7 @@ namespace PARR.DAL.Models
public ICollection<AgentHistory> AgentHistories { get; set; } = new HashSet<AgentHistory>();
public ICollection<Order> Orders { get; set; } = new HashSet<Order>();
}
}

2
PARR.DAL/ParrDalInstaller.cs
View File

@@ -51,6 +51,8 @@ namespace PARR.DAL
services.AddTransient<IRobotHistoryService, RobotHistoryService>();
services.AddTransient<IEsppSchTypeConfigService, EsppSchTypeConfigService>();
services.AddTransient<IAgentHistoryService, AgentHistoryService>();
services.AddTransient<IOrderService, OrderService>();
services.AddTransient<IOrderStatusService, OrderStatusService>();
// TransformServices

23
PARR.DAL/Services/Implementations/OrderService.cs Normal file
View File

@@ -0,0 +1,23 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Models;
using PARR.DAL.Services.Abstracts;
using PARR.DAL.Services.Interfaces;
namespace PARR.DAL.Services.Implementations
{
internal class OrderService : BaseService<Order>, IOrderService
{
private readonly DataContext dataContext;
public OrderService(DataContext dataContext, ILogger<OrderService> logger) : base(logger)
{
this.dataContext = dataContext;
}
protected override DbSet<Order> EntitySet => dataContext.Orders;
protected override DataContext EntitiContext => dataContext;
}
}

46
PARR.DAL/Services/Implementations/OrderStatusService.cs Normal file
View File

@@ -0,0 +1,46 @@
using Microsoft.Extensions.Logging;
using PARR.DAL.Context;
using PARR.DAL.Contracts;
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces;
namespace PARR.DAL.Services.Implementations
{
internal class OrderStatusService : IOrderStatusService
{
private readonly DataContext dataContext;
private readonly ILogger<OrderStatusService> logger;
public OrderStatusService(DataContext dataContext, ILogger<OrderStatusService> logger)
{
this.dataContext = dataContext;
this.logger = logger;
}
public IQueryable<OrderStatus> Get()
{
return dataContext.OrderStatuses;
}
public OrderStatusEnum GetOrderStatusByName(string statusName)
{
switch (statusName.ToLower().Trim())
{
case "1-Направлен в группу":
return OrderStatusEnum.New;
case "2-В работе":
return OrderStatusEnum.InWork;
case "3-Приостановлен":
return OrderStatusEnum.Stop;
case "4-Выполнен":
return OrderStatusEnum.Complete;
case "5-Закрыт":
return OrderStatusEnum.Closed;
default:
logger.LogWarning($"Не смог распознать статус наряда, вернул значение по умполчанию: {OrderStatusEnum.New.ToString()}, входящее значение: {statusName}");
return OrderStatusEnum.New;
}
}
}
}

9
PARR.DAL/Services/Interfaces/IOrderService.cs Normal file
View File

@@ -0,0 +1,9 @@
using PARR.DAL.Models;
using PARR.DAL.Services.Interfaces.Base;
namespace PARR.DAL.Services.Interfaces
{
public interface IOrderService : IBaseService<Order>
{
}
}

11
PARR.DAL/Services/Interfaces/IOrderStatusService.cs Normal file
View File

@@ -0,0 +1,11 @@
using PARR.DAL.Contracts;
using PARR.DAL.Models;
namespace PARR.DAL.Services.Interfaces
{
public interface IOrderStatusService
{
IQueryable<OrderStatus> Get();
OrderStatusEnum GetOrderStatusByName(string statusName);
}
}