on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

fix analyze recomendations

Browse Source
This commit is contained in:
Фролов 2021-11-15 16:52:12 +05:00
parent 496c24099d
commit 212989b3b6
6 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
AsbCloudDb/EFExtentions.cs
View File

@ -13,7 +13,7 @@ namespace AsbCloudDb
{ {
static Dictionary<Type, IQueryStringFactory> QueryFactories { get; set; } = new Dictionary<Type, IQueryStringFactory>(); static Dictionary<Type, IQueryStringFactory> QueryFactories { get; set; } = new Dictionary<Type, IQueryStringFactory>();
static IQueryStringFactory GetQueryStringFactory<T>(DbSet<T> dbset, IEnumerable<T> items) static IQueryStringFactory GetQueryStringFactory<T>(DbSet<T> dbset)
where T : class where T : class
{ {
var t = typeof(T); var t = typeof(T);
@ -30,7 +30,7 @@ namespace AsbCloudDb
public static Task<int> ExecInsertOrUpdateAsync<T>(this Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade database, DbSet<T> dbset, IEnumerable<T> items, CancellationToken token) public static Task<int> ExecInsertOrUpdateAsync<T>(this Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade database, DbSet<T> dbset, IEnumerable<T> items, CancellationToken token)
where T : class where T : class
{ {
var factory = (QueryStringFactory<T>)GetQueryStringFactory(dbset, items); var factory = (QueryStringFactory<T>)GetQueryStringFactory(dbset);
var query = factory.MakeInsertOrUpdateSql(items); var query = factory.MakeInsertOrUpdateSql(items);
return database.ExecuteSqlRawAsync(query, token); return database.ExecuteSqlRawAsync(query, token);
} }
@ -43,9 +43,9 @@ namespace AsbCloudDb
{ {
private readonly string pk; private readonly string pk;
private readonly string tableName; private readonly string tableName;
private string colunmsString; private readonly string colunmsString;
private string conflictUpdateSet; private readonly string conflictUpdateSet;
private IEnumerable<IClrPropertyGetter> getters; private readonly IEnumerable<IClrPropertyGetter> getters;
public QueryStringFactory(DbSet<T> dbset) public QueryStringFactory(DbSet<T> dbset)
{ {

1
AsbCloudInfrastructure/Services/FileService.cs
View File

@ -118,7 +118,6 @@ namespace AsbCloudInfrastructure.Services
using var newfileStream = new FileStream(filePath, FileMode.Create); using var newfileStream = new FileStream(filePath, FileMode.Create);
await fileStream.CopyToAsync(newfileStream, token).ConfigureAwait(false); await fileStream.CopyToAsync(newfileStream, token).ConfigureAwait(false);
await fileStream.CopyToAsync(newfileStream);
var dto = entry.Entity.Adapt<FileInfoDto>(); var dto = entry.Entity.Adapt<FileInfoDto>();
return dto; return dto;

2
AsbCloudInfrastructure/Services/GoogleDriveService.cs
View File

@ -146,7 +146,7 @@ namespace AsbCloudInfrastructure.Services
CancellationToken token = default) CancellationToken token = default)
{ {
var command = service.Files.Delete(fileId); var command = service.Files.Delete(fileId);
var result = await command.ExecuteAsync(token) await command.ExecuteAsync(token)
.ConfigureAwait(false); .ConfigureAwait(false);
} }

2
AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs
View File

@ -24,7 +24,6 @@ namespace AsbCloudInfrastructure.Services
protected readonly CacheTable<Telemetry> cacheTelemetry; protected readonly CacheTable<Telemetry> cacheTelemetry;
protected readonly CacheTable<TelemetryUser> cacheTelemetryUsers; protected readonly CacheTable<TelemetryUser> cacheTelemetryUsers;
protected readonly CacheTable<Well> cacheWells; protected readonly CacheTable<Well> cacheWells;
private static int disorderId = (int)DateTime.Now.Ticks % 99;
public TelemetryDataBaseService( public TelemetryDataBaseService(
IAsbCloudDbContext db, IAsbCloudDbContext db,
@ -77,7 +76,6 @@ namespace AsbCloudInfrastructure.Services
Trace.WriteLine($"Fail to save data telemerty uid: {uid}, idTelemetry {idTelemetry} count: {enitties.Count()} dataDate: {enitties.FirstOrDefault()?.Date}. Message: {ex.Message}"); Trace.WriteLine($"Fail to save data telemerty uid: {uid}, idTelemetry {idTelemetry} count: {enitties.Count()} dataDate: {enitties.FirstOrDefault()?.Date}. Message: {ex.Message}");
return 0; return 0;
} }
} }
public virtual async Task<IEnumerable<TDto>> GetAsync(int idWell, public virtual async Task<IEnumerable<TDto>> GetAsync(int idWell,

2
AsbCloudWebApi/Controllers/FileController.cs
View File

@ -59,7 +59,7 @@ namespace AsbCloudWebApi.Controllers
{ {
var fileStream = file.OpenReadStream(); var fileStream = file.OpenReadStream();
await fileService.SaveAsync(idWell, idUser??0, idCategory, file.FileName, await fileService.SaveAsync(idWell, idUser??0, idCategory, file.FileName,
fileStream); fileStream, token).ConfigureAwait(false);
} }
return Ok(); return Ok();

11
ConsoleApp1/Program.cs
View File

@ -19,17 +19,6 @@ namespace ConsoleApp1
{ {
static void Main(/*string[] args*/) static void Main(/*string[] args*/)
{ {
var options = new DbContextOptionsBuilder<AsbCloudDbContext>()
.UseNpgsql("Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True")
.Options;
var context = new AsbCloudDbContext(options);
//var query = context.Clusters.GetInsertOrUpdateSql(
// new List<Cluster> {
// new Cluster{Caption = "cluster 1", },
// new Cluster{Caption = "cluster 2"},
// });
Console.ReadKey(); Console.ReadKey();
} }
} }