ngfrolov
579b5f26da
Remove legacy telemetry analysis, except db model
2022-04-29 12:27:12 +05:00
ngfrolov
be8287f041
Add detected operations controller
2022-04-28 15:04:13 +05:00
zikan
019c6a4db1
- Added t_daily_report table and related migrations;
...
- Added request processing service for DailyReportController. Implemented all methods except DownloadAsync.
2022-04-26 16:45:52 +05:00
ngfrolov
45fb5ab8e8
Add Db store for detected operations.
...
Add backgroudService for periodically detect.
2022-04-25 17:41:18 +05:00
ngfrolov
6c845b7f9f
Complete from Ivanov
2022-04-25 15:38:44 +05:00
ngfrolov
4a91a29f07
Rename DetectedOperation props simmmilar to WellOperation
2022-04-25 12:17:14 +05:00
ngfrolov
6738bb3b35
Add DetectorService
2022-04-22 17:17:38 +05:00
ngfrolov
9023aef984
Контроллер заглушка для суточного рапорта.
2022-04-19 12:14:03 +05:00
ngfrolov
7b957d0edb
Add WitsControllerAbstract.GetLastDataAsync(..)
2022-04-15 14:45:49 +05:00
ngfrolov
ac130e3efc
Fix DateTimeOffset overflow
2022-04-15 13:36:09 +05:00
ngfrolov
b6b5039d97
Add torque_pid_out_limit to setpointsService
2022-04-13 17:50:09 +05:00
ngfrolov
fa9486e44d
grouping services and controllers
2022-04-11 18:00:34 +05:00
ngfrolov
c96bf87f17
Reorganize dtos
2022-04-08 13:10:06 +05:00
ngfrolov
24b0bc9d8c
Add WITS record tables
2022-04-01 17:55:44 +05:00
ngfrolov
0521809e6e
fix timezone in tvd
2022-03-29 10:36:18 +05:00
ngfrolov
b12c3efffc
Fix ScheduleReportService correct deltaDepth
2022-03-18 16:54:40 +05:00
ngfrolov
3f2a7406d2
Add ScheduleReport
2022-03-17 16:56:13 +05:00
ngfrolov
c2a691f224
Simplify dependencies
2022-03-16 16:07:37 +05:00
ngfrolov
08d351a439
Add notice to WellOperationImportTemplate
2022-03-16 16:06:52 +05:00
Фролов
007f7ac62e
Fix UserService.GetNestedPermissions(). returns all permissions for all nested roles
2022-03-15 16:19:51 +05:00
Фролов
fdc22f4f94
start report tvd
2022-03-11 18:07:25 +05:00
Фролов
efdcb4f211
Add nptDays to WellOperationService
2022-03-11 16:53:31 +05:00
Фролов
b613cb5e1f
rename WellOperationDto.NptDays to NptHours
2022-03-10 17:17:52 +05:00
Фролов
1e46a3c478
Fix setpoints. Ошибка в дате и времени
2022-03-09 16:49:02 +05:00
Фролов
3ebb0020f5
OperationsStatService add calc cumulative non productive time
2022-03-04 10:15:52 +05:00
Фролов
bafa372d66
rename some methods
2022-03-02 17:42:34 +05:00
Фролов
557d7af25a
Fix drillingProgram fileMarks DateTime
2022-03-02 17:41:59 +05:00
Фролов
7b8cbb71be
Edit UserSrvice. UserRolesDto in UserDto is 1 level of nesting
2022-03-01 09:51:16 +05:00
Фролов
45cce481ee
Add emailService
2022-02-28 14:44:26 +05:00
Фролов
f286410eff
Add DrillingProgramCreateError
2022-02-28 14:44:15 +05:00
Фролов
cee68bf4ee
DrillingProgramStateDto Add PermissionToEdit
2022-02-24 09:52:11 +05:00
Фролов
433bc30316
fix default EF data.
2022-02-21 12:04:26 +05:00
Фролов
4863b69cfe
DrillingProgram replace idPart by idFileCategory.
2022-02-18 14:16:35 +05:00
Фролов
7a77ff7904
Add backgroundService.
...
ReportService uses backgroundService.
Drilling program alpha
2022-02-17 15:37:27 +05:00
Фролов
e4e906c8d7
DrillingProgramService существенно переработан.
2022-02-12 11:28:16 +05:00
Фролов
def7868b9a
spelling
2022-02-08 13:03:56 +05:00
Фролов
4d89f3785b
CS2-147 При отсутствии файла выдавать 404
2022-02-08 10:25:05 +05:00
Фролов
99a2592ace
Add shorthand to check admins permissions
2022-01-31 11:09:24 +05:00
Харченко Владимир
52c8f6a79b
Fix: Added null check for cluster stats with no operations
2022-01-25 15:00:17 +05:00
Фролов
e1afec1810
Add Permissions 'generator' file
2022-01-21 17:58:02 +05:00
Фролов
8633616481
Fix DrillFlowChartService.UpdateAsync() utc time
2022-01-21 17:32:10 +05:00
Фролов
7a10d26ca6
CS2-145 Добавить специальный ArgumentInvalidException кастомной вылидации для замены ArgumentException
2022-01-18 11:04:44 +05:00
Фролов
7cf1a69dd5
CS2-138 Запретить удалять и редактировать пользователя dev
2022-01-17 14:31:07 +05:00
Фролов
c2c82c2cda
Complete UserRoleService crud and unit test.
2022-01-13 15:51:06 +05:00
Фролов
0109e529f6
CS2-142 Изменить UserRole
2022-01-13 14:36:27 +05:00
Фролов
9eb1070941
Add Day to TVD
2022-01-12 17:46:33 +05:00
Фролов
0050427ccf
Doc.
...
Remove https config.
Default timezone on create new telemetry by data received.
2022-01-10 18:12:31 +05:00
Фролов
90a0aa9e5b
Add TryGetTimezone methods.
...
EnshureTimezonesIsSet() sets default timezone if can't find correct one.
Edit WellDto to fix exception by constr: FK_t_well_t_well_type_id_well_type. Make IdWellType optional.
2022-01-10 17:39:33 +05:00
Фролов
0687efa5af
WellService.Update can get IdTelemetry from dto.IdTelemetry or dto.telemetry.id.
2022-01-10 11:45:14 +05:00
Фролов
345ca47f87
CS2-135. Db model uses DateTimeOffset. see about using DateTime[Offset].md
2022-01-05 17:50:45 +05:00
Фролов
4872b4a495
не доделано перед праздниками
2021-12-30 17:05:44 +05:00
Фролов
989fb8ad95
Update constants in GoogleDriveService
2021-12-28 16:36:01 +05:00
Фролов
e7d6aef6a6
Move logic from AsbCloudDbContext.GetDepthToIntervalAsync() to TelemetryAnalyticsService.GetWellDepthToIntervalAsync()
2021-12-27 13:49:29 +05:00
Фролов
ca969c99ad
Remove query datesRange from context.
...
Replace source for DatesRange from db to telemetry tracker.
2021-12-27 11:48:23 +05:00
Фролов
f2c416a071
TelemetryDataBaseService Add info about dbSaveDurationTime in exception
2021-12-24 13:00:16 +05:00
Фролов
24c0ba5e16
Fix dateTime bug
2021-12-24 11:42:23 +05:00
Фролов
889a8a8757
refactor ITelemetryService. Rename FixDatesRangeByTimeZoneAsync to DatesRangeToTelemetryTimeZoneAsync
2021-12-24 11:36:20 +05:00
Фролов
d43b1a7cd8
Restore tracking last telemetryData date
2021-12-24 10:38:14 +05:00
Фролов
dfacd04b47
fix UserService
2021-12-23 18:07:20 +05:00
Фролов
95df836155
Add WellOperationController.GetSectionTypes()
2021-12-22 17:09:26 +05:00
Фролов
ecfdbfc394
Fix UserService.UpdateAsync() preserve users password.
2021-12-22 16:55:39 +05:00
Харченко Владимир
33c3e74e53
Added new well section types
2021-12-22 16:06:30 +05:00
Фролов
13ac0557cf
fix TelemetryTracker.SaveRequestDate
2021-12-22 12:34:59 +05:00
Фролов
ea26010719
fix MeasureController.GetHisoryAsync
2021-12-22 12:31:37 +05:00
Фролов
d40bced3a0
Merge branch 'dev' into RefactorWellService
2021-12-22 11:53:31 +05:00
Фролов
c5ed3c467f
fix and refactor WellService.
2021-12-22 11:41:18 +05:00
Фролов
a9f03c2ecf
refactor CacheTable. Includes IEnumerable replaced to ISet [unique values collection]
2021-12-22 11:40:29 +05:00
Фролов
40145f7d5b
Fix UserRole multiple permissions
2021-12-22 11:35:36 +05:00
Харченко Владимир
1ec76e812f
CS2-99: Fixed well fact end date depending on well state
2021-12-21 16:36:28 +05:00
Фролов
6924a6bac7
start refactoring// fire alarm
2021-12-21 11:52:53 +05:00
Фролов
a0208f412e
refactor UserRoleService
2021-12-20 15:17:09 +05:00
Фролов
43bdc9e92e
Add CrudCacheServiceBase
2021-12-20 15:15:20 +05:00
Фролов
7c24d52fa2
Merge branch 'dev' into NewUserRoles
2021-12-20 15:13:36 +05:00
Фролов
5d45eb7289
Adapt RequestLogUserDto for frontend usage
2021-12-17 16:24:54 +05:00
Фролов
3128c8f701
Merge branch 'dev' into RefactorTelemetry
2021-12-17 13:08:07 +05:00
Фролов
9bb1cc5abc
Add some fields into dtos to make possible assign telemetry to well.
2021-12-17 13:07:45 +05:00
Фролов
31b671a0c7
remove unused methods
2021-12-17 13:04:33 +05:00
Фролов
e0834e4720
add telemetry merge
2021-12-17 12:48:58 +05:00
Харченко Владимир
d94b2e685e
CS2-133: Fixed CRUD operations over Permissions
2021-12-17 12:38:34 +05:00
Фролов
bc38e86b74
hotfix units.
2021-12-16 16:10:58 +05:00
Харченко Владимир
17db1218cc
CS2-133: Removed permission mask logic from permissions
2021-12-16 16:00:47 +05:00
Харченко Владимир
888c28cdf8
CS2-133: Removed Value property from roles to permissions models and services
2021-12-15 16:21:52 +05:00
Фролов
551c60c4ff
Add/refactor services for permissions authorization model.
...
Rename some fields in DB.permission.
2021-12-11 16:46:04 +05:00
Фролов
1ec22744c3
Refactor cacheTable.
...
Remove ConfigureAwait(false) for private methotds.
Insert?() returns updated entity(ies).
2021-12-11 16:33:37 +05:00
Фролов
6dc3137627
update default WellOperationCategories
2021-12-08 15:38:38 +05:00
Фролов
6565957c34
rider recomendations
2021-12-08 15:29:41 +05:00
Фролов
5752ad40b7
some rider recommendations and spelling
2021-12-07 18:27:52 +05:00
Фролов
1e9078079a
remove useless argument TelemetryService.GetTransmittingTelemetriesAsync()
2021-12-07 15:55:11 +05:00
Фролов
9a7d2b4140
Remove ReportService.GetSuitableReportsAsync()
2021-12-07 13:55:39 +05:00
Фролов
819bc82227
MeasureService.GetHisoryAsync(..) uses idCategory arg
2021-12-07 13:43:47 +05:00
Фролов
ee01ab30db
Забрал домой
2021-12-07 11:34:06 +05:00
Фролов
fa3e47493b
Doc timascale backup and restore.
2021-12-03 17:34:24 +05:00
Фролов
539905e8e0
Use cacheTable for roles and permissions
2021-12-03 15:03:33 +05:00
Фролов
00dd39b587
merge dev to this
2021-12-03 09:58:48 +05:00
Фролов
4aaac31c43
nit refacroring before merge
2021-12-03 09:44:10 +05:00
KharchenkoVladimir
aff16dc84b
CS2-123: Returned parent user role permissions inheritance
2021-12-02 13:35:15 +05:00
KharchenkoVladimir
b655360835
CS2-123: Added AdminPermissionController methods
2021-12-02 12:03:30 +05:00
Фролов
c55086bfee
Fix ClusterService
2021-12-02 11:10:24 +05:00
KharchenkoVladimir
22c5d33b7e
CS2-123: Added AdminPermissionController and Service
2021-12-01 17:10:17 +05:00
KharchenkoVladimir
cf517eabd5
CS2-123: Fixed role permissions create/update operations
2021-12-01 16:09:06 +05:00
Фролов
04052af874
CS2-115 TelemetryDataBaseService.Get() прореживание выборки может работать не корректно
2021-12-01 11:08:25 +05:00
KharchenkoVladimir
ad061bbca5
CS2-123: Renamed permission tables, removed roles from claims, etc
2021-11-30 17:22:38 +05:00
Фролов
bc77b128b0
Fix setpoints dictionary by Oleg's info.
...
Update default client build
2021-11-30 15:25:29 +05:00
KharchenkoVladimir
9280b28e10
CS2-123: Returned table for roles permissions.
2021-11-29 17:34:53 +05:00
KharchenkoVladimir
2d9388cb2a
Revert "CS2-123: Changed role permissions to bit collection"
...
This reverts commit ad34e6445c
2021-11-29 12:39:28 +05:00
Фролов
ee2172f64b
fix SetpointsController. Add AllowAnonymous.
...
fix doc for backup db.
2021-11-26 17:14:02 +05:00
KharchenkoVladimir
ad34e6445c
CS2-123: Changed role permissions to bit collection
2021-11-26 17:05:41 +05:00
KharchenkoVladimir
c3c601c2a0
CS2-123: Added get of parent's permissions for new role
2021-11-25 17:44:07 +05:00
KharchenkoVladimir
2f23fbce70
CS2-123: Fixed UserRoleController to user UserRoleService, not CRUD service
2021-11-25 12:24:53 +05:00
KharchenkoVladimir
576d119674
CS2-123: Changed UserRoleService and controller to inherit CrudController/service
2021-11-25 11:55:52 +05:00
Фролов
26ada6572b
Add SetpointInfoDto
2021-11-24 17:58:53 +05:00
KharchenkoVladimir
908c855463
CS2-123: Added CRUD over user roles and their permissions (controller + service)
2021-11-24 17:38:40 +05:00
Фролов
18ad9fc91a
CS2-124 Создать контроллер рекомендый новыйх уставок бурильщику
2021-11-24 16:16:17 +05:00
KharchenkoVladimir
872598dcdd
CS2-123: Added models for user roles and permissions. Fixed auth UserToken.
2021-11-24 11:30:29 +05:00
Фролов
a74032eed5
Fix TelemetryTracker dbContext disposing.
2021-11-23 16:16:13 +05:00
KharchenkoVladimir
2a4c76611c
Returning 'using' to ef context creation
2021-11-23 11:43:58 +05:00
KharchenkoVladimir
e0a453a1f6
CS2-107: Added lost data after merge conflict resolve (with dev)
2021-11-23 11:41:27 +05:00
KharchenkoVladimir
cb52f96069
Merge branch 'dev' into MaxAndAverageRop
...
# Conflicts:
# AsbCloudInfrastructure/Services/WellService.cs
2021-11-23 11:35:11 +05:00
KharchenkoVladimir
389b519f4b
CS2-107: Small guard fix for default result of DB query
2021-11-23 11:31:47 +05:00
KharchenkoVladimir
d361c9a9b4
CS2-107: Added calculation of max and average Rop for cluster wells
2021-11-22 17:29:19 +05:00
Фролов
3dc7bc216e
Fix DateTime minValue exception.
2021-11-22 16:07:37 +05:00
Фролов
49eaa76bb0
Improve + fix TelemetryTracker. Now it keeps date range of telemetry data.
2021-11-22 16:02:15 +05:00
Фролов
0b66648267
fix AsbCloudWebApi.Controllers.WellOperationController.ExportAsync. NullRef in WellService.Convert().
2021-11-22 14:14:44 +05:00
Фролов
809ee137aa
fix TelemetryAnalyticsService.AnalyzeAndSaveTelemetriesAsync().
2021-11-22 14:04:05 +05:00
Фролов
14bc1e12b4
Merge branch 'TelemetryTimeZone' into dev
2021-11-22 11:31:10 +05:00
Фролов
1eaa1efb03
Refactor. Extract TimezoneService.
2021-11-22 11:30:08 +05:00
KharchenkoVladimir
6b7f589ddc
CS2-119: Fixed incoming telemetry date transform
2021-11-18 14:25:11 +05:00
KharchenkoVladimir
e62ac96bd7
CS2-119: Added .FixDatesRangeByTimeZoneAsync() to fix dates ranges to well timezone everywhere
2021-11-18 12:03:59 +05:00
Фролов
7b3e979bac
Fix ClusterService.CreateDepositDto(). Add IdState into WellDto
2021-11-18 11:32:13 +05:00
KharchenkoVladimir
4bed0623f1
CS2-119: Added dates change to well timezone if requested
2021-11-18 11:24:21 +05:00
KharchenkoVladimir
c273a9eb5c
CS2-119: Added telemetry date fix method according to well timezone
2021-11-17 15:54:01 +05:00
Фролов
b6c2f60296
fix use fileshare only when needed.
2021-11-17 13:06:48 +05:00
Фролов
db0b430d93
Use configuration.GetConnectionString() in all infrastructure cases.
2021-11-17 10:50:57 +05:00
KharchenkoVladimir
53dbb2d959
CS2-119: Added timezone info receive method in TelemetryService
2021-11-16 17:14:36 +05:00
KharchenkoVladimir
88f9236b8a
CS2-119: Added Telemetry Timezone object and update timezone functionality
2021-11-16 13:14:31 +05:00
Фролов
212989b3b6
fix analyze recomendations
2021-11-15 16:52:12 +05:00
Фролов
496c24099d
Implement UPSERT extention method to fix TelemetryDataBaseService.UpdateDataAsync().
2021-11-15 14:56:11 +05:00
Фролов
864d851b6a
BIG. Add timescaleDB into DB.
...
Adapt contect to use hypertables.
Refactor TelemetryDataBaseService to avoid duplicate keys and try to save as more as posible
2021-11-13 18:47:11 +05:00
Фролов
9c2f0fed9c
Remove trace monitors.
2021-11-11 15:59:29 +05:00
Фролов
1c91c31417
Refactor CacheDb. replace tuple by private class
2021-11-11 10:57:08 +05:00
Фролов
e1ba4e1777
fix CacheTable refresh throttling
2021-11-10 18:17:11 +05:00
Фролов
a1ea0d7cdd
fix CacheDb
2021-11-10 17:05:57 +05:00
Фролов
fd74ae20a0
CS2-117, CS2-112
...
Add exception handle middleware.
Move middlawares into separate files.
2021-11-10 17:04:07 +05:00
Фролов
fccfd538fc
throttle CacheTable refresh
2021-11-10 17:01:18 +05:00
Фролов
f881a2eb55
Refactor TelemetryTracker initialization
2021-11-10 16:59:48 +05:00
Фролов
69ed4c5fb8
Refactor TelemetryDataBaseService.UpdateDataAsync() simplify query.
2021-11-10 16:56:41 +05:00
Фролов
bfb76b9dc0
Add request tracker. it also track users activity.
2021-11-10 14:23:53 +05:00
Фролов
170693f445
Refactor:
...
FilesService move FileSharing functions to GoogleDriveService;
FilesService.CreateFileMarkAsync() Move drillingProgram related logic into DrillingProgramService.CreateFileMarkAsync();
FilesService.MarkFileMarkAsDeletedAsync() Move drillingProgram related logic into DrillingProgramService.MarkFileMarkAsDeletedAsync();
IGoogleDriveService cleanup and rename to IFileShareService;
GoogleDriveService check token before usage and resresh it id needeed;
DrillingProgramController move logic to service;
DrillingProgramController use dto;
FileController remove unused method;
2021-11-09 17:36:44 +05:00
cult
dd0385c4dd
CS2-104: Added .Include() filemarks to fileInfoDto queries
2021-11-03 15:53:31 +05:00
cult
8d73f0e471
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-11-03 14:13:07 +05:00
