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

Добавлен префикс таблицам первой структуры базы

Browse Source
This commit is contained in:
Mikhail Kuznetsov
2023-08-10 10:14:41 +10:00
parent f3538fdd5d
commit 39b1333969
38 changed files with 157 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
PARR.AIHIT/AIHIT/Syncher.cs
View File

@@ -25,7 +25,7 @@ namespace PARR.AIHIT
private readonly IApplicationTypeService appTypeService;
private readonly IApplicationInHostService appInHostService;
public List<ApplicationType> AppTypes { get; private set; } = new List<ApplicationType>();
public List<V1_ApplicationType> AppTypes { get; private set; } = new List<V1_ApplicationType>();
public Syncher(
ILogger<Syncher> logger,
@@ -97,7 +97,7 @@ namespace PARR.AIHIT
// var foundHost = await hostService.GetHostAsync(ip, linkEK, regionalEK);
var foundHost = await hostService.GetHostWithAppsAsync(ip, linkEK, regionalEK);
var mappedHost = mapper.Map<Host>(vm);
var mappedHost = mapper.Map<V1_Host>(vm);
var hostApplications = await GetAndFillApplicationsAsync(vm);
@@ -209,7 +209,7 @@ namespace PARR.AIHIT
}
}
private async Task SyncApplicationAndHostAsync(Host? host, List<Application> hostApplications, bool isUpdateDateModified = false)
private async Task SyncApplicationAndHostAsync(V1_Host? host, List<V1_Application> hostApplications, bool isUpdateDateModified = false)
{
var isUpdated = false;
if (host == null)
@@ -226,7 +226,7 @@ namespace PARR.AIHIT
//add
logger.LogInformation($"Host: {host.Id}, {host.LinkEK} добавление нового приложения Application {changedHostApp.Name}");
var newAppHost = new ApplicationInHost { Id = Guid.NewGuid(), ApplicationId = changedHostApp.Id, HostId = host.Id };
var newAppHost = new V1_ApplicationInHost { Id = Guid.NewGuid(), ApplicationId = changedHostApp.Id, HostId = host.Id };
if (!await appInHostService.CreateAsync(newAppHost))
logger.LogError($"Не удалось создать ApplicationInHost {changedHostApp.Name}, host: {host.Id}, {host.LinkEK}");
@@ -262,10 +262,10 @@ namespace PARR.AIHIT
}
private async Task<List<Application>> GetAndFillApplicationsAsync(XmlNode vm)
private async Task<List<V1_Application>> GetAndFillApplicationsAsync(XmlNode vm)
{
logger.LogInformation($"--- Начало парсинга данных о программном обеспечении(СП, БД, ОС) из Xml документа от АИХ ИТ ---");
var applications = new List<Application>();
var applications = new List<V1_Application>();
//TODO GetAppFromXML(vm?.Attributes?["СП"]?.Value).ForEach(async item => await CreateAppIfNotExistAsync(item, ApplicationTypesEnum.APP));
//GetDBFromXML(vm?.Attributes?["СУБД"]?.Value).ForEach(async item => await CreateAppIfNotExistAsync(item, ApplicationTypesEnum.DB));
@@ -330,7 +330,7 @@ namespace PARR.AIHIT
return osList;
}
private async Task<Application?> CreateAppIfNotExistAsync(string appName, ApplicationTypesEnum type)//Application application)
private async Task<V1_Application?> CreateAppIfNotExistAsync(string appName, ApplicationTypesEnum type)//Application application)
{
if (string.IsNullOrEmpty(appName) || string.IsNullOrWhiteSpace(appName)) return null;
@@ -346,7 +346,7 @@ namespace PARR.AIHIT
return null;
}
var app = new DAL.Models.Application
var app = new DAL.Models.V1_Application
{
Id = Guid.NewGuid(),
Name = appName.Trim(),
@@ -361,7 +361,7 @@ namespace PARR.AIHIT
return await appService.GetAsync(app.Id);
}
private ApplicationType? GetAppTypeByName(ApplicationTypesEnum type)
private V1_ApplicationType? GetAppTypeByName(ApplicationTypesEnum type)
{
var existType = AppTypes.FirstOrDefault(t => t.Name == type.ToString());
if (existType == null)