diff --git a/AsbCloudApp/Data/CompanyDto.cs b/AsbCloudApp/Data/CompanyDto.cs index 572c4b24..cc77eace 100644 --- a/AsbCloudApp/Data/CompanyDto.cs +++ b/AsbCloudApp/Data/CompanyDto.cs @@ -1,5 +1,6 @@ namespace AsbCloudApp.Data { + public class CompanyDto : IId { public int Id { get; set; } diff --git a/AsbCloudApp/Data/CompanyTypeDto.cs b/AsbCloudApp/Data/CompanyTypeDto.cs new file mode 100644 index 00000000..07366b57 --- /dev/null +++ b/AsbCloudApp/Data/CompanyTypeDto.cs @@ -0,0 +1,9 @@ +namespace AsbCloudApp.Data +{ + public class CompanyTypeDto : IId + { + public int Id { get; set; } + public string Caption { get; set; } + + } +} diff --git a/AsbCloudDb/Readme.md b/AsbCloudDb/Readme.md index dca7192a..bd7be8e3 100644 --- a/AsbCloudDb/Readme.md +++ b/AsbCloudDb/Readme.md @@ -54,14 +54,16 @@ SELECT timescaledb_pre_restore(); ### Step 3. Restore DB, then [Longest operation] Terminal: ``` -sudo -u postgres psql -p 5499 -U postgres postgres -W < dump_2021-11-26.bak +sudo -u postgres psql -p 5499 -U postgres postgres -W < dump_2021-11-26.bak or -sudo pg_restore -Fc -d postgres dump_2021-11-26.bak +sudo -u postgres pg_restore -Fc -d postgres dump_2021-11-26.bak ``` OR psql: ``` \! pg_restore -Fc -d postgres dump_2021-11-26.bak ``` +win: +pg_restore -Fc -d postgres -U postgres -W dump_2022-01-11.bak Then 'exit restore mode' psql: ``` SELECT timescaledb_post_restore(); diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 926abdb1..fd56eae1 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -32,6 +32,7 @@ namespace AsbCloudInfrastructure TypeAdapterConfig.GlobalSettings.Default.Config .ForType() .MapWith((source) => source.DateTime); + TypeAdapterConfig.GlobalSettings.Default.Config .ForType() .MapWith((source) => source == default ? new DateTime(0, DateTimeKind.Utc) : source); @@ -81,11 +82,12 @@ namespace AsbCloudInfrastructure services.AddTransient(); // admin crud services: - services.AddTransient, CrudServiceBase>(); + services.AddTransient, CrudServiceBase>(); // может быть включен в сервис TelemetryService services.AddTransient, DrillParamsService>(); - services.AddTransient, CrudServiceBase>(); - services.AddTransient, CrudServiceBase>(); - services.AddTransient, CrudServiceBase>(); + services.AddTransient, CrudCacheServiceBase>(); + services.AddTransient, CrudCacheServiceBase>(); + services.AddTransient, CrudCacheServiceBase>(); + services.AddTransient, CrudCacheServiceBase>(); // может быть включен в сервис ClusterService services.AddTransient, CrudCacheServiceBase>(); // TelemetryData services diff --git a/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs b/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs new file mode 100644 index 00000000..a2c3bb81 --- /dev/null +++ b/AsbCloudWebApi/Controllers/AdminCompanyTypeController.cs @@ -0,0 +1,17 @@ +using AsbCloudApp.Data; +using AsbCloudApp.Services; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace AsbCloudWebApi.Controllers +{ + [Route("api/admin/companyType")] + [ApiController] + [Authorize] + public class AdminCompanyTypeController : CrudController> + { + public AdminCompanyTypeController(ICrudService service) + : base(service) + { } + } +} \ No newline at end of file diff --git a/AsbCloudWebApi/Controllers/AdminPermissionController.cs b/AsbCloudWebApi/Controllers/AdminPermissionController.cs index a7633f58..bd5c163c 100644 --- a/AsbCloudWebApi/Controllers/AdminPermissionController.cs +++ b/AsbCloudWebApi/Controllers/AdminPermissionController.cs @@ -1,6 +1,3 @@ -using System.Collections.Generic; -using System.Threading; -using System.Threading.Tasks; using AsbCloudApp.Data; using AsbCloudApp.Services; using Microsoft.AspNetCore.Authorization; @@ -13,8 +10,8 @@ namespace AsbCloudWebApi.Controllers [Authorize] public class AdminPermissionController : CrudController> { - public AdminPermissionController(ICrudService permissionService) - :base(permissionService) + public AdminPermissionController(ICrudService service) + :base(service) {} } } \ No newline at end of file diff --git a/AsbCloudWebApi/wwwroot/asset-manifest.json b/AsbCloudWebApi/wwwroot/asset-manifest.json index be79f148..3adca2c8 100644 --- a/AsbCloudWebApi/wwwroot/asset-manifest.json +++ b/AsbCloudWebApi/wwwroot/asset-manifest.json @@ -1,8 +1,8 @@ { "files": { - "main.css": "/static/css/main.9cfe6b31.chunk.css", - "main.js": "/static/js/main.f6229874.chunk.js", - "main.js.map": "/static/js/main.f6229874.chunk.js.map", + "main.css": "/static/css/main.dd1fcee2.chunk.css", + "main.js": "/static/js/main.b2e71633.chunk.js", + "main.js.map": "/static/js/main.b2e71633.chunk.js.map", "runtime-main.js": "/static/js/runtime-main.33aef657.js", "runtime-main.js.map": "/static/js/runtime-main.33aef657.js.map", "static/js/2.968888d9.chunk.js": "/static/js/2.968888d9.chunk.js", @@ -26,7 +26,7 @@ "static/js/11.8f392911.chunk.js": "/static/js/11.8f392911.chunk.js", "static/js/11.8f392911.chunk.js.map": "/static/js/11.8f392911.chunk.js.map", "index.html": "/index.html", - "static/css/main.9cfe6b31.chunk.css.map": "/static/css/main.9cfe6b31.chunk.css.map", + "static/css/main.dd1fcee2.chunk.css.map": "/static/css/main.dd1fcee2.chunk.css.map", "static/js/2.968888d9.chunk.js.LICENSE.txt": "/static/js/2.968888d9.chunk.js.LICENSE.txt", "static/media/ClusterIcon.a395f860.svg": "/static/media/ClusterIcon.a395f860.svg", "static/media/DepositIcon.6de7c7ae.svg": "/static/media/DepositIcon.6de7c7ae.svg" @@ -34,7 +34,7 @@ "entrypoints": [ "static/js/runtime-main.33aef657.js", "static/js/2.968888d9.chunk.js", - "static/css/main.9cfe6b31.chunk.css", - "static/js/main.f6229874.chunk.js" + "static/css/main.dd1fcee2.chunk.css", + "static/js/main.b2e71633.chunk.js" ] } \ No newline at end of file diff --git a/AsbCloudWebApi/wwwroot/index.html b/AsbCloudWebApi/wwwroot/index.html index 2cbd4e4f..25fbd8ab 100644 --- a/AsbCloudWebApi/wwwroot/index.html +++ b/AsbCloudWebApi/wwwroot/index.html @@ -1 +1 @@ -АСБ Vision
ц \ No newline at end of file +АСБ Vision
ц \ No newline at end of file