Add metering devices page

This commit is contained in:
2025-11-28 16:45:20 +09:00
parent 8eb8786341
commit 59fcb7576a
5 changed files with 93 additions and 2 deletions

View File

@ -34,6 +34,7 @@
<RadzenPanelMenuItem Path="/objects/houses" Text="Жилищный фонд" /> <RadzenPanelMenuItem Path="/objects/houses" Text="Жилищный фонд" />
<RadzenPanelMenuItem Path="/objects/supply-contracts" Text="Договора ресурсоснабжения" /> <RadzenPanelMenuItem Path="/objects/supply-contracts" Text="Договора ресурсоснабжения" />
<RadzenPanelMenuItem Path="/objects/accounts" Text="Лицевые счета" /> <RadzenPanelMenuItem Path="/objects/accounts" Text="Лицевые счета" />
<RadzenPanelMenuItem Path="/objects/metering-devices" Text="Приборы учета" />
</RadzenPanelMenuItem> </RadzenPanelMenuItem>
<RadzenPanelMenuItem Text="Справочники" Icon="book_2"> <RadzenPanelMenuItem Text="Справочники" Icon="book_2">
<RadzenPanelMenuItem Path="/registry/common" Text="Общие" /> <RadzenPanelMenuItem Path="/registry/common" Text="Общие" />

View File

@ -0,0 +1,59 @@
@page "/objects/metering-devices"
@using Hcs.WebApp.Services
@using Microsoft.AspNetCore.Authorization
@using System.Security.Claims
@inherits DataPageBase<MeteringDevice>
@attribute [Authorize]
@inject MeteringDeviceService MeteringDeviceService
<PageTitle>Приборы учета</PageTitle>
<AuthorizedContent Roles="@($"{AppRole.ADMINISTRATOR_TYPE},{AppRole.OPERATOR_TYPE}")">
<Content>
<RadzenStack>
<RadzenRow AlignItems="AlignItems.Center">
<RadzenColumn Size="12" SizeMD="6">
<RadzenText Text="Приборы учета" TextStyle="TextStyle.H5" class="rz-m-0" />
</RadzenColumn>
<RadzenColumn Size="12" SizeMD="6">
<RadzenStack Orientation="Orientation.Horizontal" AlignItems="AlignItems.Center" JustifyContent="JustifyContent.End" Gap="0.5rem">
<RadzenButton Icon="upload_file" Text="@parseButtonText" Disabled="@(state != DataPageState.Idle)" Click="@ParseDataAsync" ButtonStyle="ButtonStyle.Primary" />
<RadzenButton Icon="sync" Text="@syncButtonText" Disabled="@(state != DataPageState.Idle)" Click="@SyncDataAsync" ButtonStyle="ButtonStyle.Primary" />
</RadzenStack>
</RadzenColumn>
</RadzenRow>
<RadzenRow>
<RadzenColumn SizeMD="12">
<RadzenDataGrid TItem="MeteringDevice" Data="@data" IsLoading="@(state != DataPageState.Idle)" AllowFiltering="true" AllowPaging="true" ShowPagingSummary="true" PageSizeOptions=@(new int[] { 5, 10, 20, 30 }) AllowSorting="true">
<Columns>
<RadzenDataGridColumn TItem="MeteringDevice" Property="@nameof(SupplyContract.Id)" Title="ID" SortOrder="SortOrder.Descending" Resizable="false" Width="100px" MaxWidth="100px" />
<RadzenDataGridColumn TItem="MeteringDevice" Property="@nameof(SupplyContract.HcsId)" Title="ID ГИС ЖКХ" />
<RadzenDataGridColumn TItem="MeteringDevice" Property="@nameof(SupplyContract.ThirdPartyId)" Title="ID интеграции" />
<RadzenDataGridColumn TItem="MeteringDevice" Property="@nameof(SupplyContract.SyncedAt)" Title="Дата синхронизации" />
</Columns>
</RadzenDataGrid>
</RadzenColumn>
</RadzenRow>
</RadzenStack>
</Content>
</AuthorizedContent>
@code {
protected override Campaign.CampaignType? SyncCampaignType => Campaign.CampaignType.ExportSupplyContracts_15_7_0_1;
protected override Campaign.CampaignType? ParseCampaignType => null;
protected override bool HasPermission(ClaimsPrincipal user)
{
return user.IsOperatorOrHigher();
}
protected override Task<IEnumerable<MeteringDevice>> GetDataAsync()
{
return MeteringDeviceService.GetAllMeteringDevicesAsync();
}
}

View File

@ -74,6 +74,7 @@ builder.Services.AddScoped<HouseService>();
builder.Services.AddScoped<FileToParseService>(); builder.Services.AddScoped<FileToParseService>();
builder.Services.AddScoped<SupplyContractService>(); builder.Services.AddScoped<SupplyContractService>();
builder.Services.AddScoped<AccountService>(); builder.Services.AddScoped<AccountService>();
builder.Services.AddScoped<MeteringDeviceService>();
builder.Services.AddSingleton<CampaignManagementState>(); builder.Services.AddSingleton<CampaignManagementState>();
builder.Services.AddSingleton<OperationExecutionState>(); builder.Services.AddSingleton<OperationExecutionState>();

View File

@ -18,11 +18,11 @@ namespace Hcs.WebApp.Services
{ {
PropertiesToExcludeOnUpdate = PropertiesToExcludeOnUpdate =
[ [
nameof(SupplyContract.ThirdPartyId) nameof(Account.ThirdPartyId)
], ],
UpdateByProperties = UpdateByProperties =
[ [
nameof(SupplyContract.HcsId) nameof(Account.HcsId)
] ]
}); });
} }

View File

@ -0,0 +1,30 @@
using EFCore.BulkExtensions;
using Hcs.WebApp.Data.Hcs;
using Microsoft.EntityFrameworkCore;
namespace Hcs.WebApp.Services
{
public class MeteringDeviceService(IDbContextFactory<HcsDbContext> factory) : HcsServiceBase(factory)
{
public async Task<IEnumerable<MeteringDevice>> GetAllMeteringDevicesAsync()
{
using var context = GetNewContext();
return await context.MeteringDevices.ToListAsync();
}
public async Task UpsertMeteringDevices(HcsDbContext context, IEnumerable<MeteringDevice> meteringDevices)
{
await context.BulkInsertOrUpdateAsync(meteringDevices, new BulkConfig()
{
PropertiesToExcludeOnUpdate =
[
nameof(MeteringDevice.ThirdPartyId)
],
UpdateByProperties =
[
nameof(MeteringDevice.HcsId)
]
});
}
}
}