26 Commits

Author SHA1 Message Date
Đăng Nguyễn
b7e7d70855 update 2025-12-31 14:59:56 +07:00
Đăng Nguyễn
5c1851e92f update 2025-12-31 14:03:47 +07:00
Đăng Nguyễn
49c0c1ab39 update 2025-12-31 13:25:10 +07:00
Đăng Nguyễn
8362713dcc update 2025-12-31 08:56:53 +07:00
Đăng Nguyễn
15a61fd986 update 2025-12-30 17:38:43 +07:00
Đăng Nguyễn
b3f765d261 update 2025-12-30 16:59:08 +07:00
Đăng Nguyễn
2785a8f161 update 2025-12-30 15:17:42 +07:00
Đăng Nguyễn
a51cfe80c8 update 2025-12-23 09:52:42 +07:00
Đăng Nguyễn
e4e135e35f update 2025-12-22 21:28:57 +07:00
Đăng Nguyễn
30732b4b9f udpate robot control 2025-12-22 20:25:22 +07:00
Đăng Nguyễn
b2eeb8cb3f update 2025-12-22 19:49:03 +07:00
7ce770404c save 2025-12-22 19:45:25 +07:00
Đăng Nguyễn
128600c4ed update 2025-12-22 19:44:08 +07:00
Đăng Nguyễn
b006c5b197 update console 2025-12-22 19:43:04 +07:00
Đăng Nguyễn
4ceec9abd5 update 2025-12-22 19:31:55 +07:00
Đăng Nguyễn
1289a6c331 update 2025-12-22 18:39:38 +07:00
Đăng Nguyễn
f1a7be15f2 update 2025-12-22 18:38:35 +07:00
d2cf86f34e update 2025-12-22 18:38:10 +07:00
Đăng Nguyễn
d4af3b8707 Merge remote-tracking branch 'origin/sonlt' into dangnv 2025-12-22 18:12:25 +07:00
909e147be1 save 2025-12-22 18:08:02 +07:00
dc837e5488 save 2025-12-22 17:48:48 +07:00
Đăng Nguyễn
7daad2dfaf update 2025-12-22 16:23:26 +07:00
Đăng Nguyễn
38858355e6 Merge remote-tracking branch 'origin/sonlt' into dangnv 2025-12-22 16:11:45 +07:00
Đăng Nguyễn
65217021d4 update 2025-12-22 16:11:29 +07:00
7a6f813825 save 2025-12-22 14:35:55 +07:00
Đăng Nguyễn
92c01004f5 update 2025-12-22 10:33:24 +07:00
79 changed files with 1499 additions and 5545 deletions

66
.dockerignore Normal file
View File

@@ -0,0 +1,66 @@
# Build artifacts
**/bin/
**/obj/
**/out/
# Visual Studio files
**/.vs/
**/.vscode/
**/*.user
**/*.suo
**/*.userosscache
**/*.sln.docstates
# User-specific files
**/.user
**/.suo
**/.userosscache
# Build results
[Dd]ebug/
[Dd]ebugPublic/
[Rr]elease/
[Rr]eleases/
x64/
x86/
[Aa][Rr][Mm]/
[Aa][Rr][Mm]64/
bld/
[Bb]in/
[Oo]bj/
[Ll]og/
[Ll]ogs/
# NuGet packages
**/packages/
**/*.nupkg
**/*.snupkg
# Test results
**/[Tt]est[Rr]esult*/
**/[Bb]uild[Ll]og.*
# Docker files
Dockerfile*
docker-compose*
.dockerignore
# Git
.git/
.gitignore
.gitattributes
# IDE
.idea/
*.swp
*.swo
*~
# OS
.DS_Store
Thumbs.db
# Data and logs (will be mounted as volumes)
data/
logs/

57
Dockerfile Normal file
View File

@@ -0,0 +1,57 @@
# Stage 1: Build
# Note: Project files specify net10.0, but using .NET 9.0 based on package versions (9.0.9)
# Adjust version if needed: 8.0 (LTS), 9.0 (current), or future 10.0
FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS base
WORKDIR /app
FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build
WORKDIR /src
# Copy solution file
COPY RobotApp.sln .
# Copy project files
COPY RobotApp/RobotApp.csproj RobotApp/
COPY RobotApp.Client/RobotApp.Client.csproj RobotApp.Client/
COPY RobotApp.Common.Shares/RobotApp.Common.Shares.csproj RobotApp.Common.Shares/
COPY RobotApp.VDA5050/RobotApp.VDA5050.csproj RobotApp.VDA5050/
# Restore dependencies
RUN dotnet restore RobotApp.sln
# Copy all source files
COPY RobotApp/ RobotApp/
COPY RobotApp.Client/ RobotApp.Client/
COPY RobotApp.Common.Shares/ RobotApp.Common.Shares/
COPY RobotApp.VDA5050/ RobotApp.VDA5050/
RUN rm -rf ./RobotApp/RobotApp/bin
RUN rm -rf ./RobotApp/RobotApp/obj
RUN rm -rf ./RobotApp.Client/RobotApp.Client/bin
RUN rm -rf ./RobotApp.Client/RobotApp.Client/obj
RUN rm -rf ./RobotApp.Common.Shares/RobotApp.Common.Shares/bin
RUN rm -rf ./RobotApp.Common.Shares/RobotApp.Common.Shares/obj
RUN rm -rf ./RobotApp.VDA5050/RobotApp.VDA5050/bin
RUN rm -rf ./RobotApp.VDA5050/RobotApp.VDA5050/obj
# Build the solution
WORKDIR /src/RobotApp
RUN dotnet build -c Release -o /app/build
# Stage 2: Publish
FROM build AS publish
WORKDIR /src/RobotApp
RUN dotnet publish -c Release -o /app/publish /p:UseAppHost=false
# Copy published files
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish ./
# Set environment variables
#ENV ASPNETCORE_URLS=http://+:8080
ENV ASPNETCORE_ENVIRONMENT=Production
# Run the application
ENTRYPOINT ["dotnet", "RobotApp.dll"]

View File

@@ -1,2 +1,5 @@
# RobotApp # RobotApp
docker build -t robotics.doc/robotnet/robotapp_dde:2.7 .
docker save -o robotapp-dde.2.7.tar robotics.doc/robotnet/robotapp_dde:2.7
scp .\robotapp-dde.2.7.tar robotics@172.20.235.176:~/DDE

View File

@@ -69,7 +69,7 @@
} }
public NavModel[] Navs = [ public NavModel[] Navs = [
new(){Icon = "mdi-view-dashboard", Path="/", Label = "Dashboard", Match = NavLinkMatch.All}, new(){Icon = "mdi-view-dashboard", Path="/dashboard", Label = "Dashboard", Match = NavLinkMatch.All},
// new(){Icon = "mdi-map-legend", Path="/maps-manager", Label = "Mapping", Match = NavLinkMatch.All}, // new(){Icon = "mdi-map-legend", Path="/maps-manager", Label = "Mapping", Match = NavLinkMatch.All},
new(){Icon = "mdi-monitor", Path="/robot-monitor", Label = "Robot Monitor", Match = NavLinkMatch.All}, new(){Icon = "mdi-monitor", Path="/robot-monitor", Label = "Robot Monitor", Match = NavLinkMatch.All},
new(){Icon = "mdi-state-machine", Path="/robot-order", Label = "order", Match = NavLinkMatch.All}, new(){Icon = "mdi-state-machine", Path="/robot-order", Label = "order", Match = NavLinkMatch.All},

View File

@@ -17,17 +17,31 @@
<i class="mdi mdi-fit-to-screen-outline icon-button"></i> <i class="mdi mdi-fit-to-screen-outline icon-button"></i>
</button> </button>
</MudTooltip> </MudTooltip>
<div class="auto-follow-control">
<MudTooltip Text="Auto Follow Robot" Placement="Placement.Bottom" Color="Color.Info">
<MudSwitch T="bool" Value="AutoFollowRobot" ValueChanged="OnAutoFollowRobotChanged" Color="Color.Info" Size="Size.Small">
<span style="color: white; font-size: 14px; margin-left: 8px;">Follow Robot</span>
</MudSwitch>
</MudTooltip>
</div>
<MudSpacer /> <MudSpacer />
@if (MonitorData?.RobotPosition != null) @if (MonitorData?.RobotPosition != null)
{ {
<div class="robot-position-info"> <div class="robot-position-info">
<i class="mdi mdi-map-marker"></i> <i class="mdi mdi-map-marker"></i>
<span>X: @MonitorData.RobotPosition.X.ToString("F2")m | Y: @MonitorData.RobotPosition.Y.ToString("F2")m | θ: @((MonitorData.RobotPosition.Theta * 180 / Math.PI).ToString("F1"))°</span> <span>Robot: X: @MonitorData.RobotPosition.X.ToString("F2")m | Y: @MonitorData.RobotPosition.Y.ToString("F2")m | θ: @((MonitorData.RobotPosition.Theta * 180 / Math.PI).ToString("F1"))°</span>
</div> </div>
} }
<MudChip T="string" Color="@(IsConnected? Color.Success: Color.Error)" Size="Size.Small"> @if (MouseWorldX.HasValue && MouseWorldY.HasValue)
{
<div class="mouse-position-info">
<i class="mdi mdi-cursor-pointer"></i>
<span>Mouse: X: @MouseWorldX.Value.ToString("F2")m | Y: @MouseWorldY.Value.ToString("F2")m</span>
</div>
}
@* <MudChip T="string" Color="@(IsConnected? Color.Success: Color.Error)" Size="Size.Small">
@(IsConnected ? "Connected" : "Disconnected") @(IsConnected ? "Connected" : "Disconnected")
</MudChip> </MudChip> *@
</div> </div>
<div @ref="SvgContainerRef" class="svg-container"> <div @ref="SvgContainerRef" class="svg-container">
<svg @ref="SvgRef" <svg @ref="SvgRef"
@@ -36,18 +50,52 @@
@onmousemove="HandleMouseMove" @onmousemove="HandleMouseMove"
@onmouseup="HandleMouseUp" @onmouseup="HandleMouseUp"
@onmouseleave="HandleMouseLeave"> @onmouseleave="HandleMouseLeave">
@* Arrow markers for origin *@
<defs>
<marker id="arrowhead-x" markerWidth="10" markerHeight="10"
refX="9" refY="3" orient="auto" markerUnits="strokeWidth">
<path d="M0,0 L0,6 L9,3 z" fill="#FF0000" />
</marker>
<marker id="arrowhead-y" markerWidth="10" markerHeight="10"
refX="9" refY="3" orient="auto" markerUnits="strokeWidth">
<path d="M0,0 L0,6 L9,3 z" fill="#00FF00" />
</marker>
</defs>
<g transform="@GetTransform()"> <g transform="@GetTransform()">
@* Background Map Image *@
@if (MapImageLoaded && MapImageWidth > 0 && MapImageHeight > 0)
{
@* Image origin is at bottom-left corner (MapImageOriginX, MapImageOriginY) in world coordinates
In SVG (after Y flip), image top-left corner is at (MapImageOriginX, -MapImageOriginY - MapImageHeight)
So we render image at: x = MapImageOriginX, y = -MapImageOriginY - MapImageHeight *@
<image href="@MapImageUrl"
x="@WorldToSvgX(MapImageOriginX)"
y="@WorldToSvgY(MapImageOriginY + MapImageHeight)"
width="@MapImageWidth"
height="@MapImageHeight"
preserveAspectRatio="none"
opacity="0.8"
style="pointer-events: none; image-rendering: pixelated;"
id="map-background-image" />
}
@* Origin Marker (2 arrows: X+ and Y+) at (MapImageOriginX, MapImageOriginY) *@
<g transform="@GetOriginMarkerTransform()">
@* X+ Arrow (pointing right) *@
<line x1="0" y1="0" x2="@GetOriginMarkerSize()" y2="0"
stroke="#FF0000" stroke-width="@GetOriginMarkerStrokeWidth()"
marker-end="url(#arrowhead-x)" />
@* Y+ Arrow (pointing up in world, down in SVG) *@
<line x1="0" y1="0" x2="0" y2="@(-GetOriginMarkerSize())"
stroke="#00FF00" stroke-width="@GetOriginMarkerStrokeWidth()"
marker-end="url(#arrowhead-y)" />
@* Origin point *@
<circle cx="0" cy="0" r="@(GetOriginMarkerSize() * 0.12)"
fill="#FFFF00" stroke="#000" stroke-width="@(GetOriginMarkerStrokeWidth() * 0.5)" />
</g>
@if (MonitorData?.HasOrder == true) @if (MonitorData?.HasOrder == true)
{ {
@* @for (int i = 0; i < MonitorData.EdgeStates.Length; i++)
{
var edge = MonitorData.EdgeStates[i];
var (startX, startY, endX, endY) = GetEdgeEndpoints(i, edge);
<path d="@GetPathFromTrajectory(edge.Trajectory, startX, startY, endX, endY)"
fill="none"
stroke="#42A5F5"
stroke-width="0.08" />
} *@
<path d="@PathView" <path d="@PathView"
fill="none" fill="none"
stroke="#42A5F5" stroke="#42A5F5"
@@ -86,6 +134,7 @@
</div> </div>
@code { @code {
[Parameter] public RobotMonitorDto? MonitorData { get; set; } [Parameter] public RobotMonitorDto? MonitorData { get; set; }
[Parameter] public bool IsConnected { get; set; } [Parameter] public bool IsConnected { get; set; }
@@ -106,7 +155,7 @@
private ElementReference SvgRef; private ElementReference SvgRef;
private ElementReference SvgContainerRef; private ElementReference SvgContainerRef;
private double ZoomScale = 2.0; // Zoom vào robot hơn khi mở private double ZoomScale = 1.5; // Zoom vào robot hơn khi mở
private const double MIN_ZOOM = 0.1; private const double MIN_ZOOM = 0.1;
private const double MAX_ZOOM = 5.0; private const double MAX_ZOOM = 5.0;
private const double BASE_PIXELS_PER_METER = 50.0; private const double BASE_PIXELS_PER_METER = 50.0;
@@ -124,14 +173,44 @@
private string PathView = ""; private string PathView = "";
private string PathIsNot = "hidden"; private string PathIsNot = "hidden";
// Mouse world coordinates
private double? MouseWorldX = null;
private double? MouseWorldY = null;
// Auto-follow robot
private bool AutoFollowRobot = false;
private void OnAutoFollowRobotChanged(bool value)
{
AutoFollowRobot = value;
if (AutoFollowRobot && MonitorData?.RobotPosition != null)
{
UpdateViewToFollowRobot();
StateHasChanged();
}
}
// Map image properties
private const double MapImageOriginX = -20.0; // OriginX in world coordinates (meters)
private const double MapImageOriginY = -20.0; // OriginY in world coordinates (meters)
private const double MapImageResolution = 0.1; // Resolution: meters per pixel
private const string MapImageUrl = "images/gara20250309.png";
private bool MapImageLoaded = false;
private double MapImageWidth = 0; // Width in world coordinates (meters)
private double MapImageHeight = 0; // Height in world coordinates (meters)
protected override async Task OnAfterRenderAsync(bool firstRender) protected override async Task OnAfterRenderAsync(bool firstRender)
{ {
if (firstRender) if (firstRender)
{ {
var containerSize = await JS.InvokeAsync<ElementSize>("getElementSize", SvgContainerRef); var containerSize = await JS.InvokeAsync<ElementSize>("robotMonitor.getElementSize", SvgContainerRef);
SvgWidth = containerSize.Width; SvgWidth = containerSize.Width;
SvgHeight = containerSize.Height; SvgHeight = containerSize.Height;
// Load map image and get dimensions
await LoadMapImage();
// Center view on robot if available with initial zoom // Center view on robot if available with initial zoom
if (MonitorData?.RobotPosition != null) if (MonitorData?.RobotPosition != null)
{ {
@@ -150,8 +229,37 @@
} }
} }
private async Task LoadMapImage()
{
try
{
var imageDimensions = await JS.InvokeAsync<ElementSize>("robotMonitor.loadImageAndGetDimensions", MapImageUrl);
// Convert pixel dimensions to world coordinates (meters)
MapImageWidth = imageDimensions.Width * MapImageResolution;
MapImageHeight = imageDimensions.Height * MapImageResolution;
if (MapImageWidth > 0 && MapImageHeight > 0)
{
MapImageLoaded = true;
await InvokeAsync(StateHasChanged); // Force re-render after image is loaded
}
}
catch (Exception ex)
{
MapImageLoaded = false;
Console.WriteLine($"Failed to load map image: {ex.Message}");
}
}
private string GetTransform() private string GetTransform()
{ {
// Transform applies: first translate (in screen pixels), then scale (pixels per meter)
// World coordinates are in meters
// After transform: screenX = TranslateX + worldX * (ZoomScale * BASE_PIXELS_PER_METER)
// screenY = TranslateY + worldY * (ZoomScale * BASE_PIXELS_PER_METER)
// But we need to flip Y: screenY = TranslateY - worldY * (ZoomScale * BASE_PIXELS_PER_METER)
// This is handled by WorldToSvgY which flips Y before applying transform
return $"translate({TranslateX}, {TranslateY}) scale({ZoomScale * BASE_PIXELS_PER_METER})"; return $"translate({TranslateX}, {TranslateY}) scale({ZoomScale * BASE_PIXELS_PER_METER})";
} }
@@ -174,7 +282,8 @@
// Điều chỉnh kích thước dựa trên ZoomScale // Điều chỉnh kích thước dựa trên ZoomScale
// Tăng kích thước lên 1.5x để robot to hơn // Tăng kích thước lên 1.5x để robot to hơn
double scaleFactor = 3 / ZoomScale; // Tăng kích thước hiển thị double scaleFactor = 2 / ZoomScale; // Tăng kích thước hiển thị
scaleFactor = scaleFactor < 1 ? 1 : scaleFactor;
double width = RobotWidthMeters * scaleFactor; double width = RobotWidthMeters * scaleFactor;
double height = RobotLengthMeters * scaleFactor; double height = RobotLengthMeters * scaleFactor;
@@ -217,6 +326,53 @@
return -worldY; return -worldY;
} }
private string GetOriginMarkerTransform()
{
// Origin is at (MapImageOriginX, MapImageOriginY) in world coordinates (bottom-left corner of image)
// In SVG coordinates (after Y flip): (MapImageOriginX, -MapImageOriginY)
// Note: Image is rendered at (MapImageOriginX, -MapImageOriginY - MapImageHeight) in SVG
// So origin marker should be at (MapImageOriginX, -MapImageOriginY) in SVG
var x = WorldToSvgX(0);
var y = WorldToSvgY(0);
return $"translate({x}, {y})";
}
private double GetOriginMarkerSize()
{
// Marker size in world coordinates (meters)
const double BaseMarkerSize = 1; // 1 meter
double scaleFactor = 1.0 / ZoomScale; // Keep visual size constant
return BaseMarkerSize * scaleFactor;
}
private double GetOriginMarkerStrokeWidth()
{
// Stroke width in world coordinates
const double BaseStrokeWidth = 0.05; // 5cm
double scaleFactor = 1.0 / ZoomScale; // Keep visual size constant
return BaseStrokeWidth * scaleFactor;
}
public void OnMonitorDataUpdated()
{
// Auto-follow robot when MonitorData changes
if (AutoFollowRobot && !IsPanning && MonitorData?.RobotPosition != null)
{
UpdateViewToFollowRobot();
}
}
private void UpdateViewToFollowRobot()
{
if (MonitorData?.RobotPosition == null) return;
// Center view on robot
TranslateX = SvgWidth / 2 - MonitorData.RobotPosition.X * BASE_PIXELS_PER_METER * ZoomScale;
TranslateY = SvgHeight / 2 + MonitorData.RobotPosition.Y * BASE_PIXELS_PER_METER * ZoomScale;
StateHasChanged();
}
public void UpdatePath() public void UpdatePath()
{ {
if (MonitorData is not null && MonitorData.EdgeStates.Length > 0) if (MonitorData is not null && MonitorData.EdgeStates.Length > 0)
@@ -291,14 +447,26 @@
PanStartY = e.ClientY - TranslateY; PanStartY = e.ClientY - TranslateY;
} }
private void HandleMouseMove(MouseEventArgs e) private async Task HandleMouseMove(MouseEventArgs e)
{ {
// Calculate world coordinates of mouse
var svgRect = await JS.InvokeAsync<ElementBoundingRect>("robotMonitor.getElementBoundingRect", SvgRef);
double mouseX = e.ClientX - svgRect.X;
double mouseY = e.ClientY - svgRect.Y;
// Convert to world coordinates
// World X = (mouseX - TranslateX) / (ZoomScale * BASE_PIXELS_PER_METER)
MouseWorldX = (mouseX - TranslateX) / (ZoomScale * BASE_PIXELS_PER_METER);
// World Y = -(mouseY - TranslateY) / (ZoomScale * BASE_PIXELS_PER_METER) (flip Y axis)
MouseWorldY = -(mouseY - TranslateY) / (ZoomScale * BASE_PIXELS_PER_METER);
if (IsPanning) if (IsPanning)
{ {
TranslateX = e.ClientX - PanStartX; TranslateX = e.ClientX - PanStartX;
TranslateY = e.ClientY - PanStartY; TranslateY = e.ClientY - PanStartY;
StateHasChanged();
} }
StateHasChanged();
} }
private void HandleMouseUp(MouseEventArgs e) private void HandleMouseUp(MouseEventArgs e)
@@ -309,6 +477,9 @@
private void HandleMouseLeave(MouseEventArgs e) private void HandleMouseLeave(MouseEventArgs e)
{ {
IsPanning = false; IsPanning = false;
MouseWorldX = null;
MouseWorldY = null;
StateHasChanged();
} }
private async Task HandleWheel(WheelEventArgs e) private async Task HandleWheel(WheelEventArgs e)
@@ -324,7 +495,7 @@
if (Math.Abs(ZoomScale - oldZoom) < 0.001) return; if (Math.Abs(ZoomScale - oldZoom) < 0.001) return;
// Zoom at mouse position // Zoom at mouse position
var svgRect = await JS.InvokeAsync<ElementBoundingRect>("getElementBoundingRect", SvgRef); var svgRect = await JS.InvokeAsync<ElementBoundingRect>("robotMonitor.getElementBoundingRect", SvgRef);
double mouseX = e.ClientX - svgRect.X; double mouseX = e.ClientX - svgRect.X;
double mouseY = e.ClientY - svgRect.Y; double mouseY = e.ClientY - svgRect.Y;

View File

@@ -54,19 +54,39 @@
gap: 8px; gap: 8px;
} }
.mouse-position-info {
color: #fff;
font-size: 14px;
font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
padding: 4px 12px;
background-color: #3d3d3d;
border-radius: 4px;
display: flex;
align-items: center;
gap: 8px;
}
.auto-follow-control {
display: flex;
align-items: center;
padding: 4px 8px;
background-color: #3d3d3d;
border-radius: 4px;
}
.svg-container { .svg-container {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
background-color: #fafafa; background-color: #808080;
} }
.svg-container svg { .svg-container svg {
width: 100%; width: 100%;
height: 100%; height: 100%;
cursor: grab; cursor: grab;
background-color: dimgray; background-color: #808080;
} }
.svg-container svg:active { .svg-container svg:active {
cursor: grabbing; cursor: grabbing;

View File

@@ -1,17 +1,19 @@
@page "/" @page "/dashboard"
@attribute [Authorize]
@using RobotApp.Client.Services @using RobotApp.Client.Services
@using RobotApp.VDA5050.State @using RobotApp.VDA5050.State
@using MudBlazor @using MudBlazor
@inject RobotStateClient RobotStateClient
@implements IDisposable
@rendermode InteractiveWebAssembly
<MudContainer MaxWidth="MaxWidth.False" Class="pa-4"> @implements IDisposable
@inject RobotStateClient RobotStateClient
@rendermode InteractiveWebAssemblyNoPrerender
<MudContainer MaxWidth="MaxWidth.False" Class="pa-4" Style="overflow-y:auto">
<!-- Header Dashboard --> <!-- Header Dashboard -->
<MudPaper Class="pa-6 mb-4 d-flex align-center justify-space-between" Elevation="3"> <MudPaper Class="pa-6 mb-4 d-flex align-center justify-space-between" Elevation="3">
<div> <div>
<MudText Typo="Typo.h3" Class="mb-2" >Robot Dashboard</MudText> <MudText Typo="Typo.h3" Class="mb-2">Robot Dashboard</MudText>
@if (CurrentState != null) @if (CurrentState != null)
{ {
<MudText Typo="Typo.subtitle1"> <MudText Typo="Typo.subtitle1">
@@ -38,12 +40,13 @@
Icon="@(IsConnected ? Icons.Material.Filled.CheckCircle : Icons.Material.Filled.Error)" Icon="@(IsConnected ? Icons.Material.Filled.CheckCircle : Icons.Material.Filled.Error)"
Size="Size.Large" Size="Size.Large"
Color="@(IsConnected ? Color.Success : Color.Error)" Color="@(IsConnected ? Color.Success : Color.Error)"
Variant="@Variant.Filled" Variant="Variant.Filled"
Class="px-6 py-4 text-white" Class="px-6 py-4 text-white"
Style="font-weight: bold; font-size: 1.1rem;"> Style="font-weight: bold; font-size: 1.1rem;">
@(IsConnected ? "ONLINE" : "OFFLINE") @(IsConnected ? "ONLINE" : "OFFLINE")
</MudChip> </MudChip>
} }
</MudPaper> </MudPaper>
@{ @{
@@ -130,7 +133,6 @@
</MudCard> </MudCard>
</MudItem> </MudItem>
<!-- BATTERY -->
<!-- BATTERY --> <!-- BATTERY -->
<MudItem xs="12" md="6" lg="4"> <MudItem xs="12" md="6" lg="4">
<MudCard Elevation="6" Class="h-100 rounded-lg"> <MudCard Elevation="6" Class="h-100 rounded-lg">
@@ -148,14 +150,14 @@
Rounded="true" Rounded="true"
Striped="true" Striped="true"
Color="@(msg.BatteryState.BatteryCharge > 50 ? Color.Success : Color="@(msg.BatteryState.BatteryCharge > 50 ? Color.Success :
msg.BatteryState.BatteryCharge > 20 ? Color.Warning : Color.Error)" msg.BatteryState.BatteryCharge > 20 ? Color.Warning : Color.Error)"
Class="mb-4" Class="mb-4"
Style="height: 28px;" /> Style="height: 28px;" />
<!-- Phần mới: % pin và trạng thái Charging/Discharging cùng dòng --> <!-- Phần mới: % pin và trạng thái Charging/Discharging cùng dòng -->
<div class="d-flex align-center justify-space-between mb-6"> <div class="d-flex align-center justify-space-between mb-6">
<MudText Typo="Typo.h3" Class="mb-0"> <MudText Typo="Typo.h3" Class="mb-0">
@msg.BatteryState.BatteryCharge:F1<span class="mud-typography-h4">%</span> @msg.BatteryState.BatteryCharge<span class="mud-typography-h4">%</span>
</MudText> </MudText>
<MudChip T="string" <MudChip T="string"
@@ -202,7 +204,7 @@
<MudText>Update ID: <strong>@msg.OrderUpdateId</strong></MudText> <MudText>Update ID: <strong>@msg.OrderUpdateId</strong></MudText>
<MudDivider Class="my-4" /> <MudDivider Class="my-4" />
<MudText>Last Node: <strong>@msg.LastNodeId</strong> <span class="mud-typography-caption">(Seq: @msg.LastNodeSequenceId)</span></MudText> <MudText>Last Node: <strong>@msg.LastNodeId</strong> <span class="mud-typography-caption">(Seq: @msg.LastNodeSequenceId)</span></MudText>
<MudText>Distance since last: <strong>@msg.DistanceSinceLastNode:F1 m</strong></MudText> <MudText>Distance since last: <strong>@msg.DistanceSinceLastNode m</strong></MudText>
<MudDivider Class="my-4" /> <MudDivider Class="my-4" />
@{ @{
var nodeReleased = msg.NodeStates?.Count(n => n.Released) ?? 0; var nodeReleased = msg.NodeStates?.Count(n => n.Released) ?? 0;
@@ -262,13 +264,13 @@
<MudChip T="string" <MudChip T="string"
Size="Size.Small" Size="Size.Small"
Color="@(context.Level.Contains("ERROR", StringComparison.OrdinalIgnoreCase) ? Color.Error : Color="@(context.Level.Contains("ERROR", StringComparison.OrdinalIgnoreCase) ? Color.Error :
context.Level.Contains("WARN", StringComparison.OrdinalIgnoreCase) ? Color.Warning : Color.Info)" context.Level.Contains("WARN", StringComparison.OrdinalIgnoreCase) ? Color.Warning : Color.Info)"
Variant="@Variant.Filled"> Variant="@Variant.Filled">
@context.Level @context.Level
</MudChip> </MudChip>
</MudTd> </MudTd>
<MudTd> <MudTd>
<MudText Typo="Typo.body2" Class="text-truncate" Style="max-width: 300px;" Title="@context.Description"> <MudText Typo="Typo.body2" Class="text-truncate" Style="max-width: 300px;">
@context.Description @context.Description
</MudText> </MudText>
</MudTd> </MudTd>
@@ -307,14 +309,14 @@
<MudTh Style="text-align:right">Status</MudTh> <MudTh Style="text-align:right">Status</MudTh>
</HeaderContent> </HeaderContent>
<RowTemplate> <RowTemplate>
<MudTd><MudText Typo="Typo.body2" Class="text-truncate" Title="@context.ActionType">@context.ActionType</MudText></MudTd> <MudTd><MudText Typo="Typo.body2" Class="text-truncate">@context.ActionType</MudText></MudTd>
<MudTd><MudText Typo="Typo.caption">@context.ActionId</MudText></MudTd> <MudTd><MudText Typo="Typo.caption">@context.ActionId</MudText></MudTd>
<MudTd Style="text-align:right"> <MudTd Style="text-align:right">
<MudChip T="string" <MudChip T="string"
Size="Size.Small" Size="Size.Small"
Color="@(context.ActionStatus == "RUNNING" ? Color.Info : Color="@(context.ActionStatus == "RUNNING" ? Color.Info :
context.ActionStatus == "FINISHED" ? Color.Success : context.ActionStatus == "FINISHED" ? Color.Success :
context.ActionStatus == "FAILED" ? Color.Error : Color.Default)" context.ActionStatus == "FAILED" ? Color.Error : Color.Default)"
Variant="@Variant.Filled"> Variant="@Variant.Filled">
@context.ActionStatus @context.ActionStatus
</MudChip> </MudChip>
@@ -368,31 +370,35 @@
}; };
private StateMsg? CurrentState; private StateMsg? CurrentState;
private bool IsConnected => RobotStateClient.LatestStates.ContainsKey(RobotSerial); private bool IsConnected;
private readonly string RobotSerial = "T800-002";
private List<MessageRow> MessageRows = new(); private List<MessageRow> MessageRows = new();
protected override async Task OnInitializedAsync() protected override async Task OnAfterRenderAsync(bool firstRender)
{ {
await base.OnAfterRenderAsync(firstRender);
if (!firstRender) return;
RobotStateClient.OnStateReceived += OnRobotStateReceived; RobotStateClient.OnStateReceived += OnRobotStateReceived;
if (RobotStateClient.LatestStates.Count == 0) RobotStateClient.OnRobotConnectionChanged += OnRobotConnectionChanged;
{
await RobotStateClient.StartAsync(); await RobotStateClient.StartAsync();
} CurrentState = RobotStateClient.GetLatestState();
await RobotStateClient.SubscribeRobotAsync(RobotSerial); IsConnected = RobotStateClient.IsRobotConnected;
CurrentState = RobotStateClient.GetLatestState(RobotSerial);
UpdateMessageRows(); UpdateMessageRows();
} }
private void OnRobotConnectionChanged(bool connected)
{
IsConnected = connected;
StateHasChanged();
}
private void OnRobotStateReceived(string serialNumber, StateMsg state) private void OnRobotStateReceived(string serialNumber, StateMsg state)
{ {
if (serialNumber != RobotSerial) return; CurrentState = state;
InvokeAsync(() => UpdateMessageRows();
{ StateHasChanged();
CurrentState = state;
UpdateMessageRows();
StateHasChanged();
});
} }
private void UpdateMessageRows() private void UpdateMessageRows()
@@ -417,6 +423,7 @@
public void Dispose() public void Dispose()
{ {
RobotStateClient.OnStateReceived -= OnRobotStateReceived; RobotStateClient.OnStateReceived -= OnRobotStateReceived;
RobotStateClient.OnRobotConnectionChanged -= OnRobotConnectionChanged;
} }
private record MessageRow(string Type, string Level, string Description, bool IsError); private record MessageRow(string Type, string Level, string Description, bool IsError);

View File

@@ -1,6 +1,5 @@
@page "/logs" @page "/logs"
@rendermode InteractiveWebAssemblyNoPrerender @rendermode InteractiveWebAssemblyNoPrerender
@attribute [Authorize]
@using Microsoft.AspNetCore.Components.WebAssembly.Authentication @using Microsoft.AspNetCore.Components.WebAssembly.Authentication
@using RobotApp.Client.Models @using RobotApp.Client.Models
@@ -78,6 +77,13 @@
</div> </div>
</div> </div>
<script>
window.ScrollToBottom = (element) => {
if (element) {
element.scrollTop = element.scrollHeight;
}
};
</script>
@code { @code {
private DateTime DateLog = DateTime.Today; private DateTime DateLog = DateTime.Today;

View File

@@ -23,7 +23,7 @@
.log-level { .log-level {
display: inline-block; display: inline-block;
width: 46px; width: 60px;
} }
.log-head { .log-head {

View File

@@ -2,8 +2,6 @@
@rendermode InteractiveWebAssemblyNoPrerender @rendermode InteractiveWebAssemblyNoPrerender
@attribute [Authorize]
<PageTitle>Map Manager</PageTitle> <PageTitle>Map Manager</PageTitle>
<div class="d-flex w-100 h-100 p-2 overflow-hidden flex-row"> <div class="d-flex w-100 h-100 p-2 overflow-hidden flex-row">

View File

@@ -38,8 +38,7 @@
<MudIconButton Icon="@Icons.Material.Filled.Delete" <MudIconButton Icon="@Icons.Material.Filled.Delete"
Color="Color.Error" Color="Color.Error"
Size="Size.Small" Size="Size.Small"
OnClick="@(() => RemoveEdgeAsync(edge))" OnClick="@(() => RemoveEdgeAsync(edge))" />
StopPropagation="true" />
</div> </div>
</TitleContent> </TitleContent>
@@ -88,47 +87,6 @@
} }
</MudSelect> </MudSelect>
</MudItem> </MudItem>
<!-- Radius -->
<MudItem xs="6">
<MudNumericField T="double"
Value="@edge.Radius"
ValueChanged="@((double v) => SetValue(() => edge.Radius = v))"
Immediate="true"
Min="0"
Step="0.1"
Label="Radius (0 = straight line)" />
</MudItem>
<!-- Quadrant -->
@if (edge.Radius > 0)
{
<MudItem xs="6">
<MudSelect T="Quadrant"
Value="@edge.Quadrant"
ValueChanged="@((Quadrant v) => SetValue(() => edge.Quadrant = v))"
Label="Quadrant">
<MudSelectItem Value="Quadrant.I">I</MudSelectItem>
<MudSelectItem Value="Quadrant.II">II</MudSelectItem>
<MudSelectItem Value="Quadrant.III">III</MudSelectItem>
<MudSelectItem Value="Quadrant.IV">IV</MudSelectItem>
</MudSelect>
</MudItem>
}
<!-- Apply Curve -->
@if (!edge.HasTrajectory && edge.Radius > 0 && !edge.Expanded)
{
<MudItem xs="12">
<MudButton Color="Color.Primary"
Variant="Variant.Outlined"
StartIcon="@Icons.Material.Filled.Merge"
OnClick="@(() => ApplyCurveAsync(edge))">
Apply Curve (generate node)
</MudButton>
</MudItem>
}
</MudGrid> </MudGrid>
</ChildContent> </ChildContent>
</MudExpansionPanel> </MudExpansionPanel>
@@ -141,8 +99,7 @@
[Parameter] public OrderMessage Order { get; set; } = default!; [Parameter] public OrderMessage Order { get; set; } = default!;
[Parameter] public EventCallback OnAddEdge { get; set; } [Parameter] public EventCallback OnAddEdge { get; set; }
[Parameter] public EventCallback<UiEdge> OnRemoveEdge { get; set; } [Parameter] public EventCallback<VDA5050.Order.Edge> OnRemoveEdge { get; set; }
[Parameter] public EventCallback<UiEdge> OnApplyCurve { get; set; }
[Parameter] public EventCallback OnOrderChanged { get; set; } [Parameter] public EventCallback OnOrderChanged { get; set; }
@@ -158,15 +115,9 @@
await OnOrderChanged.InvokeAsync(); await OnOrderChanged.InvokeAsync();
} }
private async Task RemoveEdgeAsync(UiEdge edge) private async Task RemoveEdgeAsync(VDA5050.Order.Edge edge)
{ {
await OnRemoveEdge.InvokeAsync(edge); await OnRemoveEdge.InvokeAsync(edge);
await OnOrderChanged.InvokeAsync(); await OnOrderChanged.InvokeAsync();
} }
private async Task ApplyCurveAsync(UiEdge edge)
{
await OnApplyCurve.InvokeAsync(edge);
await OnOrderChanged.InvokeAsync();
}
} }

View File

@@ -10,12 +10,6 @@
<MudItem xs="12"> <MudItem xs="12">
<MudTextField @bind-Value="Node.NodeId" Label="Node ID" Required="true" /> <MudTextField @bind-Value="Node.NodeId" Label="Node ID" Required="true" />
</MudItem> </MudItem>
<MudItem xs="12">
<MudNumericField T="int" @bind-Value="Node.SequenceId" Label="Sequence ID" Required="true" />
</MudItem>
<MudItem xs="12">
<MudSwitch T="bool" @bind-Checked="Node.Released" Label="Released" />
</MudItem>
<MudItem xs="6"> <MudItem xs="6">
<MudNumericField T="double" @bind-Value="Node.NodePosition.X" Label="X" /> <MudNumericField T="double" @bind-Value="Node.NodePosition.X" Label="X" />
</MudItem> </MudItem>

View File

@@ -1,11 +1,21 @@
@using System.Text.Json @using System.Text.Json
@using MudBlazor @using MudBlazor
@using Microsoft.AspNetCore.Components.Forms
<MudDialog> <MudDialog>
<!-- ================= TITLE ================= -->
<TitleContent> <TitleContent>
<MudText Typo="Typo.h6">Import Order JSON</MudText> <MudStack Row AlignItems="AlignItems.Center" Spacing="2">
<MudIcon Icon="@Icons.Material.Filled.UploadFile"
Color="Color.Primary" />
<MudText Typo="Typo.h6">
Import Order JSON
</MudText>
</MudStack>
</TitleContent> </TitleContent>
<!-- ================= CONTENT ================= -->
<DialogContent> <DialogContent>
@if (ShowWarning) @if (ShowWarning)
@@ -18,6 +28,21 @@
</MudAlert> </MudAlert>
} }
<!-- ===== FILE INPUT (PURE BLAZOR) ===== -->
<div class="mb-4">
<label class="mud-button-root mud-button mud-button-outlined mud-button-outlined-primary"
style="cursor:pointer;">
<MudIcon Icon="@Icons.Material.Filled.AttachFile" Class="mr-2" />
Choose JSON file
<InputFile OnChange="OnFileSelected"
accept=".json"
style="display:none" />
</label>
</div>
<MudDivider Class="my-3" />
<!-- ===== PASTE JSON ===== -->
<MudTextField @bind-Value="JsonText" <MudTextField @bind-Value="JsonText"
Label="Paste Order JSON" Label="Paste Order JSON"
Lines="20" Lines="20"
@@ -34,41 +59,90 @@
</DialogContent> </DialogContent>
<!-- ================= ACTIONS ================= -->
<DialogActions> <DialogActions>
<MudButton OnClick="Cancel">Cancel</MudButton> <MudButton OnClick="Cancel">
Cancel
</MudButton>
<MudButton Variant="Variant.Filled" <MudButton Variant="Variant.Filled"
Color="Color.Primary" Color="Color.Primary"
OnClick="ValidateAndImport"> OnClick="ValidateAndImport">
Import Import
</MudButton> </MudButton>
</DialogActions> </DialogActions>
</MudDialog> </MudDialog>
@code { @code {
[CascadingParameter] public IMudDialogInstance MudDialog { get; set; } = default!; [CascadingParameter]
public IMudDialogInstance MudDialog { get; set; } = default!;
public string JsonText { get; set; } = ""; public string JsonText { get; set; } = "";
public string? ErrorMessage; public string? ErrorMessage;
public bool ShowWarning { get; set; } = false; public bool ShowWarning { get; set; }
private void Cancel() => MudDialog.Cancel(); private void Cancel() => MudDialog.Cancel();
// ================= FILE HANDLER =================
private async Task OnFileSelected(InputFileChangeEventArgs e)
{
ErrorMessage = null;
ShowWarning = false;
var file = e.File;
if (file == null)
return;
if (!file.Name.EndsWith(".json", StringComparison.OrdinalIgnoreCase) &&
!file.Name.EndsWith(".txt", StringComparison.OrdinalIgnoreCase))
{
ShowWarning = true;
ErrorMessage = "Only .json or .txt files are supported.";
return;
}
try
{
using var stream = file.OpenReadStream(maxAllowedSize: 1_048_576);
using var reader = new StreamReader(stream);
JsonText = await reader.ReadToEndAsync();
StateHasChanged();
}
catch (Exception ex)
{
ShowWarning = true;
ErrorMessage = $"Failed to read file: {ex.Message}";
}
}
// ================= VALIDATE & IMPORT =================
private void ValidateAndImport() private void ValidateAndImport()
{ {
ErrorMessage = null; ErrorMessage = null;
ShowWarning = false; ShowWarning = false;
if (string.IsNullOrWhiteSpace(JsonText))
{
ShowWarning = true;
ErrorMessage = "JSON content is empty.";
return;
}
try try
{ {
using var doc = JsonDocument.Parse(JsonText); var order = JsonSerializer.Deserialize<OrderMsg>(JsonText, new JsonSerializerOptions
var root = doc.RootElement; {
WriteIndented = true,
// ===== BASIC STRUCTURE CHECK ===== PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
if (!root.TryGetProperty("nodes", out _) || });
!root.TryGetProperty("edges", out _)) if(order is null)
throw new Exception("Missing 'nodes' or 'edges' field."); {
ShowWarning = true;
var order = OrderMessage.FromSchemaObject(root); ErrorMessage = "Can not convert file to Order message";
return;
}
ValidateOrder(order); ValidateOrder(order);
MudDialog.Close(DialogResult.Ok(order)); MudDialog.Close(DialogResult.Ok(order));
@@ -85,19 +159,40 @@
} }
} }
private void ValidateOrder(OrderMessage order) // ================= DOMAIN VALIDATION =================
private void ValidateOrder(OrderMsg order)
{ {
if (order.Nodes.Count == 0) if (order.Nodes.Length == 0)
throw new Exception("Order must contain at least one node."); throw new Exception("Order must contain at least one node.");
var nodeIds = order.Nodes.Select(n => n.NodeId).ToHashSet(); if (order.Nodes.Length != order.Edges.Length + 1)
throw new Exception(
$"Invalid path structure: Nodes count ({order.Nodes.Length}) " +
$"must equal Edges count + 1 ({order.Edges.Length + 1})."
);
var nodeIds = order.Nodes
.Select(n => n.NodeId)
.ToHashSet(StringComparer.Ordinal);
foreach (var e in order.Edges) foreach (var e in order.Edges)
{ {
if (!nodeIds.Contains(e.StartNodeId) || if (string.IsNullOrWhiteSpace(e.StartNodeId) ||
!nodeIds.Contains(e.EndNodeId)) string.IsNullOrWhiteSpace(e.EndNodeId))
{
throw new Exception( throw new Exception(
$"Edge '{e.EdgeId}' references unknown node." $"Edge '{e.EdgeId}' must define both StartNodeId and EndNodeId."
);
}
if (!nodeIds.Contains(e.StartNodeId))
throw new Exception(
$"Edge '{e.EdgeId}' references unknown StartNodeId '{e.StartNodeId}'."
);
if (!nodeIds.Contains(e.EndNodeId))
throw new Exception(
$"Edge '{e.EdgeId}' references unknown EndNodeId '{e.EndNodeId}'."
); );
} }
} }

View File

@@ -1,7 +1,7 @@
<MudPaper Class="pa-4 h-100 d-flex flex-column" Elevation="2"> <MudPaper Class="pa-4 h-100 d-flex flex-column overflow-hidden" Elevation="2">
<MudStack Row AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween" <MudStack Row AlignItems="AlignItems.Center" Justify="Justify.SpaceBetween"
Class="mb-4 flex-shrink-0"> Class="mb-4 flex-shrink-0">
<MudText Typo="Typo.h6">📄 JSON Output (/order)</MudText> <MudText Typo="Typo.h6">Output (/order)</MudText>
<div class="d-flex gap-2"> <div class="d-flex gap-2">
@@ -14,6 +14,16 @@
Import JSON Import JSON
</MudButton> </MudButton>
<!-- CANCEL -->
<MudButton Variant="Variant.Filled"
Color="@CancelButtonColor"
StartIcon="@CancelButtonIcon"
Disabled="@DisableCancel"
OnClick="OnCancel">
@CancelButtonText
</MudButton>
<!-- SEND --> <!-- SEND -->
<MudButton Variant="Variant.Filled" <MudButton Variant="Variant.Filled"
Color="@SendButtonColor" Color="@SendButtonColor"
@@ -27,7 +37,6 @@
<MudTooltip Text="@(Copied ? "Copied!" : "Copy to clipboard")"> <MudTooltip Text="@(Copied ? "Copied!" : "Copy to clipboard")">
<MudButton Variant="Variant.Filled" <MudButton Variant="Variant.Filled"
Color="@(Copied ? Color.Success : Color.Primary)" Color="@(Copied ? Color.Success : Color.Primary)"
Size="Size.Small"
StartIcon="@(Copied ? Icons.Material.Filled.Check : Icons.Material.Filled.ContentCopy)" StartIcon="@(Copied ? Icons.Material.Filled.Check : Icons.Material.Filled.ContentCopy)"
OnClick="OnCopy"> OnClick="OnCopy">
@(Copied ? "Copied!" : "Copy") @(Copied ? "Copied!" : "Copy")
@@ -36,12 +45,13 @@
</div> </div>
</MudStack> </MudStack>
<div class="flex-grow-1" style="overflow:auto;"> <div class="flex-grow-1">
<MudTextField Value="@OrderJson" <MudTextField Value="@OrderJson"
ReadOnly T="string"
ValueChanged="OrderJsonChange"
Variant="Variant.Filled" Variant="Variant.Filled"
Lines="70" Immediate=true
Class="h-100" Lines="50"
Style="font-family: 'Roboto Mono', Consolas, monospace; Style="font-family: 'Roboto Mono', Consolas, monospace;
font-size: 0.85rem; font-size: 0.85rem;
background:#1e1e1e; background:#1e1e1e;
@@ -53,10 +63,15 @@
[Parameter] public string OrderJson { get; set; } = ""; [Parameter] public string OrderJson { get; set; } = "";
[Parameter] public bool Copied { get; set; } [Parameter] public bool Copied { get; set; }
[Parameter] public bool? SendSuccess { get; set; } [Parameter] public bool? SendSuccess { get; set; }
[Parameter] public bool DisableCancel { get; set; }
[Parameter] public bool? CancelSuccess { get; set; }
[Parameter] public EventCallback<string> OrderJsonChanged { get; set; }
[Parameter] public EventCallback OnCopy { get; set; } [Parameter] public EventCallback OnCopy { get; set; }
[Parameter] public EventCallback OnSend { get; set; } [Parameter] public EventCallback OnSend { get; set; }
[Parameter] public EventCallback OnImport { get; set; } [Parameter] public EventCallback OnImport { get; set; }
[Parameter] public EventCallback OnCancel { get; set; }
private string SendButtonText => private string SendButtonText =>
SendSuccess switch SendSuccess switch
@@ -81,4 +96,36 @@
false => Icons.Material.Filled.Error, false => Icons.Material.Filled.Error,
_ => Icons.Material.Filled.Send _ => Icons.Material.Filled.Send
}; };
private string CancelButtonText =>
CancelSuccess switch
{
true => "Done",
false => "Error",
_ => "Cancel"
};
private Color CancelButtonColor =>
CancelSuccess switch
{
true => Color.Success,
false => Color.Error,
_ => Color.Error
};
private string CancelButtonIcon =>
CancelSuccess switch
{
true => Icons.Material.Filled.CheckCircle,
false => Icons.Material.Filled.Error,
_ => Icons.Material.Filled.Cancel
};
private void OrderJsonChange(string value)
{
OrderJson = value;
OrderJsonChanged.InvokeAsync(OrderJson);
StateHasChanged();
}
} }

View File

@@ -21,13 +21,11 @@
<MudIconButton Icon="@Icons.Material.Filled.Edit" <MudIconButton Icon="@Icons.Material.Filled.Edit"
Color="Color.Primary" Color="Color.Primary"
Size="Size.Small" Size="Size.Small"
OnClick="@(() => EditNodeAsync(node))" OnClick="@(() => EditNodeAsync(node))" />
StopPropagation />
<MudIconButton Icon="@Icons.Material.Filled.Delete" <MudIconButton Icon="@Icons.Material.Filled.Delete"
Color="Color.Error" Color="Color.Error"
Size="Size.Small" Size="Size.Small"
OnClick="@(() => RemoveNodeAsync(node))" OnClick="@(() => RemoveNodeAsync(node))" />
StopPropagation />
</div> </div>
</div> </div>
</TitleContent> </TitleContent>
@@ -44,21 +42,22 @@
</MudItem> </MudItem>
<!-- Sequence --> <!-- Sequence -->
<MudItem xs="12"> @* <MudItem xs="12">
<MudNumericField T="int" <MudNumericField T="int"
Value="@node.SequenceId" Value="@node.SequenceId"
ValueChanged="@((int v) => SetValue(() => node.SequenceId = v))" ValueChanged="@((int v) => SetValue(() => node.SequenceId = v))"
Immediate="true" Immediate="true"
Label="Sequence ID" /> Label="Sequence ID" />
</MudItem> </MudItem> *@
<!-- Released --> <!-- Released -->
<MudItem xs="12"> @* <MudItem xs="12">
<MudSwitch T="bool" <MudSwitch T="bool"
Checked="@node.Released" Checked="@node.Released"
CheckedChanged="@((bool v) => SetValue(() => node.Released = v))" CheckedChanged="@((bool v) => SetValue(() => node.Released = v))"
Label="Released" /> Label="Released" />
</MudItem>
</MudItem> *@
<!-- Position --> <!-- Position -->
<MudItem xs="6"> <MudItem xs="6">
@@ -77,22 +76,22 @@
Label="Y" /> Label="Y" />
</MudItem> </MudItem>
<MudItem xs="12"> @* <MudItem xs="12">
<MudTextField Value="@node.NodePosition.MapId" <MudTextField Value="@node.NodePosition.MapId"
ValueChanged="@((string v) => SetValue(() => node.NodePosition.MapId = v))" ValueChanged="@((string v) => SetValue(() => node.NodePosition.MapId = v))"
Immediate="true" Immediate="true"
Label="Map ID" /> Label="Map ID" />
</MudItem> </MudItem> *@
<MudItem xs="6"> @* <MudItem xs="6">
<MudNumericField T="double" <MudNumericField T="double"
Value="@node.NodePosition.Theta" Value="@node.NodePosition.Theta"
ValueChanged="@((double v) => SetValue(() => node.NodePosition.Theta = v))" ValueChanged="@((double v) => SetValue(() => node.NodePosition.Theta = v))"
Immediate="true" Immediate="true"
Label="Theta (rad)" /> Label="Theta (rad)" />
</MudItem> </MudItem> *@
<MudItem xs="6"> @* <MudItem xs="6">
<MudNumericField T="double" <MudNumericField T="double"
Value="@node.NodePosition.AllowedDeviationXY" Value="@node.NodePosition.AllowedDeviationXY"
ValueChanged="@((double v) => SetValue(() => node.NodePosition.AllowedDeviationXY = v))" ValueChanged="@((double v) => SetValue(() => node.NodePosition.AllowedDeviationXY = v))"
@@ -106,7 +105,7 @@
ValueChanged="@((double v) => SetValue(() => node.NodePosition.AllowedDeviationTheta = v))" ValueChanged="@((double v) => SetValue(() => node.NodePosition.AllowedDeviationTheta = v))"
Immediate="true" Immediate="true"
Label="Allowed Dev Theta" /> Label="Allowed Dev Theta" />
</MudItem> </MudItem> *@
<!-- Actions --> <!-- Actions -->
<MudItem xs="12"> <MudItem xs="12">

View File

@@ -1,6 +1,5 @@
@page "/robot-order" @page "/robot-order"
@attribute [Authorize]
@rendermode InteractiveWebAssemblyNoPrerender @rendermode InteractiveWebAssemblyNoPrerender
@using System.Text.Json @using System.Text.Json
@@ -9,6 +8,7 @@
@inject IJSRuntime JS @inject IJSRuntime JS
@inject IDialogService DialogService @inject IDialogService DialogService
@inject HttpClient Http @inject HttpClient Http
@inject ISnackbar Snackbar
<MudMainContent Class="pa-0 ma-0"> <MudMainContent Class="pa-0 ma-0">
<div style="height:100vh; overflow:hidden;"> <div style="height:100vh; overflow:hidden;">
@@ -37,7 +37,6 @@
<EdgesPanel Order="Order" <EdgesPanel Order="Order"
OnAddEdge="AddEdge" OnAddEdge="AddEdge"
OnRemoveEdge="RemoveEdge" OnRemoveEdge="RemoveEdge"
OnApplyCurve="ApplyCurve"
OnOrderChanged="OnOrderChanged" /> OnOrderChanged="OnOrderChanged" />
</MudItem> </MudItem>
@@ -46,13 +45,14 @@
<!-- ================= RIGHT ================= --> <!-- ================= RIGHT ================= -->
<MudItem xs="12" md="5" Class="h-100"> <MudItem xs="12" md="5" Class="h-100">
<JsonOutputPanel OrderJson="@OrderJson" <JsonOutputPanel @bind-OrderJson="@OrderJson"
Copied="@copied" Copied="@copied"
SendSuccess="@sendSuccess" SendSuccess="@sendSuccess"
CancelSuccess="@cancelSuccess"
OnCopy="CopyJsonToClipboard" OnCopy="CopyJsonToClipboard"
OnSend="SendOrderToServer" OnSend="SendOrderToServer"
OnImport="OpenImportDialog" /> OnImport="OpenImportDialog"
OnCancel="CancelOrder" />
</MudItem> </MudItem>
</MudGrid> </MudGrid>
@@ -66,7 +66,7 @@
private string OrderJson = ""; // 🔥 CACHE JSON (QUAN TRỌNG) private string OrderJson = ""; // 🔥 CACHE JSON (QUAN TRỌNG)
private bool copied; private bool copied;
private bool? sendSuccess; private bool? sendSuccess;
private bool sending; private bool? cancelSuccess;
private CancellationTokenSource? _copyCts; private CancellationTokenSource? _copyCts;
// ================= INIT ================= // ================= INIT =================
@@ -83,9 +83,10 @@
new JsonSerializerOptions new JsonSerializerOptions
{ {
WriteIndented = true, WriteIndented = true,
DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
}); });
} }
private async Task OpenImportDialog() private async Task OpenImportDialog()
{ {
var dialog = await DialogService.ShowAsync<ImportOrderDialog>( var dialog = await DialogService.ShowAsync<ImportOrderDialog>(
@@ -98,9 +99,9 @@
var result = await dialog.Result; var result = await dialog.Result;
if (!result.Canceled && result.Data is OrderMessage imported) if (result is not null && !result.Canceled && result.Data is OrderMsg imported)
{ {
Order = imported; Order.Import(imported);
RebuildOrderJson(); RebuildOrderJson();
StateHasChanged(); StateHasChanged();
} }
@@ -148,7 +149,7 @@
? Order.Nodes[1].NodeId ? Order.Nodes[1].NodeId
: start; // 👈 1 node thì start = end : start; // 👈 1 node thì start = end
Order.Edges.Add(new UiEdge Order.Edges.Add(new VDA5050.Order.Edge
{ {
EdgeId = $"EDGE_{Order.Edges.Count + 1}", EdgeId = $"EDGE_{Order.Edges.Count + 1}",
StartNodeId = start, StartNodeId = start,
@@ -157,25 +158,10 @@
} }
void RemoveEdge(UiEdge edge) void RemoveEdge(VDA5050.Order.Edge edge)
{ {
Order.Edges.Remove(edge); Order.Edges.Remove(edge);
} }
void ApplyCurve(UiEdge edge)
{
if (edge.Radius <= 0 || edge.Expanded) return;
var startNode = Order.Nodes.First(n => n.NodeId == edge.StartNodeId);
var newNode = OrderMessage.CreateCurveNode(startNode, edge);
Order.Nodes.Add(newNode);
edge.EndNodeId = newNode.NodeId;
edge.MarkExpanded(); // ✅
ResequenceNodes();
}
// ================= ACTION ================= // ================= ACTION =================
void AddAction(Node node) void AddAction(Node node)
{ {
@@ -192,22 +178,19 @@
void RemoveAction(Node node, VDA5050.InstantAction.Action action) void RemoveAction(Node node, VDA5050.InstantAction.Action action)
{ {
node.Actions = node.Actions?.Where(a => a != action).ToArray() node.Actions = node.Actions?.Where(a => a != action).ToArray() ?? [];
?? Array.Empty<VDA5050.InstantAction.Action>();
} }
void AddActionParameter(VDA5050.InstantAction.Action act) void AddActionParameter(VDA5050.InstantAction.Action act)
{ {
var list = (act.ActionParameters ?? Array.Empty<ActionParameter>()).ToList(); var list = (act.ActionParameters ?? []).ToList();
list.Add(new UiActionParameter()); list.Add(new UiActionParameter());
act.ActionParameters = list.ToArray(); act.ActionParameters = list.ToArray();
} }
void RemoveActionParameter(VDA5050.InstantAction.Action act, ActionParameter param) void RemoveActionParameter(VDA5050.InstantAction.Action act, ActionParameter param)
{ {
act.ActionParameters = act.ActionParameters = act.ActionParameters?.Where(p => p != param).ToArray() ?? [];
act.ActionParameters?.Where(p => p != param).ToArray()
?? Array.Empty<ActionParameter>();
} }
// ================= SEND / COPY ================= // ================= SEND / COPY =================
@@ -219,16 +202,53 @@
try try
{ {
var response = await Http.PostAsJsonAsync( var orderMsg = JsonSerializer.Deserialize<OrderMsg>(OrderJson,
"/api/order", new JsonSerializerOptions
JsonSerializer.Deserialize<JsonElement>(OrderJson) {
); WriteIndented = true,
PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
});
if (orderMsg is null)
{
Snackbar.Add("Unable to convert JSON to Order", Severity.Warning);
return;
}
if (orderMsg.Nodes.Length < 1)
{
Snackbar.Add("The order must contain at least one node (number of nodes > 0)", Severity.Warning);
return;
}
if (orderMsg.Nodes.Length - 1 != orderMsg.Edges.Length)
{
Snackbar.Add("Order must have a number of edges equal to the number of nodes minus 1", Severity.Warning);
return;
}
foreach(var edge in orderMsg.Edges)
{
if (!orderMsg.Nodes.Any(n => n.NodeId == edge.StartNodeId))
{
Snackbar.Add($"The edge {edge.EdgeId} references a startNodeId {edge.StartNodeId} that does not exist in the list of nodes", Severity.Warning);
return;
}
if (!orderMsg.Nodes.Any(n => n.NodeId == edge.EndNodeId))
{
Snackbar.Add($"The edge {edge.EdgeId} references a startNodeId {edge.EndNodeId} that does not exist in the list of nodes", Severity.Warning);
return;
}
}
var response = await Http.PostAsJsonAsync("/api/order",orderMsg);
sendSuccess = response.IsSuccessStatusCode; sendSuccess = response.IsSuccessStatusCode;
}
catch(JsonException jsonEx)
{
Snackbar.Add($"Json to Order failed: {jsonEx.Message}", Severity.Warning);
} }
catch (Exception ex) catch (Exception ex)
{ {
Snackbar.Add($"Send Order failed: {ex.Message}", Severity.Warning);
sendSuccess = false; sendSuccess = false;
} }
@@ -246,6 +266,33 @@
}); });
} }
async Task CancelOrder()
{
// reset trạng thái trước khi gửi
cancelSuccess = null;
StateHasChanged();
try
{
var res = await Http.PostAsync("/api/order/cancel", null);
cancelSuccess = res.IsSuccessStatusCode;
}
catch
{
cancelSuccess = false;
}
StateHasChanged();
// 🔥 AUTO RESET SAU 2 GIÂY
_ = Task.Run(async () =>
{
await Task.Delay(2000);
cancelSuccess = null;
await InvokeAsync(StateHasChanged);
});
}
async Task CopyJsonToClipboard() async Task CopyJsonToClipboard()
@@ -253,7 +300,7 @@
_copyCts?.Cancel(); _copyCts?.Cancel();
_copyCts = new(); _copyCts = new();
await JS.InvokeVoidAsync("navigator.clipboard.writeText", OrderJson); await JS.InvokeVoidAsync("copyToClipboardFallback", OrderJson);
copied = true; copied = true;
StateHasChanged(); StateHasChanged();

View File

@@ -1,6 +1,5 @@
@page "/robot-config" @page "/robot-config"
@rendermode InteractiveWebAssemblyNoPrerender @rendermode InteractiveWebAssemblyNoPrerender
@attribute [Authorize]
@inject HttpClient Http @inject HttpClient Http
@inject ISnackbar Snackbar @inject ISnackbar Snackbar

View File

@@ -560,10 +560,14 @@ public partial class RobotConfigManager
private async Task LoadConfig() private async Task LoadConfig()
{ {
IsLoading = true;
StateHasChanged();
var response = await (await Http.PostAsync($"api/RobotConfigs/load", null)).Content.ReadFromJsonAsync<MessageResult>(); var response = await (await Http.PostAsync($"api/RobotConfigs/load", null)).Content.ReadFromJsonAsync<MessageResult>();
if (response is null) Snackbar.Add("Failed to load config", Severity.Warning); if (response is null) Snackbar.Add("Failed to load config", Severity.Warning);
else if (!response.IsSuccess) Snackbar.Add(response.Message ?? "Failed to load config", Severity.Warning); else if (!response.IsSuccess) Snackbar.Add(response.Message ?? "Failed to load config", Severity.Warning);
else Snackbar.Add("Config loaded", Severity.Success); else Snackbar.Add("Config loaded", Severity.Success);
IsLoading = false;
StateHasChanged(); StateHasChanged();
} }
} }

View File

@@ -1,6 +1,5 @@
@page "/robot-monitor" @page "/robot-monitor"
@rendermode InteractiveWebAssemblyNoPrerender @rendermode InteractiveWebAssemblyNoPrerender
@attribute [Authorize]
@inject RobotApp.Client.Services.RobotMonitorService MonitorService @inject RobotApp.Client.Services.RobotMonitorService MonitorService
@implements IAsyncDisposable @implements IAsyncDisposable
@@ -18,6 +17,7 @@
protected override async Task OnAfterRenderAsync(bool firstRender) protected override async Task OnAfterRenderAsync(bool firstRender)
{ {
await base.OnAfterRenderAsync(firstRender);
if (firstRender) if (firstRender)
{ {
MonitorService.OnDataReceived += OnMonitorDataReceived; MonitorService.OnDataReceived += OnMonitorDataReceived;
@@ -29,7 +29,8 @@
{ {
_monitorData = data; _monitorData = data;
RobotMonitorViewRef?.UpdatePath(); RobotMonitorViewRef?.UpdatePath();
InvokeAsync(StateHasChanged); RobotMonitorViewRef?.OnMonitorDataUpdated();
StateHasChanged();
} }
public async ValueTask DisposeAsync() public async ValueTask DisposeAsync()
@@ -39,3 +40,12 @@
} }
} }

View File

@@ -7,7 +7,7 @@ using System.Text.Json;
namespace RobotApp.Client.Services; namespace RobotApp.Client.Services;
// ================= CONNECTION STATE ================= // ================= SIGNALR CONNECTION STATE =================
public enum RobotClientState public enum RobotClientState
{ {
Disconnected, Disconnected,
@@ -16,7 +16,7 @@ public enum RobotClientState
Reconnecting Reconnecting
} }
// ================= CLIENT ================= // ================= ROBOT STATE CLIENT =================
public sealed class RobotStateClient : IAsyncDisposable public sealed class RobotStateClient : IAsyncDisposable
{ {
private readonly NavigationManager _nav; private readonly NavigationManager _nav;
@@ -25,11 +25,17 @@ public sealed class RobotStateClient : IAsyncDisposable
private readonly object _lock = new(); private readonly object _lock = new();
private bool _started; private bool _started;
// ================= STATE CACHE =================
public ConcurrentDictionary<string, StateMsg> LatestStates { get; } = new(); public ConcurrentDictionary<string, StateMsg> LatestStates { get; } = new();
// ================= ROBOT CONNECTION =================
private bool _isRobotConnected;
public bool IsRobotConnected => _isRobotConnected;
// ================= EVENTS ================= // ================= EVENTS =================
public event Action<string, StateMsg>? OnStateReceived; public event Action<string, StateMsg>? OnStateReceived;
public event Action<StateMsg>? OnStateReceivedAny; public event Action<StateMsg>? OnStateReceivedAny;
public event Action<bool>? OnRobotConnectionChanged;
public event Action<RobotClientState>? OnConnectionStateChanged; public event Action<RobotClientState>? OnConnectionStateChanged;
public RobotClientState ConnectionState { get; private set; } = RobotClientState.Disconnected; public RobotClientState ConnectionState { get; private set; } = RobotClientState.Disconnected;
@@ -43,7 +49,8 @@ public sealed class RobotStateClient : IAsyncDisposable
// ================= STATE HELPER ================= // ================= STATE HELPER =================
private void SetState(RobotClientState state) private void SetState(RobotClientState state)
{ {
if (ConnectionState == state) return; if (ConnectionState == state)
return;
ConnectionState = state; ConnectionState = state;
OnConnectionStateChanged?.Invoke(state); OnConnectionStateChanged?.Invoke(state);
@@ -82,9 +89,10 @@ public sealed class RobotStateClient : IAsyncDisposable
return Task.CompletedTask; return Task.CompletedTask;
}; };
_connection.Closed += async error => _connection.Closed += async _ =>
{ {
_started = false; _started = false;
SetState(RobotClientState.Disconnected);
if (_connection != null) if (_connection != null)
{ {
@@ -96,7 +104,13 @@ public sealed class RobotStateClient : IAsyncDisposable
} }
}; };
_connection.On<string>("ReceiveState", HandleState); // ================= SIGNALR HANDLERS =================
// VDA5050 State
_connection.On<StateMsg>("ReceiveState", HandleState);
// Robot connection (bool only)
_connection.On<bool>("ReceiveRobotConnection", HandleRobotConnection);
try try
{ {
@@ -111,22 +125,8 @@ public sealed class RobotStateClient : IAsyncDisposable
} }
// ================= HANDLE STATE ================= // ================= HANDLE STATE =================
private void HandleState(string stateJson) private void HandleState(StateMsg state)
{ {
StateMsg? state;
try
{
state = JsonSerializer.Deserialize<StateMsg>(
stateJson,
JsonOptionExtends.Read
);
}
catch
{
return;
}
if (state?.SerialNumber == null) if (state?.SerialNumber == null)
return; return;
@@ -136,6 +136,13 @@ public sealed class RobotStateClient : IAsyncDisposable
OnStateReceivedAny?.Invoke(state); OnStateReceivedAny?.Invoke(state);
} }
// ================= HANDLE ROBOT CONNECTION =================
private void HandleRobotConnection(bool isConnected)
{
_isRobotConnected = isConnected;
OnRobotConnectionChanged?.Invoke(isConnected);
}
// ================= SUBSCRIBE ================= // ================= SUBSCRIBE =================
public async Task SubscribeRobotAsync(string serialNumber) public async Task SubscribeRobotAsync(string serialNumber)
{ {
@@ -164,19 +171,21 @@ public sealed class RobotStateClient : IAsyncDisposable
} }
LatestStates.TryRemove(serialNumber, out _); LatestStates.TryRemove(serialNumber, out _);
_isRobotConnected = false;
} }
// ================= GET CACHE ================= // ================= GET CACHE =================
public StateMsg? GetLatestState(string serialNumber) public StateMsg? GetLatestState()
{ {
LatestStates.TryGetValue(serialNumber, out var state); if (!LatestStates.IsEmpty) return LatestStates.First().Value;
return state; return null;
} }
// ================= DISPOSE ================= // ================= DISPOSE =================
public async ValueTask DisposeAsync() public async ValueTask DisposeAsync()
{ {
_started = false; _started = false;
_isRobotConnected = false;
SetState(RobotClientState.Disconnected); SetState(RobotClientState.Disconnected);
if (_connection != null) if (_connection != null)

View File

@@ -1,409 +1,63 @@
using RobotApp.VDA5050.InstantAction; using RobotApp.VDA5050.InstantAction;
using RobotApp.VDA5050.Order; using RobotApp.VDA5050.Order;
using System.Text.Json;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
namespace RobotApp.Client.Services; namespace RobotApp.Client.Services;
// ======================================================
// EDGE UI
// ======================================================
public class UiEdge
{
public string EdgeId { get; set; } = "";
public int SequenceId { get; set; }
public bool Released { get; set; } = true;
public string StartNodeId { get; set; } = "";
public string EndNodeId { get; set; } = "";
// ===== CURVE (EDITOR GENERATED) =====
public double Radius { get; set; } = 0;
public Quadrant Quadrant { get; set; }
// ===== IMPORTED TRAJECTORY =====
public bool HasTrajectory { get; set; } = false;
public UiTrajectory? Trajectory { get; set; }
// ===== UI STATE =====
public bool Expanded { get; private set; } = false;
public void MarkExpanded()
{
Expanded = true;
}
}
public class UiTrajectory
{
public int Degree { get; set; }
public double[] KnotVector { get; set; } = Array.Empty<double>();
public List<Point> ControlPoints { get; set; } = new();
}
public enum Quadrant
{
I,
II,
III,
IV
}
// ======================================================
// GEOMETRY MODELS
// ======================================================
public record Point(double X, double Y);
public record QuarterResult(
Point EndPoint,
object Trajectory
);
// ======================================================
// GEOMETRY HELPER (QUARTER CIRCLE)
// ======================================================
public static class QuarterGeometry
{
private const double K = 0.5522847498307936;
public static QuarterResult BuildQuarterTrajectory(
Point A,
double r,
Quadrant q
)
{
Point P1, P2, C;
switch (q)
{
case Quadrant.I:
P1 = new(A.X, A.Y + K * r);
P2 = new(A.X + K * r, A.Y + r);
C = new(A.X + r, A.Y + r);
break;
case Quadrant.II:
P1 = new(A.X - K * r, A.Y);
P2 = new(A.X - r, A.Y + K * r);
C = new(A.X - r, A.Y + r);
break;
case Quadrant.III:
P1 = new(A.X, A.Y - K * r);
P2 = new(A.X - K * r, A.Y - r);
C = new(A.X - r, A.Y - r);
break;
case Quadrant.IV:
P1 = new(A.X + K * r, A.Y);
P2 = new(A.X + r, A.Y - K * r);
C = new(A.X + r, A.Y - r);
break;
default:
throw new ArgumentOutOfRangeException(nameof(q));
}
return new QuarterResult(
C,
new
{
degree = 3,
knotVector = new[] { 0, 0, 0, 0, 1, 1, 1, 1 },
controlPoints = new[]
{
new { x = A.X, y = A.Y }, // P0
new { x = P1.X, y = P1.Y }, // P1
new { x = P2.X, y = P2.Y }, // P2
new { x = C.X, y = C.Y } // P3
}
}
);
}
}
// ====================================================== // ======================================================
// ORDER MESSAGE // ORDER MESSAGE
// ====================================================== // ======================================================
public class OrderMessage public class OrderMessage
{ {
public int HeaderId { get; set; } public uint HeaderId { get; set; }
public string Timestamp { get; set; } = ""; public string Timestamp { get; set; } = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
public string Version { get; set; } = "v1"; public string Version { get; set; } = "2.1.0";
public string Manufacturer { get; set; } = "PNKX"; public string Manufacturer { get; set; } = "PhenikaaX";
public string SerialNumber { get; set; } = "T800-002"; public string SerialNumber { get; set; } = "T800-003";
public string OrderId { get; set; } = Guid.NewGuid().ToString(); public string OrderId { get; set; } = "";
public int OrderUpdateId { get; set; } public int OrderUpdateId { get; set; }
public string? ZoneSetId { get; set; } public string? ZoneSetId { get; set; }
public List<Node> Nodes { get; set; } = new(); public List<Node> Nodes { get; set; } = [];
public List<UiEdge> Edges { get; set; } = new(); public List<Edge> Edges { get; set; } = [];
public static Node CreateCurveNode(Node startNode, UiEdge edge)
public OrderMsg ToSchemaObject()
{ {
var A = new Point( return new OrderMsg
startNode.NodePosition.X,
startNode.NodePosition.Y
);
var result = QuarterGeometry.BuildQuarterTrajectory(
A,
edge.Radius,
edge.Quadrant
);
return new Node
{ {
NodeId = $"NODE_C{Guid.NewGuid():N}".Substring(0, 12), HeaderId = (uint)HeaderId++,
Released = true,
NodePosition = new NodePosition
{
X = result.EndPoint.X,
Y = result.EndPoint.Y,
Theta = startNode.NodePosition.Theta,
MapId = startNode.NodePosition.MapId
}
};
}
public static OrderMessage FromSchemaObject(JsonElement root)
{
var order = new OrderMessage
{
HeaderId = root.GetProperty("headerId").GetInt32(),
Timestamp = root.GetProperty("timestamp").GetString(),
Version = root.GetProperty("version").GetString(),
Manufacturer = root.GetProperty("manufacturer").GetString(),
SerialNumber = root.GetProperty("serialNumber").GetString(),
OrderId = root.GetProperty("orderId").GetString(),
OrderUpdateId = root.GetProperty("orderUpdateId").GetInt32()
};
// ================= NODES ================= Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ"),
foreach (var n in root.GetProperty("nodes").EnumerateArray())
{
var node = new Node
{
NodeId = n.GetProperty("nodeId").GetString()!,
SequenceId = n.GetProperty("sequenceId").GetInt32(),
Released = n.GetProperty("released").GetBoolean(),
NodePosition = new NodePosition Version = Version,
{ Manufacturer = Manufacturer,
X = n.GetProperty("nodePosition").GetProperty("x").GetDouble(), SerialNumber = SerialNumber,
Y = n.GetProperty("nodePosition").GetProperty("y").GetDouble(),
Theta = n.GetProperty("nodePosition").GetProperty("theta").GetDouble(),
AllowedDeviationXY = n.GetProperty("nodePosition").GetProperty("allowedDeviationXY").GetDouble(),
AllowedDeviationTheta = n.GetProperty("nodePosition").GetProperty("allowedDeviationTheta").GetDouble(),
MapId = n.GetProperty("nodePosition").GetProperty("mapId").GetString()
},
Actions = ParseActions(n) OrderId = OrderId= Guid.NewGuid().ToString(),
}; OrderUpdateId = OrderUpdateId,
order.Nodes.Add(node); ZoneSetId = string.IsNullOrWhiteSpace(ZoneSetId)
}
foreach (var e in root.GetProperty("edges").EnumerateArray())
{
var edge = new UiEdge
{
EdgeId = e.GetProperty("edgeId").GetString()!,
SequenceId = e.GetProperty("sequenceId").GetInt32(),
Released = e.GetProperty("released").GetBoolean(),
StartNodeId = e.GetProperty("startNodeId").GetString()!,
EndNodeId = e.GetProperty("endNodeId").GetString()!,
};
// ===== IMPORT TRAJECTORY =====
if (e.TryGetProperty("trajectory", out var traj))
{
edge.HasTrajectory = true;
edge.Trajectory = new UiTrajectory
{
Degree = traj.GetProperty("degree").GetInt32(),
KnotVector = traj.GetProperty("knotVector")
.EnumerateArray()
.Select(x => x.GetDouble())
.ToArray(),
ControlPoints = traj.GetProperty("controlPoints")
.EnumerateArray()
.Select(p => new Point(
p.GetProperty("x").GetDouble(),
p.GetProperty("y").GetDouble()
))
.ToList()
};
// 🔥 IMPORTED CURVE → LOCK APPLY
edge.MarkExpanded();
}
order.Edges.Add(edge);
}
return order;
}
// ================= ACTION PARSER =================
private static VDA5050.InstantAction.Action[] ParseActions(JsonElement parent)
{
if (!parent.TryGetProperty("actions", out var acts))
return Array.Empty<VDA5050.InstantAction.Action>();
return acts.EnumerateArray().Select(a =>
new VDA5050.InstantAction.Action
{
ActionId = a.GetProperty("actionId").GetString(),
ActionType = a.GetProperty("actionType").GetString(),
BlockingType = a.GetProperty("blockingType").GetString(),
ActionParameters = a.TryGetProperty("actionParameters", out var ps)
? ps.EnumerateArray()
.Select(p => new ActionParameter
{
Key = p.GetProperty("key").GetString(),
Value = p.GetProperty("value").GetString()
})
.ToArray()
: Array.Empty<ActionParameter>()
}
).ToArray();
}
public object ToSchemaObject()
{
int seq = 0;
return new
{
headerId = HeaderId++,
timestamp = string.IsNullOrWhiteSpace(Timestamp)
? DateTime.UtcNow.ToString("O")
: Timestamp,
version = Version,
manufacturer = Manufacturer,
serialNumber = SerialNumber,
orderId = OrderId,
orderUpdateId = OrderUpdateId,
zoneSetId = string.IsNullOrWhiteSpace(ZoneSetId)
? null ? null
: ZoneSetId, : ZoneSetId,
// ================= NODES ================= Nodes = [..Nodes],
nodes = Nodes.Select(n => new Edges = [..Edges],
{
nodeId = n.NodeId,
sequenceId = seq++,
released = n.Released,
nodePosition = new
{
x = n.NodePosition.X,
y = n.NodePosition.Y,
theta = n.NodePosition.Theta,
allowedDeviationXY = n.NodePosition.AllowedDeviationXY,
allowedDeviationTheta = n.NodePosition.AllowedDeviationTheta,
mapId = string.IsNullOrWhiteSpace(n.NodePosition.MapId)
? "MAP_01"
: n.NodePosition.MapId
},
actions = n.Actions.Select(a => new
{
actionId = a.ActionId,
actionType = a.ActionType,
blockingType = a.BlockingType,
actionParameters = a.ActionParameters != null
? a.ActionParameters
.Select(p => new { key = p.Key, value = p.Value })
.ToArray()
: Array.Empty<object>()
}).ToArray()
}).ToArray(),
// ================= EDGES =================
edges = Edges.Select<UiEdge, object>(e =>
{
// =================================================
// 1⃣ IMPORTED TRAJECTORY (ƯU TIÊN CAO NHẤT)
// =================================================
if (e.HasTrajectory && e.Trajectory != null)
{
return new
{
edgeId = e.EdgeId,
sequenceId = seq++,
released = true,
startNodeId = e.StartNodeId,
endNodeId = e.EndNodeId,
trajectory = new
{
degree = e.Trajectory.Degree,
knotVector = e.Trajectory.KnotVector,
controlPoints = e.Trajectory.ControlPoints
.Select(p => new { x = p.X, y = p.Y })
.ToArray()
},
actions = Array.Empty<object>()
};
}
// =================================================
// 2⃣ STRAIGHT EDGE (KHÔNG CÓ CURVE)
// =================================================
if (e.Radius <= 0)
{
return new
{
edgeId = e.EdgeId,
sequenceId = seq++,
released = true,
startNodeId = e.StartNodeId,
endNodeId = e.EndNodeId,
actions = Array.Empty<object>()
};
}
// =================================================
// 3⃣ EDITOR GENERATED CURVE (RADIUS + QUADRANT)
// =================================================
var startNode = Nodes.First(n => n.NodeId == e.StartNodeId);
var A = new Point(
startNode.NodePosition.X,
startNode.NodePosition.Y
);
var result = QuarterGeometry.BuildQuarterTrajectory(
A,
e.Radius,
e.Quadrant
);
return new
{
edgeId = e.EdgeId,
sequenceId = seq++,
released = true,
startNodeId = e.StartNodeId,
endNodeId = e.EndNodeId,
trajectory = result.Trajectory,
actions = Array.Empty<object>()
};
}).ToArray()
}; };
} }
public void Import(OrderMsg order)
{
HeaderId = order.HeaderId;
Timestamp = order.Timestamp;
Version = order.Version;
Manufacturer = order.Manufacturer;
SerialNumber = order.SerialNumber;
OrderId = order.OrderId;
ZoneSetId = order.ZoneSetId;
OrderUpdateId = order.OrderUpdateId;
Nodes = [.. order.Nodes];
Edges = [.. order.Edges];
}
} }
// ====================================================== // ======================================================

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

View File

@@ -1 +1,10 @@
window.copyToClipboardFallback = function (text) {
const textarea = document.createElement('textarea');
textarea.value = text;
textarea.style.position = 'fixed';
textarea.style.opacity = '0';
document.body.appendChild(textarea);
textarea.select();
document.execCommand('copy');
document.body.removeChild(textarea);
}

View File

@@ -55,6 +55,31 @@ window.robotMonitor = {
} }
return `M ${startX} ${startY} L ${endX} ${endY}`; return `M ${startX} ${startY} L ${endX} ${endY}`;
},
// Load image and get dimensions
loadImageAndGetDimensions: function (imageUrl) {
return new Promise((resolve, reject) => {
const img = new Image();
img.onload = () => {
resolve({
Width: img.naturalWidth || img.width,
Height: img.naturalHeight || img.height
});
};
img.onerror = () => {
reject(new Error(`Failed to load image: ${imageUrl}`));
};
img.src = imageUrl;
});
} }
}; };

View File

@@ -2,7 +2,6 @@
namespace RobotApp.VDA5050.Order; namespace RobotApp.VDA5050.Order;
#nullable disable
public class Edge public class Edge
{ {
@@ -26,7 +25,7 @@ public class Edge
public bool RotationAllowed { get; set; } public bool RotationAllowed { get; set; }
public double MaxRotationSpeed { get; set; } public double MaxRotationSpeed { get; set; }
public double Length { get; set; } public double Length { get; set; }
public Trajectory Trajectory { get; set; } public Trajectory? Trajectory { get; set; }
public Corridor Corridor { get; set; } = new(); public Corridor Corridor { get; set; } = new();
[Required] [Required]
public InstantAction.Action[] Actions { get; set; } = []; public InstantAction.Action[] Actions { get; set; } = [];

View File

@@ -13,5 +13,5 @@ public class EdgeState
public string EdgeDescription { get; set; } = string.Empty; public string EdgeDescription { get; set; } = string.Empty;
[Required] [Required]
public bool Released { get; set; } public bool Released { get; set; }
public Trajectory Trajectory { get; set; } = new(); public Trajectory? Trajectory { get; set; }
} }

View File

@@ -21,7 +21,7 @@ public enum ActionType
//liftUp, //liftUp,
//liftDown, //liftDown,
//liftRotate, //liftRotate,
//rotate, rotate,
//rotateKeepLift, //rotateKeepLift,
//mutedBaseOn, //mutedBaseOn,
//mutedBaseOff, //mutedBaseOff,

View File

@@ -18,18 +18,22 @@ namespace RobotApp.Components.Account
[DoesNotReturn] [DoesNotReturn]
public void RedirectTo(string? uri) public void RedirectTo(string? uri)
{ {
uri ??= ""; try
// Prevent open redirects.
if (!Uri.IsWellFormedUriString(uri, UriKind.Relative))
{ {
uri = navigationManager.ToBaseRelativePath(uri); uri ??= "/";
}
// During static rendering, NavigateTo throws a NavigationException which is handled by the framework as a redirect. // Prevent open redirects.
// So as long as this is called from a statically rendered Identity component, the InvalidOperationException is never thrown. if (!Uri.IsWellFormedUriString(uri, UriKind.Relative))
navigationManager.NavigateTo(uri); {
throw new InvalidOperationException($"{nameof(IdentityRedirectManager)} can only be used during static rendering."); uri = navigationManager.ToBaseRelativePath(uri);
}
// During static rendering, NavigateTo throws a NavigationException which is handled by the framework as a redirect.
// So as long as this is called from a statically rendered Identity component, the InvalidOperationException is never thrown.
navigationManager.NavigateTo(uri);
throw new InvalidOperationException($"{nameof(IdentityRedirectManager)} can only be used during static rendering.");
}
catch (NavigationException) { }
} }
[DoesNotReturn] [DoesNotReturn]

View File

@@ -42,6 +42,7 @@
<script src="@Assets["_content/MudBlazor/MudBlazor.min.js"]"></script> <script src="@Assets["_content/MudBlazor/MudBlazor.min.js"]"></script>
<script src="@Assets["js/canvas.js"]"></script> <script src="@Assets["js/canvas.js"]"></script>
<script src="@Assets["js/app.js"]"></script> <script src="@Assets["js/app.js"]"></script>
<script src="@Assets["js/robotMonitor.js"]"></script>
</body> </body>
</html> </html>

View File

@@ -1,7 +1,15 @@
@page "/home" @page "/"
@using Microsoft.AspNetCore.Authorization @using Microsoft.AspNetCore.Authorization
@rendermode InteractiveServer @rendermode InteractiveServer
@attribute [Authorize] @inject NavigationManager Nav
@* <h1>Welcome to RobotApp!</h1> *@
@code
{
protected override void OnAfterRender(bool firstRender)
{
base.OnAfterRender(firstRender);
if (firstRender) Nav.NavigateTo("/dashboard", forceLoad: true);
}
}

View File

@@ -6,7 +6,8 @@ namespace RobotApp.Controllers;
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
[Authorize] //[Authorize]
[AllowAnonymous]
public class FileController(Services.Logger<FileController> Logger) : ControllerBase public class FileController(Services.Logger<FileController> Logger) : ControllerBase
{ {
private readonly string certificatesPath = "MqttCertificates"; private readonly string certificatesPath = "MqttCertificates";

View File

@@ -5,6 +5,7 @@ namespace RobotApp.Controllers;
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
//[Authorize]
[AllowAnonymous] [AllowAnonymous]
public class ImagesController(Services.Logger<ImagesController> Logger) : ControllerBase public class ImagesController(Services.Logger<ImagesController> Logger) : ControllerBase
{ {

View File

@@ -5,7 +5,8 @@ namespace RobotApp.Controllers;
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
[Authorize] //[Authorize]
[AllowAnonymous]
public class LogsManagerController(Services.Logger<LogsManagerController> Logger) : ControllerBase public class LogsManagerController(Services.Logger<LogsManagerController> Logger) : ControllerBase
{ {
private readonly string LoggerDirectory = "logs"; private readonly string LoggerDirectory = "logs";

View File

@@ -1,5 +1,6 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Authorization;
using RobotApp.Services.Robot; using Microsoft.AspNetCore.Mvc;
using RobotApp.Interfaces;
using RobotApp.VDA5050.Order; using RobotApp.VDA5050.Order;
using System.Text.Json; using System.Text.Json;
@@ -7,30 +8,30 @@ namespace RobotApp.Controllers;
[ApiController] [ApiController]
[Route("api/order")] [Route("api/order")]
public class OrderController : ControllerBase //[Authorize]
[AllowAnonymous]
public class OrderController(IOrder robotOrderController, IInstantActions instantActions) : ControllerBase
{ {
private readonly RobotOrderController robotOrderController;
public OrderController(RobotOrderController robotOrderController)
{
this.robotOrderController = robotOrderController;
}
[HttpPost] [HttpPost]
public IActionResult SendOrder([FromBody] OrderMsg order) public IActionResult SendOrder([FromBody] OrderMsg order)
{ {
Console.WriteLine("===== ORDER RECEIVED =====");
Console.WriteLine(JsonSerializer.Serialize(order, new JsonSerializerOptions
{
WriteIndented = true
}));
robotOrderController.UpdateOrder(order); robotOrderController.UpdateOrder(order);
return Ok(new return Ok(new
{ {
success = true, success = true,
message = "Order received" message = "Order received"
}); });
} }
[HttpPost("cancel")]
public IActionResult CancelOrder()
{
robotOrderController.StopOrder();
instantActions.StopOrderAction();
return Ok(new
{
success = true,
message = "Order and actions have been cancelled"
});
}
} }

View File

@@ -10,7 +10,8 @@ namespace RobotApp.Controllers;
[Route("api/[controller]")] [Route("api/[controller]")]
[ApiController] [ApiController]
[Authorize] //[Authorize]
[AllowAnonymous]
public class RobotConfigsController(Services.Logger<RobotConfigsController> Logger, ApplicationDbContext AppDb, RobotConfiguration RobotConfiguration) : ControllerBase public class RobotConfigsController(Services.Logger<RobotConfigsController> Logger, ApplicationDbContext AppDb, RobotConfiguration RobotConfiguration) : ControllerBase
{ {
[HttpGet] [HttpGet]

View File

@@ -125,7 +125,7 @@ public static class ApplicationDbExtensions
{ {
ConfigName = "Default", ConfigName = "Default",
Description = "Default robot simulation configuration", Description = "Default robot simulation configuration",
EnableSimulation = false, EnableSimulation = true,
SimulationMaxVelocity = 1.5, SimulationMaxVelocity = 1.5,
SimulationMaxAngularVelocity = 0.5, SimulationMaxAngularVelocity = 0.5,
SimulationAcceleration = 2, SimulationAcceleration = 2,
@@ -155,6 +155,7 @@ public static class ApplicationDbExtensions
VDA5050EnableTls = false, VDA5050EnableTls = false,
VDA5050UserName = "robotics", VDA5050UserName = "robotics",
VDA5050Password = "robotics", VDA5050Password = "robotics",
VDA5050TopicPrefix = "uagv/v2",
IsActive = true, IsActive = true,
CreatedAt = DateTime.Now, CreatedAt = DateTime.Now,
UpdatedAt = DateTime.Now, UpdatedAt = DateTime.Now,

View File

@@ -1,279 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("00000000000000_CreateIdentitySchema")]
partial class CreateIdentitySchema
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.0")
.HasAnnotation("Relational:MaxIdentifierLength", 128);
SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("nvarchar(450)");
b.Property<int>("AccessFailedCount")
.HasColumnType("int");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("Text");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<bool>("EmailConfirmed")
.HasColumnType("bit");
b.Property<bool>("LockoutEnabled")
.HasColumnType("bit");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("datetimeoffset");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("PasswordHash")
.HasColumnType("Text");
b.Property<string>("PhoneNumber")
.HasColumnType("Text");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("bit");
b.Property<string>("SecurityStamp")
.HasColumnType("Text");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("bit");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex")
.HasFilter("[NormalizedUserName] IS NOT NULL");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRole", b =>
{
b.Property<string>("Id")
.HasColumnType("nvarchar(450)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("Text");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("nvarchar(256)");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex")
.HasFilter("[NormalizedName] IS NOT NULL");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<string>("ClaimType")
.HasColumnType("Text");
b.Property<string>("ClaimValue")
.HasColumnType("Text");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
b.Property<string>("ClaimType")
.HasColumnType("Text");
b.Property<string>("ClaimValue")
.HasColumnType("Text");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("nvarchar(450)");
b.Property<string>("ProviderKey")
.HasColumnType("nvarchar(450)");
b.Property<string>("ProviderDisplayName")
.HasColumnType("Text");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("nvarchar(450)");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.Property<string>("RoleId")
.HasColumnType("nvarchar(450)");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("nvarchar(450)");
b.Property<string>("LoginProvider")
.HasColumnType("nvarchar(450)");
b.Property<string>("Name")
.HasColumnType("nvarchar(450)");
b.Property<string>("Value")
.HasColumnType("Text");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("Microsoft.AspNetCore.Identity.IdentityRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,224 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Migrations
{
/// <inheritdoc />
public partial class CreateIdentitySchema : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "AspNetRoles",
columns: table => new
{
Id = table.Column<string>(type: "nvarchar(450)", nullable: false),
Name = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
NormalizedName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
ConcurrencyStamp = table.Column<string>(type: "Text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetRoles", x => x.Id);
});
migrationBuilder.CreateTable(
name: "AspNetUsers",
columns: table => new
{
Id = table.Column<string>(type: "nvarchar(450)", nullable: false),
UserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
NormalizedUserName = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
Email = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
NormalizedEmail = table.Column<string>(type: "nvarchar(256)", maxLength: 256, nullable: true),
EmailConfirmed = table.Column<bool>(type: "bit", nullable: false),
PasswordHash = table.Column<string>(type: "Text", nullable: true),
SecurityStamp = table.Column<string>(type: "Text", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "Text", nullable: true),
PhoneNumber = table.Column<string>(type: "Text", nullable: true),
PhoneNumberConfirmed = table.Column<bool>(type: "bit", nullable: false),
TwoFactorEnabled = table.Column<bool>(type: "bit", nullable: false),
LockoutEnd = table.Column<DateTimeOffset>(type: "datetimeoffset", nullable: true),
LockoutEnabled = table.Column<bool>(type: "bit", nullable: false),
AccessFailedCount = table.Column<int>(type: "int", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUsers", x => x.Id);
});
migrationBuilder.CreateTable(
name: "AspNetRoleClaims",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
RoleId = table.Column<string>(type: "nvarchar(450)", nullable: false),
ClaimType = table.Column<string>(type: "Text", nullable: true),
ClaimValue = table.Column<string>(type: "Text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
table.ForeignKey(
name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
column: x => x.RoleId,
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserClaims",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("SqlServer:Identity", "1, 1"),
UserId = table.Column<string>(type: "nvarchar(450)", nullable: false),
ClaimType = table.Column<string>(type: "Text", nullable: true),
ClaimValue = table.Column<string>(type: "Text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
table.ForeignKey(
name: "FK_AspNetUserClaims_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserLogins",
columns: table => new
{
LoginProvider = table.Column<string>(type: "nvarchar(450)", nullable: false),
ProviderKey = table.Column<string>(type: "nvarchar(450)", nullable: false),
ProviderDisplayName = table.Column<string>(type: "Text", nullable: true),
UserId = table.Column<string>(type: "nvarchar(450)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
table.ForeignKey(
name: "FK_AspNetUserLogins_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserRoles",
columns: table => new
{
UserId = table.Column<string>(type: "nvarchar(450)", nullable: false),
RoleId = table.Column<string>(type: "nvarchar(450)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
table.ForeignKey(
name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
column: x => x.RoleId,
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_AspNetUserRoles_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserTokens",
columns: table => new
{
UserId = table.Column<string>(type: "nvarchar(450)", nullable: false),
LoginProvider = table.Column<string>(type: "nvarchar(450)", nullable: false),
Name = table.Column<string>(type: "nvarchar(450)", nullable: false),
Value = table.Column<string>(type: "Text", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
table.ForeignKey(
name: "FK_AspNetUserTokens_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_AspNetRoleClaims_RoleId",
table: "AspNetRoleClaims",
column: "RoleId");
migrationBuilder.CreateIndex(
name: "RoleNameIndex",
table: "AspNetRoles",
column: "NormalizedName",
unique: true,
filter: "[NormalizedName] IS NOT NULL");
migrationBuilder.CreateIndex(
name: "IX_AspNetUserClaims_UserId",
table: "AspNetUserClaims",
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_AspNetUserLogins_UserId",
table: "AspNetUserLogins",
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_AspNetUserRoles_RoleId",
table: "AspNetUserRoles",
column: "RoleId");
migrationBuilder.CreateIndex(
name: "EmailIndex",
table: "AspNetUsers",
column: "NormalizedEmail");
migrationBuilder.CreateIndex(
name: "UserNameIndex",
table: "AspNetUsers",
column: "NormalizedUserName",
unique: true,
filter: "[NormalizedUserName] IS NOT NULL");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "AspNetRoleClaims");
migrationBuilder.DropTable(
name: "AspNetUserClaims");
migrationBuilder.DropTable(
name: "AspNetUserLogins");
migrationBuilder.DropTable(
name: "AspNetUserRoles");
migrationBuilder.DropTable(
name: "AspNetUserTokens");
migrationBuilder.DropTable(
name: "AspNetRoles");
migrationBuilder.DropTable(
name: "AspNetUsers");
}
}
}

View File

@@ -1,268 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20250926020848_initDb")]
partial class initDb
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("ProviderKey")
.HasColumnType("TEXT");
b.Property<string>("ProviderDisplayName")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.HasColumnType("TEXT");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Value")
.HasColumnType("TEXT");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationRole", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<int>("AccessFailedCount")
.HasColumnType("INTEGER");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<bool>("EmailConfirmed")
.HasColumnType("INTEGER");
b.Property<bool>("LockoutEnabled")
.HasColumnType("INTEGER");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("TEXT");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("PasswordHash")
.HasColumnType("TEXT");
b.Property<string>("PhoneNumber")
.HasColumnType("TEXT");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("INTEGER");
b.Property<string>("SecurityStamp")
.HasColumnType("TEXT");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("INTEGER");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,721 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class initDb : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "UserNameIndex",
table: "AspNetUsers");
migrationBuilder.DropIndex(
name: "RoleNameIndex",
table: "AspNetRoles");
migrationBuilder.AlterColumn<string>(
name: "Value",
table: "AspNetUserTokens",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "AspNetUserTokens",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "LoginProvider",
table: "AspNetUserTokens",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserTokens",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "UserName",
table: "AspNetUsers",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<bool>(
name: "TwoFactorEnabled",
table: "AspNetUsers",
type: "INTEGER",
nullable: false,
oldClrType: typeof(bool),
oldType: "bit");
migrationBuilder.AlterColumn<string>(
name: "SecurityStamp",
table: "AspNetUsers",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<bool>(
name: "PhoneNumberConfirmed",
table: "AspNetUsers",
type: "INTEGER",
nullable: false,
oldClrType: typeof(bool),
oldType: "bit");
migrationBuilder.AlterColumn<string>(
name: "PhoneNumber",
table: "AspNetUsers",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "PasswordHash",
table: "AspNetUsers",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "NormalizedUserName",
table: "AspNetUsers",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "NormalizedEmail",
table: "AspNetUsers",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<DateTimeOffset>(
name: "LockoutEnd",
table: "AspNetUsers",
type: "TEXT",
nullable: true,
oldClrType: typeof(DateTimeOffset),
oldType: "datetimeoffset",
oldNullable: true);
migrationBuilder.AlterColumn<bool>(
name: "LockoutEnabled",
table: "AspNetUsers",
type: "INTEGER",
nullable: false,
oldClrType: typeof(bool),
oldType: "bit");
migrationBuilder.AlterColumn<bool>(
name: "EmailConfirmed",
table: "AspNetUsers",
type: "INTEGER",
nullable: false,
oldClrType: typeof(bool),
oldType: "bit");
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "AspNetUsers",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AspNetUsers",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "AccessFailedCount",
table: "AspNetUsers",
type: "INTEGER",
nullable: false,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AlterColumn<string>(
name: "Id",
table: "AspNetUsers",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "RoleId",
table: "AspNetUserRoles",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserRoles",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserLogins",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "ProviderDisplayName",
table: "AspNetUserLogins",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ProviderKey",
table: "AspNetUserLogins",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "LoginProvider",
table: "AspNetUserLogins",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserClaims",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "ClaimValue",
table: "AspNetUserClaims",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClaimType",
table: "AspNetUserClaims",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "AspNetUserClaims",
type: "INTEGER",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Sqlite:Autoincrement", true)
.OldAnnotation("Sqlite:Autoincrement", true);
migrationBuilder.AlterColumn<string>(
name: "NormalizedName",
table: "AspNetRoles",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "AspNetRoles",
type: "TEXT",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "nvarchar(256)",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AspNetRoles",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Id",
table: "AspNetRoles",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "RoleId",
table: "AspNetRoleClaims",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "nvarchar(450)");
migrationBuilder.AlterColumn<string>(
name: "ClaimValue",
table: "AspNetRoleClaims",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClaimType",
table: "AspNetRoleClaims",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "Text",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "AspNetRoleClaims",
type: "INTEGER",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Sqlite:Autoincrement", true)
.OldAnnotation("Sqlite:Autoincrement", true);
migrationBuilder.CreateIndex(
name: "UserNameIndex",
table: "AspNetUsers",
column: "NormalizedUserName",
unique: true);
migrationBuilder.CreateIndex(
name: "RoleNameIndex",
table: "AspNetRoles",
column: "NormalizedName",
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropIndex(
name: "UserNameIndex",
table: "AspNetUsers");
migrationBuilder.DropIndex(
name: "RoleNameIndex",
table: "AspNetRoles");
migrationBuilder.AlterColumn<string>(
name: "Value",
table: "AspNetUserTokens",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "AspNetUserTokens",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "LoginProvider",
table: "AspNetUserTokens",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserTokens",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "UserName",
table: "AspNetUsers",
type: "nvarchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<bool>(
name: "TwoFactorEnabled",
table: "AspNetUsers",
type: "bit",
nullable: false,
oldClrType: typeof(bool),
oldType: "INTEGER");
migrationBuilder.AlterColumn<string>(
name: "SecurityStamp",
table: "AspNetUsers",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<bool>(
name: "PhoneNumberConfirmed",
table: "AspNetUsers",
type: "bit",
nullable: false,
oldClrType: typeof(bool),
oldType: "INTEGER");
migrationBuilder.AlterColumn<string>(
name: "PhoneNumber",
table: "AspNetUsers",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "PasswordHash",
table: "AspNetUsers",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "NormalizedUserName",
table: "AspNetUsers",
type: "nvarchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "NormalizedEmail",
table: "AspNetUsers",
type: "nvarchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<DateTimeOffset>(
name: "LockoutEnd",
table: "AspNetUsers",
type: "datetimeoffset",
nullable: true,
oldClrType: typeof(DateTimeOffset),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<bool>(
name: "LockoutEnabled",
table: "AspNetUsers",
type: "bit",
nullable: false,
oldClrType: typeof(bool),
oldType: "INTEGER");
migrationBuilder.AlterColumn<bool>(
name: "EmailConfirmed",
table: "AspNetUsers",
type: "bit",
nullable: false,
oldClrType: typeof(bool),
oldType: "INTEGER");
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "AspNetUsers",
type: "nvarchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AspNetUsers",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "AccessFailedCount",
table: "AspNetUsers",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "INTEGER");
migrationBuilder.AlterColumn<string>(
name: "Id",
table: "AspNetUsers",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "RoleId",
table: "AspNetUserRoles",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserRoles",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserLogins",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "ProviderDisplayName",
table: "AspNetUserLogins",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ProviderKey",
table: "AspNetUserLogins",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "LoginProvider",
table: "AspNetUserLogins",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "UserId",
table: "AspNetUserClaims",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "ClaimValue",
table: "AspNetUserClaims",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClaimType",
table: "AspNetUserClaims",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "AspNetUserClaims",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "INTEGER")
.Annotation("Sqlite:Autoincrement", true)
.OldAnnotation("Sqlite:Autoincrement", true);
migrationBuilder.AlterColumn<string>(
name: "NormalizedName",
table: "AspNetRoles",
type: "nvarchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Name",
table: "AspNetRoles",
type: "nvarchar(256)",
maxLength: 256,
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldMaxLength: 256,
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ConcurrencyStamp",
table: "AspNetRoles",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Id",
table: "AspNetRoles",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "RoleId",
table: "AspNetRoleClaims",
type: "nvarchar(450)",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "ClaimValue",
table: "AspNetRoleClaims",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "ClaimType",
table: "AspNetRoleClaims",
type: "Text",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "AspNetRoleClaims",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "INTEGER")
.Annotation("Sqlite:Autoincrement", true)
.OldAnnotation("Sqlite:Autoincrement", true);
migrationBuilder.CreateIndex(
name: "UserNameIndex",
table: "AspNetUsers",
column: "NormalizedUserName",
unique: true,
filter: "[NormalizedUserName] IS NOT NULL");
migrationBuilder.CreateIndex(
name: "RoleNameIndex",
table: "AspNetRoles",
column: "NormalizedName",
unique: true,
filter: "[NormalizedName] IS NOT NULL");
}
}
}

View File

@@ -1,503 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20251028102815_InitConfigDb")]
partial class InitConfigDb
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("ProviderKey")
.HasColumnType("TEXT");
b.Property<string>("ProviderDisplayName")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.HasColumnType("TEXT");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Value")
.HasColumnType("TEXT");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationRole", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<int>("AccessFailedCount")
.HasColumnType("INTEGER");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<bool>("EmailConfirmed")
.HasColumnType("INTEGER");
b.Property<bool>("LockoutEnabled")
.HasColumnType("INTEGER");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("TEXT");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("PasswordHash")
.HasColumnType("TEXT");
b.Property<string>("PhoneNumber")
.HasColumnType("TEXT");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("INTEGER");
b.Property<string>("SecurityStamp")
.HasColumnType("TEXT");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("INTEGER");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("RobotApp.Data.RobotConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<double>("Height")
.HasColumnType("float")
.HasColumnName("Height");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("Length")
.HasColumnType("float")
.HasColumnName("Length");
b.Property<int>("NavigationType")
.HasColumnType("int")
.HasColumnName("NavigationType");
b.Property<double>("RadiusWheel")
.HasColumnType("float")
.HasColumnName("RadiusWheel");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<double>("Width")
.HasColumnType("float")
.HasColumnName("Width");
b.HasKey("Id");
b.ToTable("RobotConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotPlcConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("PLCAddress")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("PLCAddress");
b.Property<int>("PLCPort")
.HasColumnType("int")
.HasColumnName("PLCPort");
b.Property<byte>("PLCUnitId")
.HasColumnType("tinyint")
.HasColumnName("PLCUnitId");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotPlcConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSimulationConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("EnableSimulation")
.HasColumnType("bit")
.HasColumnName("EnableSimulation");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SimulationAcceleration")
.HasColumnType("float")
.HasColumnName("SimulationAcceleration");
b.Property<double>("SimulationDeceleration")
.HasColumnType("float")
.HasColumnName("SimulationDeceleration");
b.Property<double>("SimulationMaxAngularVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxAngularVelocity");
b.Property<double>("SimulationMaxVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxVelocity");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSimulationConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotVDA5050Config", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("SerialNumber")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("SerialNumber");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<bool>("VDA5050EnablePassword")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnablePassword");
b.Property<bool>("VDA5050EnableTls")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnableTls");
b.Property<string>("VDA5050HostServer")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_HostServer");
b.Property<string>("VDA5050Manufacturer")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Manufacturer");
b.Property<string>("VDA5050Password")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Password");
b.Property<int>("VDA5050Port")
.HasColumnType("int")
.HasColumnName("VDA5050_Port");
b.Property<int>("VDA5050PublishRepeat")
.HasColumnType("int")
.HasColumnName("VDA5050_PublishRepeat");
b.Property<string>("VDA5050UserName")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_UserName");
b.Property<string>("VDA5050Version")
.HasMaxLength(20)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Version");
b.HasKey("Id");
b.ToTable("RobotVDA5050Config");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,118 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class InitConfigDb : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "RobotConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
NavigationType = table.Column<int>(type: "int", nullable: false),
RadiusWheel = table.Column<double>(type: "float", nullable: false),
Width = table.Column<double>(type: "float", nullable: false),
Length = table.Column<double>(type: "float", nullable: false),
Height = table.Column<double>(type: "float", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotPlcConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLCAddress = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
PLCPort = table.Column<int>(type: "int", nullable: false),
PLCUnitId = table.Column<byte>(type: "tinyint", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotPlcConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotSimulationConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
EnableSimulation = table.Column<bool>(type: "bit", nullable: false),
SimulationMaxVelocity = table.Column<double>(type: "float", nullable: false),
SimulationMaxAngularVelocity = table.Column<double>(type: "float", nullable: false),
SimulationAcceleration = table.Column<double>(type: "float", nullable: false),
SimulationDeceleration = table.Column<double>(type: "float", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotSimulationConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotVDA5050Config",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SerialNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_HostServer = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
VDA5050_Port = table.Column<int>(type: "int", nullable: false),
VDA5050_UserName = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_Password = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_Manufacturer = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_Version = table.Column<string>(type: "nvarchar(64)", maxLength: 20, nullable: true),
VDA5050_PublishRepeat = table.Column<int>(type: "int", nullable: false),
VDA5050_EnablePassword = table.Column<bool>(type: "bit", nullable: false),
VDA5050_EnableTls = table.Column<bool>(type: "bit", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotVDA5050Config", x => x.Id);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "RobotConfig");
migrationBuilder.DropTable(
name: "RobotPlcConfig");
migrationBuilder.DropTable(
name: "RobotSimulationConfig");
migrationBuilder.DropTable(
name: "RobotVDA5050Config");
}
}
}

View File

@@ -1,565 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20251029064620_InitConfigSafetyDb")]
partial class InitConfigSafetyDb
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("ProviderKey")
.HasColumnType("TEXT");
b.Property<string>("ProviderDisplayName")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.HasColumnType("TEXT");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Value")
.HasColumnType("TEXT");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationRole", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<int>("AccessFailedCount")
.HasColumnType("INTEGER");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<bool>("EmailConfirmed")
.HasColumnType("INTEGER");
b.Property<bool>("LockoutEnabled")
.HasColumnType("INTEGER");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("TEXT");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("PasswordHash")
.HasColumnType("TEXT");
b.Property<string>("PhoneNumber")
.HasColumnType("TEXT");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("INTEGER");
b.Property<string>("SecurityStamp")
.HasColumnType("TEXT");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("INTEGER");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("RobotApp.Data.RobotConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<double>("Height")
.HasColumnType("float")
.HasColumnName("Height");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("Length")
.HasColumnType("float")
.HasColumnName("Length");
b.Property<int>("NavigationType")
.HasColumnType("int")
.HasColumnName("NavigationType");
b.Property<double>("RadiusWheel")
.HasColumnType("float")
.HasColumnName("RadiusWheel");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<double>("Width")
.HasColumnType("float")
.HasColumnName("Width");
b.HasKey("Id");
b.ToTable("RobotConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotPlcConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("PLCAddress")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("PLCAddress");
b.Property<int>("PLCPort")
.HasColumnType("int")
.HasColumnName("PLCPort");
b.Property<byte>("PLCUnitId")
.HasColumnType("tinyint")
.HasColumnName("PLCUnitId");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotPlcConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSafetyConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SafetySpeedFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedFast");
b.Property<double>("SafetySpeedMedium")
.HasColumnType("float")
.HasColumnName("SafetySpeedMedium");
b.Property<double>("SafetySpeedNormal")
.HasColumnType("float")
.HasColumnName("SafetySpeedNormal");
b.Property<double>("SafetySpeedOptimal")
.HasColumnType("float")
.HasColumnName("SafetySpeedOptimal");
b.Property<double>("SafetySpeedSlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedSlow");
b.Property<double>("SafetySpeedVeryFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedVeryFast");
b.Property<double>("SafetySpeedVerySlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedVerySlow");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSafetyConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSimulationConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("EnableSimulation")
.HasColumnType("bit")
.HasColumnName("EnableSimulation");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SimulationAcceleration")
.HasColumnType("float")
.HasColumnName("SimulationAcceleration");
b.Property<double>("SimulationDeceleration")
.HasColumnType("float")
.HasColumnName("SimulationDeceleration");
b.Property<double>("SimulationMaxAngularVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxAngularVelocity");
b.Property<double>("SimulationMaxVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxVelocity");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSimulationConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotVDA5050Config", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("SerialNumber")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("SerialNumber");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<bool>("VDA5050EnablePassword")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnablePassword");
b.Property<bool>("VDA5050EnableTls")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnableTls");
b.Property<string>("VDA5050HostServer")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_HostServer");
b.Property<string>("VDA5050Manufacturer")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Manufacturer");
b.Property<string>("VDA5050Password")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Password");
b.Property<int>("VDA5050Port")
.HasColumnType("int")
.HasColumnName("VDA5050_Port");
b.Property<int>("VDA5050PublishRepeat")
.HasColumnType("int")
.HasColumnName("VDA5050_PublishRepeat");
b.Property<string>("VDA5050UserName")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_UserName");
b.Property<string>("VDA5050Version")
.HasMaxLength(20)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Version");
b.HasKey("Id");
b.ToTable("RobotVDA5050Config");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,45 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class InitConfigSafetyDb : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "RobotSafetyConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SafetySpeedVerySlow = table.Column<double>(type: "float", nullable: false),
SafetySpeedSlow = table.Column<double>(type: "float", nullable: false),
SafetySpeedNormal = table.Column<double>(type: "float", nullable: false),
SafetySpeedMedium = table.Column<double>(type: "float", nullable: false),
SafetySpeedOptimal = table.Column<double>(type: "float", nullable: false),
SafetySpeedFast = table.Column<double>(type: "float", nullable: false),
SafetySpeedVeryFast = table.Column<double>(type: "float", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotSafetyConfig", x => x.Id);
});
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "RobotSafetyConfig");
}
}
}

View File

@@ -1,565 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20251029064649_InitConfigSafety1Db")]
partial class InitConfigSafety1Db
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("ProviderKey")
.HasColumnType("TEXT");
b.Property<string>("ProviderDisplayName")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.HasColumnType("TEXT");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Value")
.HasColumnType("TEXT");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationRole", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<int>("AccessFailedCount")
.HasColumnType("INTEGER");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<bool>("EmailConfirmed")
.HasColumnType("INTEGER");
b.Property<bool>("LockoutEnabled")
.HasColumnType("INTEGER");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("TEXT");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("PasswordHash")
.HasColumnType("TEXT");
b.Property<string>("PhoneNumber")
.HasColumnType("TEXT");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("INTEGER");
b.Property<string>("SecurityStamp")
.HasColumnType("TEXT");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("INTEGER");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("RobotApp.Data.RobotConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<double>("Height")
.HasColumnType("float")
.HasColumnName("Height");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("Length")
.HasColumnType("float")
.HasColumnName("Length");
b.Property<int>("NavigationType")
.HasColumnType("int")
.HasColumnName("NavigationType");
b.Property<double>("RadiusWheel")
.HasColumnType("float")
.HasColumnName("RadiusWheel");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<double>("Width")
.HasColumnType("float")
.HasColumnName("Width");
b.HasKey("Id");
b.ToTable("RobotConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotPlcConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("PLCAddress")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("PLCAddress");
b.Property<int>("PLCPort")
.HasColumnType("int")
.HasColumnName("PLCPort");
b.Property<byte>("PLCUnitId")
.HasColumnType("tinyint")
.HasColumnName("PLCUnitId");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotPlcConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSafetyConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SafetySpeedFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedFast");
b.Property<double>("SafetySpeedMedium")
.HasColumnType("float")
.HasColumnName("SafetySpeedMedium");
b.Property<double>("SafetySpeedNormal")
.HasColumnType("float")
.HasColumnName("SafetySpeedNormal");
b.Property<double>("SafetySpeedOptimal")
.HasColumnType("float")
.HasColumnName("SafetySpeedOptimal");
b.Property<double>("SafetySpeedSlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedSlow");
b.Property<double>("SafetySpeedVeryFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedVeryFast");
b.Property<double>("SafetySpeedVerySlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedVerySlow");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSafetyConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSimulationConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("EnableSimulation")
.HasColumnType("bit")
.HasColumnName("EnableSimulation");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SimulationAcceleration")
.HasColumnType("float")
.HasColumnName("SimulationAcceleration");
b.Property<double>("SimulationDeceleration")
.HasColumnType("float")
.HasColumnName("SimulationDeceleration");
b.Property<double>("SimulationMaxAngularVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxAngularVelocity");
b.Property<double>("SimulationMaxVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxVelocity");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSimulationConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotVDA5050Config", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("SerialNumber")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("SerialNumber");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<bool>("VDA5050EnablePassword")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnablePassword");
b.Property<bool>("VDA5050EnableTls")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnableTls");
b.Property<string>("VDA5050HostServer")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_HostServer");
b.Property<string>("VDA5050Manufacturer")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Manufacturer");
b.Property<string>("VDA5050Password")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Password");
b.Property<int>("VDA5050Port")
.HasColumnType("int")
.HasColumnName("VDA5050_Port");
b.Property<int>("VDA5050PublishRepeat")
.HasColumnType("int")
.HasColumnName("VDA5050_PublishRepeat");
b.Property<string>("VDA5050UserName")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_UserName");
b.Property<string>("VDA5050Version")
.HasMaxLength(20)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Version");
b.HasKey("Id");
b.ToTable("RobotVDA5050Config");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class InitConfigSafety1Db : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

View File

@@ -1,577 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20251031073231_UpdateVDA5050Config")]
partial class UpdateVDA5050Config
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("ProviderKey")
.HasColumnType("TEXT");
b.Property<string>("ProviderDisplayName")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.HasColumnType("TEXT");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Value")
.HasColumnType("TEXT");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationRole", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<int>("AccessFailedCount")
.HasColumnType("INTEGER");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<bool>("EmailConfirmed")
.HasColumnType("INTEGER");
b.Property<bool>("LockoutEnabled")
.HasColumnType("INTEGER");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("TEXT");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("PasswordHash")
.HasColumnType("TEXT");
b.Property<string>("PhoneNumber")
.HasColumnType("TEXT");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("INTEGER");
b.Property<string>("SecurityStamp")
.HasColumnType("TEXT");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("INTEGER");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("RobotApp.Data.RobotConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<double>("Height")
.HasColumnType("float")
.HasColumnName("Height");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("Length")
.HasColumnType("float")
.HasColumnName("Length");
b.Property<int>("NavigationType")
.HasColumnType("int")
.HasColumnName("NavigationType");
b.Property<double>("RadiusWheel")
.HasColumnType("float")
.HasColumnName("RadiusWheel");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<double>("Width")
.HasColumnType("float")
.HasColumnName("Width");
b.HasKey("Id");
b.ToTable("RobotConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotPlcConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("PLCAddress")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("PLCAddress");
b.Property<int>("PLCPort")
.HasColumnType("int")
.HasColumnName("PLCPort");
b.Property<byte>("PLCUnitId")
.HasColumnType("tinyint")
.HasColumnName("PLCUnitId");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotPlcConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSafetyConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SafetySpeedFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedFast");
b.Property<double>("SafetySpeedMedium")
.HasColumnType("float")
.HasColumnName("SafetySpeedMedium");
b.Property<double>("SafetySpeedNormal")
.HasColumnType("float")
.HasColumnName("SafetySpeedNormal");
b.Property<double>("SafetySpeedOptimal")
.HasColumnType("float")
.HasColumnName("SafetySpeedOptimal");
b.Property<double>("SafetySpeedSlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedSlow");
b.Property<double>("SafetySpeedVeryFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedVeryFast");
b.Property<double>("SafetySpeedVerySlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedVerySlow");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSafetyConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSimulationConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("EnableSimulation")
.HasColumnType("bit")
.HasColumnName("EnableSimulation");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SimulationAcceleration")
.HasColumnType("float")
.HasColumnName("SimulationAcceleration");
b.Property<double>("SimulationDeceleration")
.HasColumnType("float")
.HasColumnName("SimulationDeceleration");
b.Property<double>("SimulationMaxAngularVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxAngularVelocity");
b.Property<double>("SimulationMaxVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxVelocity");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSimulationConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotVDA5050Config", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("SerialNumber")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("SerialNumber");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<string>("VDA5050CA")
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_CA");
b.Property<string>("VDA5050Cer")
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Cer");
b.Property<bool>("VDA5050EnablePassword")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnablePassword");
b.Property<bool>("VDA5050EnableTls")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnableTls");
b.Property<string>("VDA5050HostServer")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_HostServer");
b.Property<string>("VDA5050Manufacturer")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Manufacturer");
b.Property<string>("VDA5050Password")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Password");
b.Property<int>("VDA5050Port")
.HasColumnType("int")
.HasColumnName("VDA5050_Port");
b.Property<int>("VDA5050PublishRepeat")
.HasColumnType("int")
.HasColumnName("VDA5050_PublishRepeat");
b.Property<string>("VDA5050UserName")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_UserName");
b.Property<string>("VDA5050Version")
.HasMaxLength(20)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Version");
b.Property<string>("VDA5050_Key")
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Key");
b.HasKey("Id");
b.ToTable("RobotVDA5050Config");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,48 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class UpdateVDA5050Config : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "VDA5050_CA",
table: "RobotVDA5050Config",
type: "nvarchar(64)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "VDA5050_Cer",
table: "RobotVDA5050Config",
type: "nvarchar(64)",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "VDA5050_Key",
table: "RobotVDA5050Config",
type: "nvarchar(64)",
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "VDA5050_CA",
table: "RobotVDA5050Config");
migrationBuilder.DropColumn(
name: "VDA5050_Cer",
table: "RobotVDA5050Config");
migrationBuilder.DropColumn(
name: "VDA5050_Key",
table: "RobotVDA5050Config");
}
}
}

View File

@@ -1,577 +0,0 @@
// <auto-generated />
using System;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using RobotApp.Data;
#nullable disable
namespace RobotApp.Data.Migrations
{
[DbContext(typeof(ApplicationDbContext))]
[Migration("20251031080648_UpdateVDA5050Config1")]
partial class UpdateVDA5050Config1
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "9.0.9");
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("RoleId");
b.ToTable("AspNetRoleClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
b.Property<string>("ClaimType")
.HasColumnType("TEXT");
b.Property<string>("ClaimValue")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("AspNetUserClaims", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("ProviderKey")
.HasColumnType("TEXT");
b.Property<string>("ProviderDisplayName")
.HasColumnType("TEXT");
b.Property<string>("UserId")
.IsRequired()
.HasColumnType("TEXT");
b.HasKey("LoginProvider", "ProviderKey");
b.HasIndex("UserId");
b.ToTable("AspNetUserLogins", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("RoleId")
.HasColumnType("TEXT");
b.HasKey("UserId", "RoleId");
b.HasIndex("RoleId");
b.ToTable("AspNetUserRoles", (string)null);
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.Property<string>("UserId")
.HasColumnType("TEXT");
b.Property<string>("LoginProvider")
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<string>("Value")
.HasColumnType("TEXT");
b.HasKey("UserId", "LoginProvider", "Name");
b.ToTable("AspNetUserTokens", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationRole", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Name")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedName")
.IsUnique()
.HasDatabaseName("RoleNameIndex");
b.ToTable("AspNetRoles", (string)null);
});
modelBuilder.Entity("RobotApp.Data.ApplicationUser", b =>
{
b.Property<string>("Id")
.HasColumnType("TEXT");
b.Property<int>("AccessFailedCount")
.HasColumnType("INTEGER");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
b.Property<string>("Email")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<bool>("EmailConfirmed")
.HasColumnType("INTEGER");
b.Property<bool>("LockoutEnabled")
.HasColumnType("INTEGER");
b.Property<DateTimeOffset?>("LockoutEnd")
.HasColumnType("TEXT");
b.Property<string>("NormalizedEmail")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("NormalizedUserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.Property<string>("PasswordHash")
.HasColumnType("TEXT");
b.Property<string>("PhoneNumber")
.HasColumnType("TEXT");
b.Property<bool>("PhoneNumberConfirmed")
.HasColumnType("INTEGER");
b.Property<string>("SecurityStamp")
.HasColumnType("TEXT");
b.Property<bool>("TwoFactorEnabled")
.HasColumnType("INTEGER");
b.Property<string>("UserName")
.HasMaxLength(256)
.HasColumnType("TEXT");
b.HasKey("Id");
b.HasIndex("NormalizedEmail")
.HasDatabaseName("EmailIndex");
b.HasIndex("NormalizedUserName")
.IsUnique()
.HasDatabaseName("UserNameIndex");
b.ToTable("AspNetUsers", (string)null);
});
modelBuilder.Entity("RobotApp.Data.RobotConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<double>("Height")
.HasColumnType("float")
.HasColumnName("Height");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("Length")
.HasColumnType("float")
.HasColumnName("Length");
b.Property<int>("NavigationType")
.HasColumnType("int")
.HasColumnName("NavigationType");
b.Property<double>("RadiusWheel")
.HasColumnType("float")
.HasColumnName("RadiusWheel");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<double>("Width")
.HasColumnType("float")
.HasColumnName("Width");
b.HasKey("Id");
b.ToTable("RobotConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotPlcConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("PLCAddress")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("PLCAddress");
b.Property<int>("PLCPort")
.HasColumnType("int")
.HasColumnName("PLCPort");
b.Property<byte>("PLCUnitId")
.HasColumnType("tinyint")
.HasColumnName("PLCUnitId");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotPlcConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSafetyConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SafetySpeedFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedFast");
b.Property<double>("SafetySpeedMedium")
.HasColumnType("float")
.HasColumnName("SafetySpeedMedium");
b.Property<double>("SafetySpeedNormal")
.HasColumnType("float")
.HasColumnName("SafetySpeedNormal");
b.Property<double>("SafetySpeedOptimal")
.HasColumnType("float")
.HasColumnName("SafetySpeedOptimal");
b.Property<double>("SafetySpeedSlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedSlow");
b.Property<double>("SafetySpeedVeryFast")
.HasColumnType("float")
.HasColumnName("SafetySpeedVeryFast");
b.Property<double>("SafetySpeedVerySlow")
.HasColumnType("float")
.HasColumnName("SafetySpeedVerySlow");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSafetyConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotSimulationConfig", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("EnableSimulation")
.HasColumnType("bit")
.HasColumnName("EnableSimulation");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<double>("SimulationAcceleration")
.HasColumnType("float")
.HasColumnName("SimulationAcceleration");
b.Property<double>("SimulationDeceleration")
.HasColumnType("float")
.HasColumnName("SimulationDeceleration");
b.Property<double>("SimulationMaxAngularVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxAngularVelocity");
b.Property<double>("SimulationMaxVelocity")
.HasColumnType("float")
.HasColumnName("SimulationMaxVelocity");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.HasKey("Id");
b.ToTable("RobotSimulationConfig");
});
modelBuilder.Entity("RobotApp.Data.RobotVDA5050Config", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier")
.HasColumnName("Id");
b.Property<string>("ConfigName")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("ConfigName");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime2")
.HasColumnName("CreatedAt");
b.Property<string>("Description")
.HasMaxLength(500)
.HasColumnType("ntext")
.HasColumnName("Description");
b.Property<bool>("IsActive")
.HasColumnType("bit")
.HasColumnName("IsActive");
b.Property<string>("SerialNumber")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("SerialNumber");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime2")
.HasColumnName("UpdatedAt");
b.Property<string>("VDA5050CA")
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_CA");
b.Property<string>("VDA5050Cer")
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Cer");
b.Property<bool>("VDA5050EnablePassword")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnablePassword");
b.Property<bool>("VDA5050EnableTls")
.HasColumnType("bit")
.HasColumnName("VDA5050_EnableTls");
b.Property<string>("VDA5050HostServer")
.HasMaxLength(100)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_HostServer");
b.Property<string>("VDA5050Key")
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Key");
b.Property<string>("VDA5050Manufacturer")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Manufacturer");
b.Property<string>("VDA5050Password")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Password");
b.Property<int>("VDA5050Port")
.HasColumnType("int")
.HasColumnName("VDA5050_Port");
b.Property<int>("VDA5050PublishRepeat")
.HasColumnType("int")
.HasColumnName("VDA5050_PublishRepeat");
b.Property<string>("VDA5050UserName")
.HasMaxLength(50)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_UserName");
b.Property<string>("VDA5050Version")
.HasMaxLength(20)
.HasColumnType("nvarchar(64)")
.HasColumnName("VDA5050_Version");
b.HasKey("Id");
b.ToTable("RobotVDA5050Config");
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationRole", null)
.WithMany()
.HasForeignKey("RoleId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken<string>", b =>
{
b.HasOne("RobotApp.Data.ApplicationUser", null)
.WithMany()
.HasForeignKey("UserId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
});
#pragma warning restore 612, 618
}
}
}

View File

@@ -1,22 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class UpdateVDA5050Config1 : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

View File

@@ -1,29 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class UpdateVDA5050St : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "VDA5050_TopicPrefix",
table: "RobotVDA5050Config",
type: "nvarchar(64)",
maxLength: 64,
nullable: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "VDA5050_TopicPrefix",
table: "RobotVDA5050Config");
}
}
}

View File

@@ -11,8 +11,8 @@ using RobotApp.Data;
namespace RobotApp.Data.Migrations namespace RobotApp.Data.Migrations
{ {
[DbContext(typeof(ApplicationDbContext))] [DbContext(typeof(ApplicationDbContext))]
[Migration("20251106025457_UpdateVDA5050St")] [Migration("20251222091852_InitApplicationDb")]
partial class UpdateVDA5050St partial class InitApplicationDb
{ {
/// <inheritdoc /> /// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)

View File

@@ -0,0 +1,351 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace RobotApp.Data.Migrations
{
/// <inheritdoc />
public partial class InitApplicationDb : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.CreateTable(
name: "AspNetRoles",
columns: table => new
{
Id = table.Column<string>(type: "TEXT", nullable: false),
Name = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
NormalizedName = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
ConcurrencyStamp = table.Column<string>(type: "TEXT", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetRoles", x => x.Id);
});
migrationBuilder.CreateTable(
name: "AspNetUsers",
columns: table => new
{
Id = table.Column<string>(type: "TEXT", nullable: false),
UserName = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
NormalizedUserName = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
Email = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
NormalizedEmail = table.Column<string>(type: "TEXT", maxLength: 256, nullable: true),
EmailConfirmed = table.Column<bool>(type: "INTEGER", nullable: false),
PasswordHash = table.Column<string>(type: "TEXT", nullable: true),
SecurityStamp = table.Column<string>(type: "TEXT", nullable: true),
ConcurrencyStamp = table.Column<string>(type: "TEXT", nullable: true),
PhoneNumber = table.Column<string>(type: "TEXT", nullable: true),
PhoneNumberConfirmed = table.Column<bool>(type: "INTEGER", nullable: false),
TwoFactorEnabled = table.Column<bool>(type: "INTEGER", nullable: false),
LockoutEnd = table.Column<DateTimeOffset>(type: "TEXT", nullable: true),
LockoutEnabled = table.Column<bool>(type: "INTEGER", nullable: false),
AccessFailedCount = table.Column<int>(type: "INTEGER", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUsers", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
NavigationType = table.Column<int>(type: "int", nullable: false),
RadiusWheel = table.Column<double>(type: "float", nullable: false),
Width = table.Column<double>(type: "float", nullable: false),
Length = table.Column<double>(type: "float", nullable: false),
Height = table.Column<double>(type: "float", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotPlcConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
PLCAddress = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
PLCPort = table.Column<int>(type: "int", nullable: false),
PLCUnitId = table.Column<byte>(type: "tinyint", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotPlcConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotSafetyConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SafetySpeedVerySlow = table.Column<double>(type: "float", nullable: false),
SafetySpeedSlow = table.Column<double>(type: "float", nullable: false),
SafetySpeedNormal = table.Column<double>(type: "float", nullable: false),
SafetySpeedMedium = table.Column<double>(type: "float", nullable: false),
SafetySpeedOptimal = table.Column<double>(type: "float", nullable: false),
SafetySpeedFast = table.Column<double>(type: "float", nullable: false),
SafetySpeedVeryFast = table.Column<double>(type: "float", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotSafetyConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotSimulationConfig",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
EnableSimulation = table.Column<bool>(type: "bit", nullable: false),
SimulationMaxVelocity = table.Column<double>(type: "float", nullable: false),
SimulationMaxAngularVelocity = table.Column<double>(type: "float", nullable: false),
SimulationAcceleration = table.Column<double>(type: "float", nullable: false),
SimulationDeceleration = table.Column<double>(type: "float", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotSimulationConfig", x => x.Id);
});
migrationBuilder.CreateTable(
name: "RobotVDA5050Config",
columns: table => new
{
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
SerialNumber = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_HostServer = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
VDA5050_Port = table.Column<int>(type: "int", nullable: false),
VDA5050_UserName = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_Password = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_Manufacturer = table.Column<string>(type: "nvarchar(64)", maxLength: 50, nullable: true),
VDA5050_Version = table.Column<string>(type: "nvarchar(64)", maxLength: 20, nullable: true),
VDA5050_TopicPrefix = table.Column<string>(type: "nvarchar(64)", maxLength: 64, nullable: true),
VDA5050_PublishRepeat = table.Column<int>(type: "int", nullable: false),
VDA5050_EnablePassword = table.Column<bool>(type: "bit", nullable: false),
VDA5050_EnableTls = table.Column<bool>(type: "bit", nullable: false),
VDA5050_CA = table.Column<string>(type: "nvarchar(64)", nullable: true),
VDA5050_Cer = table.Column<string>(type: "nvarchar(64)", nullable: true),
VDA5050_Key = table.Column<string>(type: "nvarchar(64)", nullable: true),
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
IsActive = table.Column<bool>(type: "bit", nullable: false),
ConfigName = table.Column<string>(type: "nvarchar(64)", maxLength: 100, nullable: true),
Description = table.Column<string>(type: "ntext", maxLength: 500, nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_RobotVDA5050Config", x => x.Id);
});
migrationBuilder.CreateTable(
name: "AspNetRoleClaims",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
RoleId = table.Column<string>(type: "TEXT", nullable: false),
ClaimType = table.Column<string>(type: "TEXT", nullable: true),
ClaimValue = table.Column<string>(type: "TEXT", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetRoleClaims", x => x.Id);
table.ForeignKey(
name: "FK_AspNetRoleClaims_AspNetRoles_RoleId",
column: x => x.RoleId,
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserClaims",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
UserId = table.Column<string>(type: "TEXT", nullable: false),
ClaimType = table.Column<string>(type: "TEXT", nullable: true),
ClaimValue = table.Column<string>(type: "TEXT", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserClaims", x => x.Id);
table.ForeignKey(
name: "FK_AspNetUserClaims_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserLogins",
columns: table => new
{
LoginProvider = table.Column<string>(type: "TEXT", nullable: false),
ProviderKey = table.Column<string>(type: "TEXT", nullable: false),
ProviderDisplayName = table.Column<string>(type: "TEXT", nullable: true),
UserId = table.Column<string>(type: "TEXT", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserLogins", x => new { x.LoginProvider, x.ProviderKey });
table.ForeignKey(
name: "FK_AspNetUserLogins_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserRoles",
columns: table => new
{
UserId = table.Column<string>(type: "TEXT", nullable: false),
RoleId = table.Column<string>(type: "TEXT", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserRoles", x => new { x.UserId, x.RoleId });
table.ForeignKey(
name: "FK_AspNetUserRoles_AspNetRoles_RoleId",
column: x => x.RoleId,
principalTable: "AspNetRoles",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_AspNetUserRoles_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateTable(
name: "AspNetUserTokens",
columns: table => new
{
UserId = table.Column<string>(type: "TEXT", nullable: false),
LoginProvider = table.Column<string>(type: "TEXT", nullable: false),
Name = table.Column<string>(type: "TEXT", nullable: false),
Value = table.Column<string>(type: "TEXT", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_AspNetUserTokens", x => new { x.UserId, x.LoginProvider, x.Name });
table.ForeignKey(
name: "FK_AspNetUserTokens_AspNetUsers_UserId",
column: x => x.UserId,
principalTable: "AspNetUsers",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
});
migrationBuilder.CreateIndex(
name: "IX_AspNetRoleClaims_RoleId",
table: "AspNetRoleClaims",
column: "RoleId");
migrationBuilder.CreateIndex(
name: "RoleNameIndex",
table: "AspNetRoles",
column: "NormalizedName",
unique: true);
migrationBuilder.CreateIndex(
name: "IX_AspNetUserClaims_UserId",
table: "AspNetUserClaims",
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_AspNetUserLogins_UserId",
table: "AspNetUserLogins",
column: "UserId");
migrationBuilder.CreateIndex(
name: "IX_AspNetUserRoles_RoleId",
table: "AspNetUserRoles",
column: "RoleId");
migrationBuilder.CreateIndex(
name: "EmailIndex",
table: "AspNetUsers",
column: "NormalizedEmail");
migrationBuilder.CreateIndex(
name: "UserNameIndex",
table: "AspNetUsers",
column: "NormalizedUserName",
unique: true);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "AspNetRoleClaims");
migrationBuilder.DropTable(
name: "AspNetUserClaims");
migrationBuilder.DropTable(
name: "AspNetUserLogins");
migrationBuilder.DropTable(
name: "AspNetUserRoles");
migrationBuilder.DropTable(
name: "AspNetUserTokens");
migrationBuilder.DropTable(
name: "RobotConfig");
migrationBuilder.DropTable(
name: "RobotPlcConfig");
migrationBuilder.DropTable(
name: "RobotSafetyConfig");
migrationBuilder.DropTable(
name: "RobotSimulationConfig");
migrationBuilder.DropTable(
name: "RobotVDA5050Config");
migrationBuilder.DropTable(
name: "AspNetRoles");
migrationBuilder.DropTable(
name: "AspNetUsers");
}
}
}

View File

@@ -7,7 +7,7 @@ using RobotApp.Data;
#nullable disable #nullable disable
namespace RobotApp.Migrations namespace RobotApp.Data.Migrations
{ {
[DbContext(typeof(ApplicationDbContext))] [DbContext(typeof(ApplicationDbContext))]
partial class ApplicationDbContextModelSnapshot : ModelSnapshot partial class ApplicationDbContextModelSnapshot : ModelSnapshot

View File

@@ -11,7 +11,6 @@ namespace RobotApp.Hubs
public async Task JoinRobot(string serialNumber) public async Task JoinRobot(string serialNumber)
{ {
await Groups.AddToGroupAsync(Context.ConnectionId, serialNumber); await Groups.AddToGroupAsync(Context.ConnectionId, serialNumber);
Console.WriteLine($"Client {Context.ConnectionId} joined robot group: {serialNumber}");
} }
public async Task LeaveRobot(string serialNumber) public async Task LeaveRobot(string serialNumber)
@@ -22,8 +21,8 @@ namespace RobotApp.Hubs
// Phương thức này sẽ được gọi từ service để broadcast // Phương thức này sẽ được gọi từ service để broadcast
public async Task SendState(string serialNumber, StateMsg state) public async Task SendState(string serialNumber, StateMsg state)
{ {
var json = JsonSerializer.Serialize(state, JsonOptionExtends.Write); //var json = JsonSerializer.Serialize(state, JsonOptionExtends.Write);
await Clients.Group(serialNumber).SendAsync("ReceiveState", json); await Clients.Group(serialNumber).SendAsync("ReceiveState", state);
} }
} }
} }

View File

@@ -10,3 +10,11 @@ public class RobotMonitorHub : Hub
} }
} }

View File

@@ -63,7 +63,7 @@ builder.Services.AddRobot();
builder.Services.AddSingleton<RobotApp.Services.RobotMonitorService>(); builder.Services.AddSingleton<RobotApp.Services.RobotMonitorService>();
builder.Services.AddHostedService(sp => sp.GetRequiredService<RobotApp.Services.RobotMonitorService>()); builder.Services.AddHostedService(sp => sp.GetRequiredService<RobotApp.Services.RobotMonitorService>());
builder.Services.AddScoped<RobotStateClient>(); //builder.Services.AddScoped<RobotStateClient>();
builder.Services.AddHostedService<RobotStatePublisher>(); builder.Services.AddHostedService<RobotStatePublisher>();
var app = builder.Build(); var app = builder.Build();

View File

@@ -6,22 +6,22 @@
"dotnetRunMessages": true, "dotnetRunMessages": true,
"launchBrowser": true, "launchBrowser": true,
"workingDirectory": "$(TargetDir)", "workingDirectory": "$(TargetDir)",
"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", //"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"applicationUrl": "http://localhost:5229", "applicationUrl": "http://localhost:5229",
"environmentVariables": { "environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
} }
},
"https": {
"commandName": "Project",
"dotnetRunMessages": true,
"launchBrowser": true,
"workingDirectory": "$(TargetDir)",
//"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
"applicationUrl": "https://0.0.0.0:7150;http://localhost:5229",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
} }
//"https": {
// "commandName": "Project",
// "dotnetRunMessages": true,
// "launchBrowser": true,
// "workingDirectory": "$(TargetDir)",
// //"inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}",
// "applicationUrl": "https://0.0.0.0:7150;http://localhost:5229",
// "environmentVariables": {
// "ASPNETCORE_ENVIRONMENT": "Development"
// }
//}
} }
} }

View File

@@ -39,6 +39,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Data\Migrations\" />
<Folder Include="Tests\" /> <Folder Include="Tests\" />
</ItemGroup> </ItemGroup>

View File

@@ -116,7 +116,7 @@ public class HighPrecisionTimer<T>(int Interval, Action Callback, Logger<T>? Log
Thread.Start(); Thread.Start();
} }
} }
else throw new ObjectDisposedException(nameof(WatchTimer<T>)); else throw new ObjectDisposedException(nameof(HighPrecisionTimer<T>));
} }
public void Stop() public void Stop()

View File

@@ -147,11 +147,11 @@ public class MQTTClient : IAsyncDisposable
MqttClient = MqttClientFactory.CreateMqttClient(); MqttClient = MqttClientFactory.CreateMqttClient();
//MqttClient.ApplicationMessageReceivedAsync -= OnMessageReceived; MqttClient.ApplicationMessageReceivedAsync -= OnMessageReceived;
MqttClient.ApplicationMessageReceivedAsync += OnMessageReceived; MqttClient.ApplicationMessageReceivedAsync += OnMessageReceived;
//MqttClient.DisconnectedAsync -= OnDisconnected; MqttClient.DisconnectedAsync -= OnDisconnected;
MqttClient.DisconnectedAsync += OnDisconnected; MqttClient.DisconnectedAsync += OnDisconnected;
while (!cancellationToken.IsCancellationRequested) while (!cancellationToken.IsCancellationRequested && !IsDisposed)
{ {
try try
{ {
@@ -168,7 +168,11 @@ public class MQTTClient : IAsyncDisposable
{ {
Logger.Error($"Lỗi khi tạo MQTT client: {ex.Message}"); Logger.Error($"Lỗi khi tạo MQTT client: {ex.Message}");
} }
await Task.Delay(3000, cancellationToken); try
{
await Task.Delay(3000, cancellationToken);
}
catch { }
} }
} }
else throw new ObjectDisposedException(nameof(MQTTClient)); else throw new ObjectDisposedException(nameof(MQTTClient));
@@ -195,17 +199,6 @@ public class MQTTClient : IAsyncDisposable
arg.Chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority; arg.Chain.ChainPolicy.VerificationFlags = X509VerificationFlags.AllowUnknownCertificateAuthority;
var isValid = arg.Chain.Build((X509Certificate2)arg.Certificate); var isValid = arg.Chain.Build((X509Certificate2)arg.Certificate);
if (isValid)
{
Console.WriteLine("Broker CERTIFICATE VALID");
}
else
{
Console.WriteLine("Broker CERTIFICATE INVALID");
foreach (var status in arg.Chain.ChainStatus)
Console.WriteLine($" -> Chain error: {status.Status} - {status.StatusInformation}");
}
return isValid; return isValid;
} }
} }
@@ -230,10 +223,10 @@ public class MQTTClient : IAsyncDisposable
var tlsOptions = new MqttClientTlsOptionsBuilder() var tlsOptions = new MqttClientTlsOptionsBuilder()
.UseTls(true) .UseTls(true)
.WithSslProtocols(System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls13) .WithSslProtocols(System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls13)
//.WithCertificateValidationHandler(ValidateCertificates) .WithCertificateValidationHandler(ValidateCertificates)
.WithClientCertificatesProvider(new MQTTClientCertificatesProvider(VDA5050Setting.CerFile, VDA5050Setting.KeyFile)) .WithClientCertificatesProvider(new MQTTClientCertificatesProvider(VDA5050Setting.CerFile, VDA5050Setting.KeyFile))
.Build(); .Build();
builder = builder.WithTlsOptions(tlsOptions); builder = builder.WithTlsOptions(tlsOptions);
} }
MqttClientOptions = builder.Build(); MqttClientOptions = builder.Build();
} }
@@ -262,42 +255,42 @@ public class MQTTClient : IAsyncDisposable
{ {
//if (!IsDisposed) //if (!IsDisposed)
//{ //{
if (MqttClient is null) throw new Exception("Kết nối tới broker chưa được khởi tạo nhưng đã yêu cầu subscribe"); if (MqttClient is null) throw new Exception("Kết nối tới broker chưa được khởi tạo nhưng đã yêu cầu subscribe");
if (!MqttClient.IsConnected) throw new Exception("Kết nối tới broker chưa thành công nhưng đã yêu cầu subscribe"); if (!MqttClient.IsConnected) throw new Exception("Kết nối tới broker chưa thành công nhưng đã yêu cầu subscribe");
while (!cancellationToken.IsCancellationRequested) while (!cancellationToken.IsCancellationRequested)
{
try
{ {
try var response = await MqttClient.SubscribeAsync(MqttClientSubscribeOptions, cancellationToken);
bool isSuccess = true;
foreach (var item in response.Items)
{ {
var response = await MqttClient.SubscribeAsync(MqttClientSubscribeOptions, cancellationToken); if (item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS0 ||
bool isSuccess = true; item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS1 ||
foreach (var item in response.Items) item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS2)
{ {
if (item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS0 || Logger.Info($"Subscribe thành công cho topic: {item.TopicFilter.Topic} với QoS: {item.ResultCode}");
item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS1 || }
item.ResultCode == MqttClientSubscribeResultCode.GrantedQoS2) else
{ {
Logger.Info($"Subscribe thành công cho topic: {item.TopicFilter.Topic} với QoS: {item.ResultCode}"); Logger.Warning($"Subscribe thất bại cho topic: {item.TopicFilter.Topic}. Lý do: {response.ReasonString}");
} isSuccess = false;
else break;
{
Logger.Warning($"Subscribe thất bại cho topic: {item.TopicFilter.Topic}. Lý do: {response.ReasonString}");
isSuccess = false;
break;
}
} }
if (isSuccess) break;
}
catch (Exception ex)
{
Logger.Error($"Lỗi khi subscribe: {ex.Message}");
}
if (!cancellationToken.IsCancellationRequested && !IsDisposed)
{
await Task.Delay(3000, cancellationToken);
} }
if (isSuccess) break;
} }
catch (Exception ex)
{
Logger.Error($"Lỗi khi subscribe: {ex.Message}");
}
if (!cancellationToken.IsCancellationRequested && !IsDisposed)
{
await Task.Delay(3000, cancellationToken);
}
}
//} //}
//else throw new ObjectDisposedException(nameof(MQTTClient)); //else throw new ObjectDisposedException(nameof(MQTTClient));
} }

View File

@@ -27,7 +27,6 @@ public class MQTTClientCertificatesProvider(string? CerFile, string? KeyFile) :
var cert = X509Certificate2.CreateFromPem(File.ReadAllText(certLocal), File.ReadAllText(keyLocal)); var cert = X509Certificate2.CreateFromPem(File.ReadAllText(certLocal), File.ReadAllText(keyLocal));
var pfxBytes = cert.Export(X509ContentType.Pfx); var pfxBytes = cert.Export(X509ContentType.Pfx);
var pfxCert = X509CertificateLoader.LoadPkcs12(pfxBytes, "", X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet); var pfxCert = X509CertificateLoader.LoadPkcs12(pfxBytes, "", X509KeyStorageFlags.Exportable | X509KeyStorageFlags.PersistKeySet);
Console.WriteLine($"Client cert loaded: {pfxCert.Subject}, HasPrivateKey: {pfxCert.HasPrivateKey}, PrivateKey Type: {pfxCert.GetRSAPrivateKey()?.GetType()}");
return [pfxCert]; return [pfxCert];
} }
} }

View File

@@ -96,7 +96,6 @@ public abstract class RobotAction(IServiceProvider serviceProvider) : IDisposabl
protected virtual Task StopAction() protected virtual Task StopAction()
{ {
Console.WriteLine($"StopAction {Type}");
Status = ActionStatus.FAILED; Status = ActionStatus.FAILED;
ResultDescription = "Action bị hủy bỏ."; ResultDescription = "Action bị hủy bỏ.";
return Task.CompletedTask; return Task.CompletedTask;

View File

@@ -21,7 +21,7 @@ public class RobotActionStorage(IServiceProvider ServiceProvider)
ActionType.drop => new RobotDropAction(ServiceProvider), ActionType.drop => new RobotDropAction(ServiceProvider),
ActionType.pick => new RobotPickAction(ServiceProvider), ActionType.pick => new RobotPickAction(ServiceProvider),
//ActionType.liftRotate => new RobotLiftRotateAction(ServiceProvider), //ActionType.liftRotate => new RobotLiftRotateAction(ServiceProvider),
//ActionType.rotate => new RobotRotateAction(ServiceProvider), ActionType.rotate => new RobotRotateAction(ServiceProvider),
//ActionType.rotateKeepLift => new RobotRotateKeepLift(ServiceProvider), //ActionType.rotateKeepLift => new RobotRotateKeepLift(ServiceProvider),
//ActionType.mutedBaseOn => new RobotMutedBaseOnAction(ServiceProvider), //ActionType.mutedBaseOn => new RobotMutedBaseOnAction(ServiceProvider),
//ActionType.mutedBaseOff => new RobotMutedBaseOffAction(ServiceProvider), //ActionType.mutedBaseOff => new RobotMutedBaseOffAction(ServiceProvider),

View File

@@ -57,8 +57,8 @@ public class RobotConfiguration(IServiceProvider ServiceProvider, Logger<RobotCo
if (IsReady) if (IsReady)
{ {
var robotConnection = scope.ServiceProvider.GetRequiredService<RobotConnection>(); var robotConnection = scope.ServiceProvider.GetRequiredService<RobotConnection>();
await robotConnection.StopConnection(); robotConnection.StartConnection();
_ = Task.Run(async () => await robotConnection.StartConnection(CancellationToken.None)); await Task.Delay(1000);
} }
} }
else throw new Exception("Chưa có cấu hình VDA5050."); else throw new Exception("Chưa có cấu hình VDA5050.");

View File

@@ -3,6 +3,7 @@ using RobotApp.VDA5050;
using RobotApp.VDA5050.InstantAction; using RobotApp.VDA5050.InstantAction;
using RobotApp.VDA5050.Order; using RobotApp.VDA5050.Order;
using System.Text.Json; using System.Text.Json;
using System.Threading;
namespace RobotApp.Services.Robot; namespace RobotApp.Services.Robot;
@@ -10,12 +11,13 @@ public class RobotConnection(RobotConfiguration RobotConfiguration,
Logger<RobotConnection> Logger, Logger<RobotConnection> Logger,
Logger<MQTTClient> MQTTClientLogger) Logger<MQTTClient> MQTTClientLogger)
{ {
private readonly VDA5050Setting VDA5050Setting = RobotConfiguration.VDA5050Setting;
private MQTTClient? MqttClient; private MQTTClient? MqttClient;
public bool IsConnected => MqttClient is not null && MqttClient.IsConnected; public bool IsConnected => MqttClient is not null && MqttClient.IsConnected;
public event Action<OrderMsg>? OrderUpdated; public event Action<OrderMsg>? OrderUpdated;
public event Action<InstantActionsMsg>? ActionUpdated; public event Action<InstantActionsMsg>? ActionUpdated;
private readonly SemaphoreSlim _connectionSemaphore = new(1, 1);
private CancellationTokenSource? _connectionCancel;
private void OrderChanged(string data) private void OrderChanged(string data)
@@ -24,12 +26,16 @@ public class RobotConnection(RobotConfiguration RobotConfiguration,
{ {
//Logger.Debug($"Nhận Order: {data}"); //Logger.Debug($"Nhận Order: {data}");
var msg = JsonSerializer.Deserialize<OrderMsg>(data, JsonOptionExtends.Read); var msg = JsonSerializer.Deserialize<OrderMsg>(data, JsonOptionExtends.Read);
if (msg is null || string.IsNullOrEmpty(msg.SerialNumber) || msg.SerialNumber != RobotConfiguration.SerialNumber) return; if (msg is null || string.IsNullOrEmpty(msg.SerialNumber) || msg.SerialNumber != RobotConfiguration.SerialNumber)
{
Logger.Warning($"SerialNumber cuả order không hợp lệ: message SerialNumber {msg?.SerialNumber}");
return;
}
OrderUpdated?.Invoke(msg); OrderUpdated?.Invoke(msg);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Warning($"Nhận Order xảy ra lỗi: {ex.Message} - {ex.StackTrace}"); Logger.Warning($"Nhận Order xảy ra lỗi: {ex.Message}");
} }
} }
@@ -39,28 +45,52 @@ public class RobotConnection(RobotConfiguration RobotConfiguration,
{ {
//Logger.Debug($"Nhận InstanceActions: {data}"); //Logger.Debug($"Nhận InstanceActions: {data}");
var msg = JsonSerializer.Deserialize<InstantActionsMsg>(data, JsonOptionExtends.Read); var msg = JsonSerializer.Deserialize<InstantActionsMsg>(data, JsonOptionExtends.Read);
if (msg is null || string.IsNullOrEmpty(msg.SerialNumber) || msg.SerialNumber != RobotConfiguration.SerialNumber) return; if (msg is null || string.IsNullOrEmpty(msg.SerialNumber) || msg.SerialNumber != RobotConfiguration.SerialNumber)
{
Logger.Warning($"SerialNumber của action không hợp lệ: message SerialNumber {msg?.SerialNumber}");
return;
}
ActionUpdated?.Invoke(msg); ActionUpdated?.Invoke(msg);
} }
catch (Exception ex) catch (Exception ex)
{ {
Logger.Warning($"Nhận InstanceActions xảy ra lỗi: {ex.Message} - {ex.StackTrace}"); Logger.Warning($"Nhận InstanceActions xảy ra lỗi: {ex.Message}");
} }
} }
public async Task<MessageResult> Publish(string topic, string data) public async Task<MessageResult> Publish(string topic, string data)
{ {
if (MqttClient is not null && MqttClient.IsConnected) return await MqttClient.PublishAsync($"{VDA5050Setting.TopicPrefix}/{VDA5050Setting.Manufacturer}/{RobotConfiguration.SerialNumber}/{topic}", data); if (MqttClient is not null && MqttClient.IsConnected) return await MqttClient.PublishAsync($"{RobotConfiguration.VDA5050Setting.TopicPrefix}/{RobotConfiguration.VDA5050Setting.Manufacturer}/{RobotConfiguration.SerialNumber}/{topic}", data);
return new(false, "Chưa có kết nối tới broker"); return new(false, "Chưa có kết nối tới broker");
} }
public void StartConnection()
public async Task StartConnection(CancellationToken cancellationToken)
{ {
MqttClient = new MQTTClient(RobotConfiguration.SerialNumber, VDA5050Setting, MQTTClientLogger); Task.Run(async () =>
MqttClient.OrderChanged += OrderChanged; {
MqttClient.InstanceActionsChanged += InstanceActionsChanged; await StartConnectionAsync(CancellationToken.None);
await MqttClient.ConnectAsync(cancellationToken); if(IsConnected)Logger.Info("Robot đã kết nối tới Fleet Manager.");
await MqttClient.SubscribeAsync(cancellationToken); });
}
public async Task StartConnectionAsync(CancellationToken cancellationToken)
{
try
{
await StopConnection();
_connectionCancel?.Cancel();
if (_connectionSemaphore.Wait(1000, cancellationToken))
{
_connectionCancel = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
MqttClient = new MQTTClient(RobotConfiguration.SerialNumber, RobotConfiguration.VDA5050Setting, MQTTClientLogger);
MqttClient.OrderChanged += OrderChanged;
MqttClient.InstanceActionsChanged += InstanceActionsChanged;
await MqttClient.ConnectAsync(_connectionCancel.Token);
if(MqttClient is not null) await MqttClient.SubscribeAsync(_connectionCancel.Token);
}
}
finally
{
_connectionSemaphore.Release();
}
} }
public async Task StopConnection() public async Task StopConnection()

View File

@@ -39,8 +39,7 @@ public partial class RobotController
ConnectionManager.OrderUpdated += NewOrderUpdated; ConnectionManager.OrderUpdated += NewOrderUpdated;
ConnectionManager.ActionUpdated += NewInstantActionUpdated; ConnectionManager.ActionUpdated += NewInstantActionUpdated;
await ConnectionManager.StartConnection(cancellationToken); ConnectionManager.StartConnection();
Logger.Info("Robot đã kết nối tới Fleet Manager.");
StateManager.TransitionTo(SystemStateType.Standby); StateManager.TransitionTo(SystemStateType.Standby);
if (!RobotConfiguration.IsSimulation) if (!RobotConfiguration.IsSimulation)

View File

@@ -105,7 +105,10 @@ public class RobotErrors : IError
=> CreateError(ErrorType.INITIALIZE_ORDER, "Vui lòng kiểm tra lại order", ErrorLevel.WARNING, $"Order mới nhận được không phải là nối tiếp của order khi LastNodeSequenceId: {lastNodeSequenceId} mà node đầu tiên của order mới có sequence: {newStartNodeSequenceId}"); => CreateError(ErrorType.INITIALIZE_ORDER, "Vui lòng kiểm tra lại order", ErrorLevel.WARNING, $"Order mới nhận được không phải là nối tiếp của order khi LastNodeSequenceId: {lastNodeSequenceId} mà node đầu tiên của order mới có sequence: {newStartNodeSequenceId}");
public static Error Error1018(int oldOrderUpdateId, int newOrderUpdateId) public static Error Error1018(int oldOrderUpdateId, int newOrderUpdateId)
=> CreateError(ErrorType.INITIALIZE_ORDER, "Vui lòng kiểm tra lại OrderUpdateId", ErrorLevel.WARNING, $"OrderUpdateId {newOrderUpdateId} nhận được nhỏ hơn OrderUpdateId hiện tại là {oldOrderUpdateId}"); => CreateError(ErrorType.INITIALIZE_ORDER, "Vui lòng kiểm tra lại OrderUpdateId", ErrorLevel.WARNING, $"OrderUpdateId {newOrderUpdateId} nhận được nhỏ hơn OrderUpdateId hiện tại là {oldOrderUpdateId}");
public static Error Error1019()
=> CreateError(ErrorType.INITIALIZE_ORDER, "Vui lòng kiểm tra lại Order", ErrorLevel.WARNING, "Order có node đầu tiên quá xa robot");
public static Error Error1020()
=> CreateError(ErrorType.INITIALIZE_ORDER, "", ErrorLevel.WARNING, "Robot đang ở đích của Order");
public static Error Error2001() public static Error Error2001()
=> CreateError(ErrorType.READ_PERIPHERAL_FAILURE, "2001", ErrorLevel.FATAL, "Có lỗi xảy ra trong quá trình đọc tín hiệu từ hệ thống ngoại vi(PLC)"); => CreateError(ErrorType.READ_PERIPHERAL_FAILURE, "2001", ErrorLevel.FATAL, "Có lỗi xảy ra trong quá trình đọc tín hiệu từ hệ thống ngoại vi(PLC)");

View File

@@ -25,7 +25,7 @@ public class RobotFactsheet(RobotConnection RobotConnection, RobotConfiguration
{ ActionType.pick, Pick}, { ActionType.pick, Pick},
{ ActionType.drop, Drop}, { ActionType.drop, Drop},
//{ ActionType.liftRotate, LiftRotate}, //{ ActionType.liftRotate, LiftRotate},
//{ ActionType.rotate, Rotate}, { ActionType.rotate, Rotate},
//{ ActionType.rotateKeepLift, RotateKeepLift}, //{ ActionType.rotateKeepLift, RotateKeepLift},
//{ ActionType.mutedBaseOn, MutedBaseOn}, //{ ActionType.mutedBaseOn, MutedBaseOn},
//{ ActionType.mutedBaseOff, MutedBaseOff}, //{ ActionType.mutedBaseOff, MutedBaseOff},
@@ -224,22 +224,22 @@ public class RobotFactsheet(RobotConnection RobotConnection, RobotConfiguration
// BlockingTypes = [BlockingType.HARD.ToString()], // BlockingTypes = [BlockingType.HARD.ToString()],
//}; //};
//public readonly static AgvAction Rotate = new() public readonly static AgvAction Rotate = new()
//{ {
// ActionType = ActionType.rotate.ToString(), ActionType = ActionType.rotate.ToString(),
// ActionDescription = "Xoay robot tại chỗ.", ActionDescription = "Xoay robot tại chỗ.",
// ActionScopes = [ActionScopes.INSTANT.ToString(), ActionScopes.NODE.ToString()], ActionScopes = [ActionScopes.INSTANT.ToString(), ActionScopes.NODE.ToString()],
// ActionParameters = [ ActionParameters = [
// new() new()
// { {
// Key = "angle", Key = "angle",
// Description = "Góc xoay của robot. (rad)", Description = "Góc xoay của robot. (rad)",
// ValueDataType = ValueDataType.FLOAT.ToString(), ValueDataType = ValueDataType.FLOAT.ToString(),
// IsOptional = false, IsOptional = false,
// }], }],
// ResultDescription = "Robot đã xoay tại chỗ.", ResultDescription = "Robot đã xoay tại chỗ.",
// BlockingTypes = [BlockingType.HARD.ToString()], BlockingTypes = [BlockingType.HARD.ToString()],
//}; };
//public readonly static AgvAction RotateKeepLift = new() //public readonly static AgvAction RotateKeepLift = new()
//{ //{

View File

@@ -3,7 +3,7 @@ using RobotApp.VDA5050.State;
namespace RobotApp.Services.Robot; namespace RobotApp.Services.Robot;
public class RobotLoads(IPeripheral PeriperalManager) : ILoad public class RobotLoads() : ILoad
{ {
//public Load[] Load => PeriperalManager.HasLoad ? [GetLoad()] : []; //public Load[] Load => PeriperalManager.HasLoad ? [GetLoad()] : [];
public Load[] Load { get; private set; } = []; public Load[] Load { get; private set; } = [];

View File

@@ -274,32 +274,37 @@ public class RobotLocalization(RobotConfiguration RobotConfiguration, Simulation
{ {
try try
{ {
var xyzw = QuaternionToXYZW(0, 0, theta); if (IsSimulation) SimVisualization.LocalizationInitialize(x, y, theta);
var response = XlocClient.SetInitialPose(new SetInitialPoseRequest()
{
InitialPose = new Pose()
{
Position = new Point()
{
X = x,
Y = y,
Z = 0,
},
Orientation = new Quaternion()
{
X = xyzw.x,
Y = xyzw.y,
Z = xyzw.z,
W = xyzw.w
}
}
});
if (response.Status.Code == StatusResponse.Types.StatusCode.Ok) return new(true);
else else
{ {
Logger.Warning("Khởi tạo vị trí cho robot thất bại. Kết quả trả về: {response.Status.Code} - {response.Status.Message}"); var xyzw = QuaternionToXYZW(0, 0, theta);
return new(false, "Khởi tạo vị trí cho robot thất bại"); var response = XlocClient.SetInitialPose(new SetInitialPoseRequest()
{
InitialPose = new Pose()
{
Position = new Point()
{
X = x,
Y = y,
Z = 0,
},
Orientation = new Quaternion()
{
X = xyzw.x,
Y = xyzw.y,
Z = xyzw.z,
W = xyzw.w
}
}
});
if (response.Status.Code == StatusResponse.Types.StatusCode.Ok) return new(true);
else
{
Logger.Warning("Khởi tạo vị trí cho robot thất bại. Kết quả trả về: {response.Status.Code} - {response.Status.Message}");
return new(false, "Khởi tạo vị trí cho robot thất bại");
}
} }
return new(true);
} }
catch (Exception ex) catch (Exception ex)
{ {

View File

@@ -1,5 +1,4 @@
using MudBlazor; using RobotApp.Common.Shares.Dtos;
using RobotApp.Common.Shares.Dtos;
using RobotApp.Common.Shares.Enums; using RobotApp.Common.Shares.Enums;
using RobotApp.Interfaces; using RobotApp.Interfaces;
using RobotApp.Services.Exceptions; using RobotApp.Services.Exceptions;
@@ -30,7 +29,7 @@ public class RobotOrderController(INavigation NavigationManager,
public int LastNodeSequenceId => LastNode is null ? 0 : LastNode.SequenceId; public int LastNodeSequenceId => LastNode is null ? 0 : LastNode.SequenceId;
public (NodeState[], EdgeStateDto[]) CurrentPath => GetCurrentPath(); public (NodeState[], EdgeStateDto[]) CurrentPath => GetCurrentPath();
private const int CycleHandlerMilliseconds = 100; private const int CycleHandlerMilliseconds = 200;
private WatchTimer<RobotOrderController>? OrderTimer; private WatchTimer<RobotOrderController>? OrderTimer;
private readonly Dictionary<string, Action[]> OrderActions = []; private readonly Dictionary<string, Action[]> OrderActions = [];
@@ -247,11 +246,6 @@ public class RobotOrderController(INavigation NavigationManager,
UpdateState(); UpdateState();
} }
private bool IsNewPath()
{
return true;
}
private void ClearLastNode() private void ClearLastNode()
{ {
if (LastNode is null) return; if (LastNode is null) return;
@@ -292,6 +286,7 @@ public class RobotOrderController(INavigation NavigationManager,
private void HandleOrder() private void HandleOrder()
{ {
if (Nodes.Length <= 0) return;
if (IsCancelOrder) if (IsCancelOrder)
{ {
NavigationManager.CancelMovement(); NavigationManager.CancelMovement();
@@ -309,9 +304,13 @@ public class RobotOrderController(INavigation NavigationManager,
{ {
var action = FinalAction[0]; var action = FinalAction[0];
var robotAction = ActionManager[action.ActionId]; var robotAction = ActionManager[action.ActionId];
if (robotAction is null) return; if (robotAction is null)
if (robotAction.IsCompleted) FinalAction.Remove(action); {
if (robotAction.Status == ActionStatus.WAITING) ActionManager.StartOrderAction(action.ActionId); FinalAction.Remove(action);
return;
}
if (robotAction.IsCompleted)
if (robotAction.Status == ActionStatus.WAITING) ActionManager.StartOrderAction(action.ActionId);
} }
else else
{ {
@@ -398,6 +397,18 @@ public class RobotOrderController(INavigation NavigationManager,
if (NodeStates.Length != 0 || EdgeStates.Length != 0) HandleUpdateOrder(NewOrderHandler); if (NodeStates.Length != 0 || EdgeStates.Length != 0) HandleUpdateOrder(NewOrderHandler);
else else
{ {
Node startNode = NewOrderHandler.Nodes[0];
var nodeDeviation = startNode.NodePosition.AllowedDeviationXY == 0.0 ? NewOrderHandler.Nodes.Length == 1 ? 0.3 : 0.5 : startNode.NodePosition.AllowedDeviationXY;
var distance = Localization.DistanceTo(startNode.NodePosition.X, startNode.NodePosition.Y);
if (distance > nodeDeviation) throw new OrderException(RobotErrors.Error1019());
if (NewOrderHandler.Nodes.Length > 1)
{
Node endNode = NewOrderHandler.Nodes[^1];
nodeDeviation = endNode.NodePosition.AllowedDeviationXY == 0.0 ? 0.2 : endNode.NodePosition.AllowedDeviationXY;
distance = Localization.DistanceTo(endNode.NodePosition.X, endNode.NodePosition.Y);
if (distance < nodeDeviation) throw new OrderException(RobotErrors.Error1020());
}
HandleNewOrder(NewOrderHandler); HandleNewOrder(NewOrderHandler);
} }
} }
@@ -409,6 +420,7 @@ public class RobotOrderController(INavigation NavigationManager,
{ {
ErrorManager.AddError(orEx.Error, TimeSpan.FromSeconds(10)); ErrorManager.AddError(orEx.Error, TimeSpan.FromSeconds(10));
Logger.Warning($"Lỗi khi xử lí Order: {orEx.Error.ErrorDescription}"); Logger.Warning($"Lỗi khi xử lí Order: {orEx.Error.ErrorDescription}");
if (Nodes.Length == 0) HandleOrderStop();
} }
else Logger.Warning($"Lỗi khi xử lí Order: {orEx.Message}"); else Logger.Warning($"Lỗi khi xử lí Order: {orEx.Message}");
} }
@@ -421,7 +433,7 @@ public class RobotOrderController(INavigation NavigationManager,
private EdgeStateDto[] SplitChecking(Node lastNode, Node nearLastNode, VDA5050.Order.Edge edge) private EdgeStateDto[] SplitChecking(Node lastNode, Node nearLastNode, VDA5050.Order.Edge edge)
{ {
List<EdgeStateDto> pathEdges = []; List<EdgeStateDto> pathEdges = [];
var splitStartPath = RobotPathPlanner.PathSplit([lastNode, nearLastNode], [edge], 0.1); var splitStartPath = RobotPathPlanner.PathSplit([lastNode, nearLastNode], [edge], 0.5);
if (splitStartPath is not null && splitStartPath.Length > 0) if (splitStartPath is not null && splitStartPath.Length > 0)
{ {
int index = 0; int index = 0;
@@ -436,17 +448,31 @@ public class RobotOrderController(INavigation NavigationManager,
index = i; index = i;
} }
} }
for (int i = index; i < splitStartPath.Length - 1; i++) if (edge.Trajectory is null || edge.Trajectory.Degree == 1)
{ {
pathEdges.Add(new() pathEdges.Add(new()
{ {
StartX = splitStartPath[i].NodePosition.X, StartX = splitStartPath[index].NodePosition.X,
StartY = splitStartPath[i].NodePosition.Y, StartY = splitStartPath[index].NodePosition.Y,
EndX = splitStartPath[i + 1].NodePosition.X, EndX = nearLastNode.NodePosition.X,
EndY = splitStartPath[i + 1].NodePosition.Y, EndY = nearLastNode.NodePosition.Y,
Degree = 1, Degree = 1,
}); });
} }
else
{
for (int i = index; i < splitStartPath.Length - 1; i++)
{
pathEdges.Add(new()
{
StartX = splitStartPath[i].NodePosition.X,
StartY = splitStartPath[i].NodePosition.Y,
EndX = splitStartPath[i + 1].NodePosition.X,
EndY = splitStartPath[i + 1].NodePosition.Y,
Degree = 1,
});
}
}
} }
return [.. pathEdges]; return [.. pathEdges];
} }
@@ -465,17 +491,23 @@ public class RobotOrderController(INavigation NavigationManager,
var edges = NewOrderEdges.ToList().GetRange(lastNodeIndex + 1, nodes.Count - 1); var edges = NewOrderEdges.ToList().GetRange(lastNodeIndex + 1, nodes.Count - 1);
for (int i = 0; i < nodes.Count - 1; i++) for (int i = 0; i < nodes.Count - 1; i++)
{ {
if (edges[i] is null) return (NodeStates, [.. pathEdges]);
var trajectory = edges[i].Trajectory;
var controlPoints = trajectory?.ControlPoints;
pathEdges.Add(new() pathEdges.Add(new()
{ {
StartX = nodes[i].NodePosition.X, StartX = nodes[i].NodePosition.X,
StartY = nodes[i].NodePosition.Y, StartY = nodes[i].NodePosition.Y,
EndX = nodes[i + 1].NodePosition.X, EndX = nodes[i + 1].NodePosition.X,
EndY = nodes[i + 1].NodePosition.Y, EndY = nodes[i + 1].NodePosition.Y,
ControlPoint1X = edges[i].Trajectory is not null && edges[i].Trajectory.ControlPoints.Length > 2 ? edges[i].Trajectory.ControlPoints[1].X : 0, ControlPoint1X = controlPoints is { Length: > 2 } ? controlPoints[1].X : 0,
ControlPoint1Y = edges[i].Trajectory is not null && edges[i].Trajectory.ControlPoints.Length > 2 ? edges[i].Trajectory.ControlPoints[1].Y : 0, ControlPoint1Y = controlPoints is { Length: > 2 } ? controlPoints[1].Y : 0,
ControlPoint2X = edges[i].Trajectory is not null && edges[i].Trajectory.ControlPoints.Length > 3 ? edges[i].Trajectory.ControlPoints[2].X : 0, ControlPoint2X = controlPoints is { Length: > 3 } ? controlPoints[2].X : 0,
ControlPoint2Y = edges[i].Trajectory is not null && edges[i].Trajectory.ControlPoints.Length > 3 ? edges[i].Trajectory.ControlPoints[2].Y : 0, ControlPoint2Y = controlPoints is { Length: > 3 } ? controlPoints[2].Y : 0,
Degree = edges[i].Trajectory.Degree, Degree = trajectory is null ? 1 : trajectory.Degree,
}); });
} }
} }

View File

@@ -21,11 +21,11 @@ public class RobotPathPlanner(IConfiguration Configuration)
Y1 = inNode.NodePosition.Y, Y1 = inNode.NodePosition.Y,
X2 = futureNode.NodePosition.X, X2 = futureNode.NodePosition.X,
Y2 = futureNode.NodePosition.Y, Y2 = futureNode.NodePosition.Y,
ControlPoint1X = edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].X : 0, ControlPoint1X = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].X : 0,
ControlPoint1Y = edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].Y : 0, ControlPoint1Y = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].Y : 0,
ControlPoint2X = edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].X : 0, ControlPoint2X = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].X : 0,
ControlPoint2Y = edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].Y : 0, ControlPoint2Y = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].Y : 0,
TrajectoryDegree = edge.Trajectory.Degree == 1 ? TrajectoryDegree.One : edge.Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three, TrajectoryDegree = edge.Trajectory is null ? TrajectoryDegree.One : edge.Trajectory.Degree == 1 ? TrajectoryDegree.One : edge.Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three,
}); });
(double robotx, double roboty) = (double robotx, double roboty) =
( (
@@ -61,30 +61,46 @@ public class RobotPathPlanner(IConfiguration Configuration)
navigationNodes[0].Direction = GetDirectionInNode(currentTheta, nodes[0], nodes[1], edges[0]); navigationNodes[0].Direction = GetDirectionInNode(currentTheta, nodes[0], nodes[1], edges[0]);
for (int i = 1; i < nodes.Length - 1; i++) for (int i = 1; i < nodes.Length - 1; i++)
{ {
var trajectory = edges[i - 1].Trajectory;
var controlPoints = trajectory?.ControlPoints;
(double lastx, double lasty) = MathExtensions.Curve(0.1, new() (double lastx, double lasty) = MathExtensions.Curve(0.1, new()
{ {
X1 = nodes[i - 1].NodePosition.X, X1 = nodes[i - 1].NodePosition.X,
Y1 = nodes[i - 1].NodePosition.Y, Y1 = nodes[i - 1].NodePosition.Y,
X2 = nodes[i].NodePosition.X, X2 = nodes[i].NodePosition.X,
Y2 = nodes[i].NodePosition.Y, Y2 = nodes[i].NodePosition.Y,
ControlPoint1X = edges[i - 1].Trajectory.ControlPoints.Length > 2 ? edges[i - 1].Trajectory.ControlPoints[1].X : 0, ControlPoint1X = controlPoints is { Length: > 2 } ? controlPoints[1].X : 0,
ControlPoint1Y = edges[i - 1].Trajectory.ControlPoints.Length > 2 ? edges[i - 1].Trajectory.ControlPoints[1].Y : 0, ControlPoint1Y = controlPoints is { Length: > 2 } ? controlPoints[1].Y : 0,
ControlPoint2X = edges[i - 1].Trajectory.ControlPoints.Length > 3 ? edges[i - 1].Trajectory.ControlPoints[2].X : 0, ControlPoint2X = controlPoints is { Length: > 3 } ? controlPoints[2].X : 0,
ControlPoint2Y = edges[i - 1].Trajectory.ControlPoints.Length > 3 ? edges[i - 1].Trajectory.ControlPoints[2].Y : 0, ControlPoint2Y = controlPoints is { Length: > 3 } ? controlPoints[2].Y : 0,
TrajectoryDegree = edges[i - 1].Trajectory.Degree == 1 ? TrajectoryDegree.One : edges[i - 1].Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three, TrajectoryDegree = trajectory?.Degree switch
{
1 => TrajectoryDegree.One,
2 => TrajectoryDegree.Two,
_ => TrajectoryDegree.Three
},
}); });
trajectory = edges[i].Trajectory;
controlPoints = trajectory?.ControlPoints;
(double futurex, double futurey) = MathExtensions.Curve(0.1, new() (double futurex, double futurey) = MathExtensions.Curve(0.1, new()
{ {
X1 = nodes[i].NodePosition.X, X1 = nodes[i].NodePosition.X,
Y1 = nodes[i].NodePosition.Y, Y1 = nodes[i].NodePosition.Y,
X2 = nodes[i + 1].NodePosition.X, X2 = nodes[i + 1].NodePosition.X,
Y2 = nodes[i + 1].NodePosition.Y, Y2 = nodes[i + 1].NodePosition.Y,
ControlPoint1X = edges[i].Trajectory.ControlPoints.Length > 2 ? edges[i].Trajectory.ControlPoints[1].X : 0, ControlPoint1X = controlPoints is { Length: > 2 } ? controlPoints[1].X : 0,
ControlPoint1Y = edges[i].Trajectory.ControlPoints.Length > 2 ? edges[i].Trajectory.ControlPoints[1].Y : 0, ControlPoint1Y = controlPoints is { Length: > 2 } ? controlPoints[1].Y : 0,
ControlPoint2X = edges[i].Trajectory.ControlPoints.Length > 3 ? edges[i].Trajectory.ControlPoints[2].X : 0, ControlPoint2X = controlPoints is { Length: > 3 } ? controlPoints[2].X : 0,
ControlPoint2Y = edges[i].Trajectory.ControlPoints.Length > 3 ? edges[i].Trajectory.ControlPoints[2].Y : 0, ControlPoint2Y = controlPoints is { Length: > 3 } ? controlPoints[2].Y : 0,
TrajectoryDegree = edges[i].Trajectory.Degree == 1 ? TrajectoryDegree.One : edges[i].Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three, TrajectoryDegree = trajectory?.Degree switch
{
1 => TrajectoryDegree.One,
2 => TrajectoryDegree.Two,
_ => TrajectoryDegree.Three
},
}); });
var angle = MathExtensions.GetVectorAngle( var angle = MathExtensions.GetVectorAngle(
nodes[i].NodePosition.X, nodes[i].NodePosition.X,
nodes[i].NodePosition.Y, nodes[i].NodePosition.Y,
@@ -128,11 +144,11 @@ public class RobotPathPlanner(IConfiguration Configuration)
Y1 = startNode.Y, Y1 = startNode.Y,
X2 = endNode.X, X2 = endNode.X,
Y2 = endNode.Y, Y2 = endNode.Y,
ControlPoint1X = edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].X : 0, ControlPoint1X = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].X : 0,
ControlPoint1Y = edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].Y : 0, ControlPoint1Y = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].Y : 0,
ControlPoint2X = edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].X : 0, ControlPoint2X = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].X : 0,
ControlPoint2Y = edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].Y : 0, ControlPoint2Y = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].Y : 0,
TrajectoryDegree = edge.Trajectory.Degree == 1 ? TrajectoryDegree.One : edge.Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three TrajectoryDegree = edge.Trajectory is null ? TrajectoryDegree.One : edge.Trajectory.Degree == 1 ? TrajectoryDegree.One : edge.Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three
}; };
double length = EdgeCalculatorModel.GetEdgeLength(); double length = EdgeCalculatorModel.GetEdgeLength();
@@ -194,11 +210,11 @@ public class RobotPathPlanner(IConfiguration Configuration)
Y1 = startNode.NodePosition.Y, Y1 = startNode.NodePosition.Y,
X2 = endNode.NodePosition.X, X2 = endNode.NodePosition.X,
Y2 = endNode.NodePosition.Y, Y2 = endNode.NodePosition.Y,
ControlPoint1X = edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].X : 0, ControlPoint1X = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].X : 0,
ControlPoint1Y = edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].Y : 0, ControlPoint1Y = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 2 ? edge.Trajectory.ControlPoints[1].Y : 0,
ControlPoint2X = edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].X : 0, ControlPoint2X = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].X : 0,
ControlPoint2Y = edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].Y : 0, ControlPoint2Y = edge.Trajectory is not null && edge.Trajectory.ControlPoints.Length > 3 ? edge.Trajectory.ControlPoints[2].Y : 0,
TrajectoryDegree = edge.Trajectory.Degree == 1 ? TrajectoryDegree.One : edge.Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three TrajectoryDegree = edge.Trajectory is null ? TrajectoryDegree.One : edge.Trajectory.Degree == 1 ? TrajectoryDegree.One : edge.Trajectory.Degree == 2 ? TrajectoryDegree.Two : TrajectoryDegree.Three
}; };
double length = EdgeCalculatorModel.GetEdgeLength(); double length = EdgeCalculatorModel.GetEdgeLength();

View File

@@ -1,175 +1,35 @@
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
using Microsoft.Extensions.Hosting;
using Microsoft.Extensions.Logging;
using RobotApp.Common.Shares;
using RobotApp.Hubs; using RobotApp.Hubs;
using RobotApp.Interfaces;
using RobotApp.Services.State;
using RobotApp.VDA5050.State;
using RobotApp.VDA5050.Type;
using RobotApp.VDA5050.Visualization;
using System.Text.Json;
namespace RobotApp.Services.Robot; namespace RobotApp.Services.Robot;
public class RobotStatePublisher : BackgroundService public class RobotStatePublisher(
IHubContext<RobotHub> _hubContext,
RobotStates _robotState,
RobotConnection _robotConnection) : BackgroundService
{ {
private readonly IHubContext<RobotHub> _hubContext;
private readonly RobotConfiguration _robotConfig;
private readonly IOrder _orderManager;
private readonly IInstantActions _actionManager;
private readonly IPeripheral _peripheralManager;
private readonly IInfomation _infoManager;
private readonly IError _errorManager;
private readonly ILocalization _localizationManager;
private readonly IBattery _batteryManager;
private readonly ILoad _loadManager;
private readonly INavigation _navigationManager;
private readonly RobotStateMachine _stateManager;
private uint _headerId = 0;
private readonly PeriodicTimer _timer = new(TimeSpan.FromMilliseconds(1000)); // 1 giây/lần private readonly PeriodicTimer _timer = new(TimeSpan.FromMilliseconds(1000)); // 1 giây/lần
public RobotStatePublisher(
IHubContext<RobotHub> hubContext,
RobotConfiguration robotConfig,
IOrder orderManager,
IInstantActions actionManager,
IPeripheral peripheralManager,
IInfomation infoManager,
IError errorManager,
ILocalization localizationManager,
IBattery batteryManager,
ILoad loadManager,
INavigation navigationManager,
RobotStateMachine stateManager)
{
_hubContext = hubContext;
_robotConfig = robotConfig;
_orderManager = orderManager;
_actionManager = actionManager;
_peripheralManager = peripheralManager;
_infoManager = infoManager;
_errorManager = errorManager;
_localizationManager = localizationManager;
_batteryManager = batteryManager;
_loadManager = loadManager;
_navigationManager = navigationManager;
_stateManager = stateManager;
}
private StateMsg GetStateMsg()
{
return new StateMsg
{
HeaderId = _headerId++,
Timestamp = DateTime.UtcNow.ToString("o"), // ISO 8601
Manufacturer = _robotConfig.VDA5050Setting.Manufacturer,
Version = _robotConfig.VDA5050Setting.Version,
SerialNumber = _robotConfig.SerialNumber,
Maps = [],
OrderId = _orderManager.OrderId,
OrderUpdateId = _orderManager.OrderUpdateId,
ZoneSetId = "",
LastNodeId = _orderManager.LastNodeId,
LastNodeSequenceId = _orderManager.LastNodeSequenceId,
Driving = Math.Abs(_navigationManager.VelocityX) > 0.01 || Math.Abs(_navigationManager.Omega) > 0.01,
Paused = false,
NewBaseRequest = true,
DistanceSinceLastNode = 0,
OperatingMode = _peripheralManager.PeripheralMode.ToString(),
NodeStates = _orderManager.NodeStates,
EdgeStates = _orderManager.EdgeStates,
ActionStates = _actionManager.ActionStates,
Information = [General, .. _infoManager.InformationState],
Errors = _errorManager.ErrorsState,
AgvPosition = new AgvPosition
{
X = _localizationManager.X,
Y = _localizationManager.Y,
Theta = _localizationManager.Theta,
LocalizationScore = _localizationManager.MatchingScore,
MapId = _localizationManager.CurrentActiveMap,
DeviationRange = _localizationManager.Reliability,
PositionInitialized = _localizationManager.IsReady,
},
BatteryState = new BatteryState
{
Charging = _batteryManager.IsCharging,
BatteryHealth = _batteryManager.SOH,
Reach = 0,
BatteryVoltage = _batteryManager.Voltage,
BatteryCharge = _batteryManager.SOC,
},
Loads = _loadManager.Load,
Velocity = new Velocity
{
Vx = _navigationManager.VelocityX,
Vy = _navigationManager.VelocityY,
Omega = _navigationManager.Omega,
},
SafetyState = new SafetyState
{
FieldViolation = _peripheralManager.LidarBackProtectField ||
_peripheralManager.LidarFrontProtectField ||
_peripheralManager.LidarFrontTimProtectField,
EStop = (_peripheralManager.Emergency || _peripheralManager.Bumper)
? EStop.AUTOACK.ToString()
: EStop.NONE.ToString(),
}
};
}
private Information General => new()
{
InfoType = InformationType.robot_general.ToString(),
InfoDescription = "Thông tin chung của robot",
InfoLevel = InfoLevel.INFO.ToString(),
InfoReferences =
[
new InfomationReferences
{
ReferenceKey = InformationReferencesKey.robot_state.ToString(),
ReferenceValue = _stateManager.CurrentStateName,
}
]
};
protected override async Task ExecuteAsync(CancellationToken stoppingToken) protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{ {
Console.WriteLine("[RobotStatePublisher] Started - Publishing state every 1 second via SignalR"); while (await _timer.WaitForNextTickAsync(stoppingToken))
while (await _timer.WaitForNextTickAsync(stoppingToken) && !stoppingToken.IsCancellationRequested)
{ {
try try
{ {
var state = GetStateMsg(); // ===== SEND STATE =====
var serialNumber = _robotConfig.SerialNumber; await _hubContext.Clients.All.SendAsync("ReceiveState", _robotState.GetStateMsg(), stoppingToken);
await _hubContext.Clients.All.SendAsync("ReceiveRobotConnection", _robotConnection.IsConnected, stoppingToken);
var json = JsonSerializer.Serialize(state, JsonOptionExtends.Write);
// Push đến tất cả client đang theo dõi robot này
await _hubContext.Clients
.Group(serialNumber)
.SendAsync("ReceiveState", json, stoppingToken);
//Console.WriteLine($"[RobotStatePublisher] Published state for {serialNumber} | " +
// $"HeaderId: {state.HeaderId} | " +
// $"Pos: ({state.AgvPosition.X:F2}, {state.AgvPosition.Y:F2}) | " +
// $"Battery: {state.BatteryState.BatteryCharge:F1}%");
} }
catch (Exception ex) catch
{ {
Console.WriteLine($"[RobotStatePublisher] Error publishing state: {ex.Message}");
} }
} }
Console.WriteLine("[RobotStatePublisher] Stopped.");
} }
public override void Dispose() public override Task StopAsync(CancellationToken cancellationToken)
{ {
_timer?.Dispose(); _timer?.Dispose();
base.Dispose(); base.Dispose();
return base.StopAsync(cancellationToken);
} }
} }

View File

@@ -36,7 +36,7 @@ public class RobotStates(RobotConfiguration RobotConfiguration,
catch { } catch { }
} }
private StateMsg GetStateMsg() public StateMsg GetStateMsg()
{ {
return new StateMsg return new StateMsg
{ {

View File

@@ -23,8 +23,8 @@ public class SimulationNavigation : INavigation, IDisposable
protected const int CycleHandlerMilliseconds = 50; protected const int CycleHandlerMilliseconds = 50;
private const double Scale = 1; private const double Scale = 1;
//private WatchTimer<SimulationNavigation>? NavigationTimer; private WatchTimer<SimulationNavigation>? NavigationTimer;
private HighPrecisionTimer<SimulationNavigation>? NavigationTimer; //private HighPrecisionTimer<SimulationNavigation>? NavigationTimer;
protected double TargetAngle = 0; protected double TargetAngle = 0;
protected PID? RotatePID; protected PID? RotatePID;
@@ -158,14 +158,12 @@ public class SimulationNavigation : INavigation, IDisposable
public void Pause() public void Pause()
{ {
Console.WriteLine($"Nav Pause");
ResumeState = State; ResumeState = State;
NavState = NavigationState.Paused; NavState = NavigationState.Paused;
} }
public void Resume() public void Resume()
{ {
Console.WriteLine($"Nav Resume");
NavState = ResumeState; NavState = ResumeState;
} }

View File

@@ -68,7 +68,7 @@ public class WatchTimerAsync<T>(int Interval, Func<Task> Callback, Logger<T>? Lo
Timer.Change(Interval, Timeout.Infinite); Timer.Change(Interval, Timeout.Infinite);
} }
} }
else throw new ObjectDisposedException(nameof(WatchTimer<T>)); else throw new ObjectDisposedException(nameof(WatchTimerAsync<T>));
} }
public void Stop() public void Stop()

Binary file not shown.

35
docker-compose.yaml Normal file
View File

@@ -0,0 +1,35 @@
version: '3.8'
services:
robotapp:
build:
context: .
dockerfile: Dockerfile
container_name: robotapp
restart: unless-stopped
ports:
- "8080:8080"
environment:
- ASPNETCORE_ENVIRONMENT=Production
- ASPNETCORE_URLS=http://+:8080
- ConnectionStrings__DefaultConnection=Data Source=/app/data/robot.db
volumes:
# Persist database
- ./data:/app/data
# Persist maps
- ./maps:/app/maps
# Persist logs (if needed)
- ./logs:/app/logs
networks:
- robotapp-network
healthcheck:
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080 || exit 1"]
interval: 30s
timeout: 10s
retries: 3
start_period: 40s
networks:
robotapp-network:
driver: bridge