forked from ddrilling/AsbCloudServer
cleanup
This commit is contained in:
Фролов
parent
38b21d80f1
commit
1e878aaa03
@ -20,7 +20,7 @@ namespace AsbCloudInfrastructure.Services
|
||||
private readonly IFileService fileService;
|
||||
private readonly IBackgroundQueue queue;
|
||||
|
||||
public ReportService(IAsbCloudDbContext db, IConfiguration configuration,
|
||||
public ReportService(IAsbCloudDbContext db, IConfiguration configuration,
|
||||
ITelemetryService telemetryService, IFileService fileService,
|
||||
IBackgroundQueue queue)
|
||||
{
|
||||
@ -29,7 +29,7 @@ namespace AsbCloudInfrastructure.Services
|
||||
this.telemetryService = telemetryService;
|
||||
this.fileService = fileService;
|
||||
this.queue = queue;
|
||||
ReportCategoryId = db.FileCategories.FirstOrDefault(c =>
|
||||
ReportCategoryId = db.FileCategories.FirstOrDefault(c =>
|
||||
c.Name.Equals("Рапорт")).Id;
|
||||
}
|
||||
|
||||
@ -96,10 +96,10 @@ namespace AsbCloudInfrastructure.Services
|
||||
var suitableReportsProperties = suitableReportsFromDb.Select(r => new ReportPropertiesDto
|
||||
{
|
||||
Id = r.Id,
|
||||
Name = Path.GetFileName(r.Name),
|
||||
FullName = r.Name,
|
||||
Name = Path.GetFileName(r.File.Name),
|
||||
FullName = r.File.Name,
|
||||
IdWell = r.IdWell,
|
||||
Date = r.Date,
|
||||
Date = r.File.Date,
|
||||
Begin = r.Begin,
|
||||
End = r.End,
|
||||
Step = r.Step,
|
||||
@ -171,7 +171,7 @@ namespace AsbCloudInfrastructure.Services
|
||||
generator.Step = TimeSpan.FromSeconds(stepSeconds);
|
||||
generator.WithCharts = true;
|
||||
generator.WithEvents = true;
|
||||
|
||||
|
||||
return generator;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,162 +0,0 @@
|
||||
{
|
||||
"ProviderId": "Unchase.OpenAPI.ConnectedService",
|
||||
"Version": "1.5.20.0",
|
||||
"GettingStartedDocument": {
|
||||
"Uri": "https://github.com/unchase/Unchase.OpenAPI.Connectedservice/"
|
||||
},
|
||||
"ExtendedData": {
|
||||
"ServiceName": "OpenAPIService",
|
||||
"GeneratedFileName": "OpenAPI",
|
||||
"Endpoint": "https://localhost:5001/swagger/v1/swagger.json",
|
||||
"GeneratedFileNamePrefix": null,
|
||||
"GenerateCSharpClient": true,
|
||||
"GenerateTypeScriptClient": false,
|
||||
"GenerateCSharpController": false,
|
||||
"OpenApiToCSharpClientCommand": {
|
||||
"ClientBaseClass": null,
|
||||
"ConfigurationClass": null,
|
||||
"GenerateClientClasses": true,
|
||||
"GenerateClientInterfaces": false,
|
||||
"ClientBaseInterface": null,
|
||||
"InjectHttpClient": true,
|
||||
"DisposeHttpClient": true,
|
||||
"ProtectedMethods": [],
|
||||
"GenerateExceptionClasses": true,
|
||||
"ExceptionClass": "ApiException",
|
||||
"WrapDtoExceptions": true,
|
||||
"UseHttpClientCreationMethod": false,
|
||||
"HttpClientType": "System.Net.Http.HttpClient",
|
||||
"UseHttpRequestMessageCreationMethod": false,
|
||||
"UseBaseUrl": true,
|
||||
"GenerateBaseUrlProperty": true,
|
||||
"GenerateSyncMethods": false,
|
||||
"GeneratePrepareRequestAndProcessResponseAsAsyncMethods": false,
|
||||
"ExposeJsonSerializerSettings": false,
|
||||
"ClientClassAccessModifier": "public",
|
||||
"TypeAccessModifier": "public",
|
||||
"GenerateContractsOutput": false,
|
||||
"ContractsNamespace": null,
|
||||
"ContractsOutputFilePath": null,
|
||||
"ParameterDateTimeFormat": "s",
|
||||
"ParameterDateFormat": "yyyy-MM-dd",
|
||||
"GenerateUpdateJsonSerializerSettingsMethod": true,
|
||||
"UseRequestAndResponseSerializationSettings": false,
|
||||
"SerializeTypeInformation": false,
|
||||
"QueryNullValue": "",
|
||||
"ClassName": "{controller}Client",
|
||||
"OperationGenerationMode": 1,
|
||||
"AdditionalNamespaceUsages": [],
|
||||
"AdditionalContractNamespaceUsages": [],
|
||||
"GenerateOptionalParameters": false,
|
||||
"GenerateJsonMethods": false,
|
||||
"EnforceFlagEnums": false,
|
||||
"ParameterArrayType": "System.Collections.Generic.IEnumerable",
|
||||
"ParameterDictionaryType": "System.Collections.Generic.IDictionary",
|
||||
"ResponseArrayType": "System.Collections.Generic.ICollection",
|
||||
"ResponseDictionaryType": "System.Collections.Generic.IDictionary",
|
||||
"WrapResponses": false,
|
||||
"WrapResponseMethods": [],
|
||||
"GenerateResponseClasses": true,
|
||||
"ResponseClass": "SwaggerResponse",
|
||||
"Namespace": "ConsoleApp1.OpenAPIService",
|
||||
"RequiredPropertiesMustBeDefined": true,
|
||||
"DateType": "System.DateTimeOffset",
|
||||
"JsonConverters": null,
|
||||
"AnyType": "object",
|
||||
"DateTimeType": "System.DateTimeOffset",
|
||||
"TimeType": "System.TimeSpan",
|
||||
"TimeSpanType": "System.TimeSpan",
|
||||
"ArrayType": "System.Collections.Generic.ICollection",
|
||||
"ArrayInstanceType": "System.Collections.ObjectModel.Collection",
|
||||
"DictionaryType": "System.Collections.Generic.IDictionary",
|
||||
"DictionaryInstanceType": "System.Collections.Generic.Dictionary",
|
||||
"ArrayBaseType": "System.Collections.ObjectModel.Collection",
|
||||
"DictionaryBaseType": "System.Collections.Generic.Dictionary",
|
||||
"ClassStyle": 0,
|
||||
"JsonLibrary": 0,
|
||||
"GenerateDefaultValues": true,
|
||||
"GenerateDataAnnotations": true,
|
||||
"ExcludedTypeNames": [],
|
||||
"ExcludedParameterNames": [],
|
||||
"HandleReferences": false,
|
||||
"GenerateImmutableArrayProperties": false,
|
||||
"GenerateImmutableDictionaryProperties": false,
|
||||
"JsonSerializerSettingsTransformationMethod": null,
|
||||
"InlineNamedArrays": false,
|
||||
"InlineNamedDictionaries": false,
|
||||
"InlineNamedTuples": true,
|
||||
"InlineNamedAny": false,
|
||||
"GenerateDtoTypes": true,
|
||||
"GenerateOptionalPropertiesAsNullable": false,
|
||||
"GenerateNullableReferenceTypes": false,
|
||||
"TemplateDirectory": null,
|
||||
"TypeNameGeneratorType": null,
|
||||
"PropertyNameGeneratorType": null,
|
||||
"EnumNameGeneratorType": null,
|
||||
"ServiceHost": null,
|
||||
"ServiceSchemes": null,
|
||||
"output": "OpenAPI.cs",
|
||||
"newLineBehavior": 0
|
||||
},
|
||||
"ExcludeTypeNamesLater": true,
|
||||
"OpenApiToTypeScriptClientCommand": null,
|
||||
"OpenApiToCSharpControllerCommand": null,
|
||||
"Variables": null,
|
||||
"Runtime": 0,
|
||||
"CopySpecification": false,
|
||||
"OpenGeneratedFilesOnComplete": false,
|
||||
"UseRelativePath": false,
|
||||
"ConvertFromOdata": false,
|
||||
"OpenApiConvertSettings": {
|
||||
"ServiceRoot": "http://localhost",
|
||||
"Version": {
|
||||
"Major": 1,
|
||||
"Minor": 0,
|
||||
"Build": 1,
|
||||
"Revision": -1,
|
||||
"MajorRevision": -1,
|
||||
"MinorRevision": -1
|
||||
},
|
||||
"EnableKeyAsSegment": null,
|
||||
"EnableUnqualifiedCall": false,
|
||||
"EnableOperationPath": true,
|
||||
"EnableOperationImportPath": true,
|
||||
"EnableNavigationPropertyPath": true,
|
||||
"TagDepth": 4,
|
||||
"PrefixEntityTypeNameBeforeKey": false,
|
||||
"OpenApiSpecVersion": 1,
|
||||
"EnableOperationId": true,
|
||||
"EnableUriEscapeFunctionCall": false,
|
||||
"VerifyEdmModel": false,
|
||||
"IEEE754Compatible": false,
|
||||
"TopExample": 50,
|
||||
"EnablePagination": false,
|
||||
"PageableOperationName": "listMore",
|
||||
"EnableDiscriminatorValue": false,
|
||||
"EnableDerivedTypesReferencesForResponses": false,
|
||||
"EnableDerivedTypesReferencesForRequestBody": false,
|
||||
"PathPrefix": "OData",
|
||||
"RoutePathPrefixProvider": {
|
||||
"PathPrefix": "OData",
|
||||
"Parameters": null
|
||||
},
|
||||
"ShowLinks": false,
|
||||
"ShowSchemaExamples": false,
|
||||
"RequireDerivedTypesConstraintForBoundOperations": false,
|
||||
"ShowRootPath": false,
|
||||
"ShowMsDosGroupPath": true,
|
||||
"PathProvider": null
|
||||
},
|
||||
"OpenApiSpecVersion": 0,
|
||||
"UseNetworkCredentials": false,
|
||||
"NetworkCredentialsUserName": null,
|
||||
"NetworkCredentialsPassword": null,
|
||||
"NetworkCredentialsDomain": null,
|
||||
"WebProxyUri": null,
|
||||
"UseWebProxy": false,
|
||||
"UseWebProxyCredentials": false,
|
||||
"WebProxyNetworkCredentialsUserName": null,
|
||||
"WebProxyNetworkCredentialsPassword": null,
|
||||
"WebProxyNetworkCredentialsDomain": null
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,99 +0,0 @@
|
||||
{
|
||||
"runtime": "NetCore21",
|
||||
"defaultVariables": null,
|
||||
"documentGenerator": {
|
||||
"fromDocument": {
|
||||
"url": "https://localhost:5001/swagger/v1/swagger.json",
|
||||
"output": "OpenAPI.nswag.json",
|
||||
"newLineBehavior": "Auto"
|
||||
}
|
||||
},
|
||||
"codeGenerators": {
|
||||
"openApiToCSharpClient": {
|
||||
"clientBaseClass": null,
|
||||
"configurationClass": null,
|
||||
"generateClientClasses": true,
|
||||
"generateClientInterfaces": false,
|
||||
"clientBaseInterface": null,
|
||||
"injectHttpClient": true,
|
||||
"disposeHttpClient": true,
|
||||
"protectedMethods": [],
|
||||
"generateExceptionClasses": true,
|
||||
"exceptionClass": "ApiException",
|
||||
"wrapDtoExceptions": true,
|
||||
"useHttpClientCreationMethod": false,
|
||||
"httpClientType": "System.Net.Http.HttpClient",
|
||||
"useHttpRequestMessageCreationMethod": false,
|
||||
"useBaseUrl": true,
|
||||
"generateBaseUrlProperty": true,
|
||||
"generateSyncMethods": false,
|
||||
"generatePrepareRequestAndProcessResponseAsAsyncMethods": false,
|
||||
"exposeJsonSerializerSettings": false,
|
||||
"clientClassAccessModifier": "public",
|
||||
"typeAccessModifier": "public",
|
||||
"generateContractsOutput": false,
|
||||
"contractsNamespace": null,
|
||||
"contractsOutputFilePath": null,
|
||||
"parameterDateTimeFormat": "s",
|
||||
"parameterDateFormat": "yyyy-MM-dd",
|
||||
"generateUpdateJsonSerializerSettingsMethod": true,
|
||||
"useRequestAndResponseSerializationSettings": false,
|
||||
"serializeTypeInformation": false,
|
||||
"queryNullValue": "",
|
||||
"className": "{controller}Client",
|
||||
"operationGenerationMode": "MultipleClientsFromPathSegments",
|
||||
"additionalNamespaceUsages": [],
|
||||
"additionalContractNamespaceUsages": [],
|
||||
"generateOptionalParameters": false,
|
||||
"generateJsonMethods": false,
|
||||
"enforceFlagEnums": false,
|
||||
"parameterArrayType": "System.Collections.Generic.IEnumerable",
|
||||
"parameterDictionaryType": "System.Collections.Generic.IDictionary",
|
||||
"responseArrayType": "System.Collections.Generic.ICollection",
|
||||
"responseDictionaryType": "System.Collections.Generic.IDictionary",
|
||||
"wrapResponses": false,
|
||||
"wrapResponseMethods": [],
|
||||
"generateResponseClasses": true,
|
||||
"responseClass": "SwaggerResponse",
|
||||
"namespace": "ConsoleApp1.OpenAPIService",
|
||||
"requiredPropertiesMustBeDefined": true,
|
||||
"dateType": "System.DateTimeOffset",
|
||||
"jsonConverters": null,
|
||||
"anyType": "object",
|
||||
"dateTimeType": "System.DateTimeOffset",
|
||||
"timeType": "System.TimeSpan",
|
||||
"timeSpanType": "System.TimeSpan",
|
||||
"arrayType": "System.Collections.Generic.ICollection",
|
||||
"arrayInstanceType": "System.Collections.ObjectModel.Collection",
|
||||
"dictionaryType": "System.Collections.Generic.IDictionary",
|
||||
"dictionaryInstanceType": "System.Collections.Generic.Dictionary",
|
||||
"arrayBaseType": "System.Collections.ObjectModel.Collection",
|
||||
"dictionaryBaseType": "System.Collections.Generic.Dictionary",
|
||||
"classStyle": "Poco",
|
||||
"jsonLibrary": "NewtonsoftJson",
|
||||
"generateDefaultValues": true,
|
||||
"generateDataAnnotations": true,
|
||||
"excludedTypeNames": [],
|
||||
"excludedParameterNames": [],
|
||||
"handleReferences": false,
|
||||
"generateImmutableArrayProperties": false,
|
||||
"generateImmutableDictionaryProperties": false,
|
||||
"jsonSerializerSettingsTransformationMethod": null,
|
||||
"inlineNamedArrays": false,
|
||||
"inlineNamedDictionaries": false,
|
||||
"inlineNamedTuples": true,
|
||||
"inlineNamedAny": false,
|
||||
"generateDtoTypes": true,
|
||||
"generateOptionalPropertiesAsNullable": false,
|
||||
"generateNullableReferenceTypes": false,
|
||||
"templateDirectory": null,
|
||||
"typeNameGeneratorType": null,
|
||||
"propertyNameGeneratorType": null,
|
||||
"enumNameGeneratorType": null,
|
||||
"serviceHost": null,
|
||||
"serviceSchemes": null,
|
||||
"output": "OpenAPI.cs",
|
||||
"newLineBehavior": "Auto"
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -6,23 +6,21 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="AutoMapper" Version="10.1.1" />
|
||||
<PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
|
||||
<PackageReference Include="Mapster" Version="7.2.0" />
|
||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="5.0.5" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
|
||||
<PackageReference Include="System.Net.Http" Version="4.3.4" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Reference Include="AsbSaubReport">
|
||||
<HintPath>..\AsbCloudInfrastructure\CommonLibs\AsbSaubReport\AsbSaubReport.dll</HintPath>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<WCFMetadata Include="Connected Services" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Connected Services\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@ -8,14 +8,19 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using Mapster;
|
||||
|
||||
namespace ConsoleApp1
|
||||
{
|
||||
|
||||
|
||||
|
||||
class Program
|
||||
{
|
||||
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;
|
||||
@ -42,9 +47,5 @@ namespace ConsoleApp1
|
||||
Console.ReadKey();
|
||||
}
|
||||
|
||||
private static void Generator_OnProgress(object sender, (float progress, string operation) e)
|
||||
{
|
||||
//throw new NotImplementedException();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user