ngfrolov
78dca86f81
Изменения в алгоритмах определения операций по проработке и шаблонировке.
2022-07-01 17:04:44 +05:00
ngfrolov
69ac4c74d5
Operation detection algorithm adapt.
2022-06-30 17:37:57 +05:00
e16df1f705
изменение моделей Dto
...
внесение корректировок в сервис DailyReport
Убраны лишние комментарии и лишний код :
-из классов создающих блоки отчета
-из метода MakerExcel
Добавлен блок Dimensionless
2022-06-30 16:01:46 +05:00
ngfrolov
050711c34b
Операции определяются правильнее и быстрее
2022-06-29 13:40:06 +05:00
c6f089421a
Добавлены 6 блоков реализующие 6 частей отчета наследованные от BlockAbstract
2022-06-29 13:04:30 +05:00
ngfrolov
9ab41cd24e
slow detection
2022-06-27 12:43:55 +05:00
ngfrolov
d0386b0182
doesn't work. Wrong handle begin of operation.
2022-06-27 10:20:54 +05:00
ngfrolov
69780e8aaf
Add nullable support to CellAddress;
...
Add example block
2022-06-24 12:24:23 +05:00
ngfrolov
0c488f3b6b
CellAddress implement IXLAddress
2022-06-24 11:03:13 +05:00
ngfrolov
2712eb43ef
Fix extentions
2022-06-23 18:10:33 +05:00
ngfrolov
fce7482d1b
CellAddress для замены tuple;
...
XLExtentions методы расширения для назначения и форматирования значений;
SheetBlockAbstract для блоков рапорта;
2022-06-23 18:04:01 +05:00
6570647bec
new generate report with style
2022-06-22 23:26:04 +05:00
ngfrolov
85c253b82b
Исправление детекторов совместно с АПГ
2022-06-22 10:02:00 +05:00
ngfrolov
1e42e6ac21
fix tests.
2022-06-20 12:47:59 +05:00
ngfrolov
5cc3f50163
DetectedOperationController переделаны route. Добавлено 2 детектора
2022-06-17 17:21:32 +05:00
94ebf6bfb9
Edit daily report MakerExcel - изменение логики построения отчета
...
модели ДТО и БД разбиты на 6 блоков
изменен сервис DailyReport
Тестовая таблица в консольном проекте
2022-06-17 13:20:48 +05:00
ngfrolov
6e849d8104
Fix DetectedOperationService.Convert(). Predicate for operationValue
2022-06-16 14:37:34 +05:00
ngfrolov
cf98bd8a20
Crud services moved to Repository directory
2022-06-16 12:33:05 +05:00
ngfrolov
7080b3e855
autoclean.
2022-06-15 14:57:37 +05:00
ngfrolov
9db7a7303a
Merge branch 'operation_grouping' into dev
2022-06-14 15:35:59 +05:00
ngfrolov
674a5e0e71
Замена базовых классов. Уточнения в задании по не заполненным целевым значениям.
2022-06-14 15:35:31 +05:00
Lyudmila Romanova
9764809c3a
Добавление показателя в операцию. Изменение структуры ответа
2022-06-10 18:36:14 +05:00
ngfrolov
0ac16d37e9
EventService, MessageService, TelemetryUserService uses new cache model.
2022-06-10 17:36:03 +05:00
ngfrolov
62809a76cf
MeasureService use new cache model.
2022-06-10 17:33:08 +05:00
ngfrolov
9880caaf31
Add shorthand to get cache by using default values of obsolescence and tag
2022-06-10 17:32:05 +05:00
Lyudmila Romanova
e5c1880225
Введение справочника для определения предиката по типу операции
2022-06-10 14:04:03 +05:00
Lyudmila Romanova
4bc07bc727
Merge conflict fix
2022-06-10 12:01:46 +05:00
Lyudmila Romanova
42e2c57c1b
Промежуточная фиксация со структурой ответа
2022-06-10 11:55:01 +05:00
ngfrolov
12c97a4119
Merge branch 'operation_grouping' into dev
2022-06-10 10:42:37 +05:00
ngfrolov
a8c4fa58e9
Add Crud service abstract test.
2022-06-09 17:25:26 +05:00
ngfrolov
c9d150d3a9
Merge branch 'EFpro' into ICrud_refactor
2022-06-09 13:36:42 +05:00
ngfrolov
dd2a777d3d
Crud services, controllers refactoring. Not tested version of new API.
2022-06-09 11:19:52 +05:00
Lyudmila Romanova
cf8c61c1a7
Изменение dto для анализа
2022-06-08 14:37:05 +05:00
Lyudmila Romanova
6d44dadb27
Модель и сервисы для значений операций
2022-06-07 16:24:05 +05:00
ngfrolov
bbab9e1a15
Оптимизация EfCache[Dictionary]Extensions.
...
Семафор на добавление тега теперь работает существенно быстрее, логика заполнения данными из БД перенесена под семафор конкретного кеша.
2022-06-07 12:29:11 +05:00
ngfrolov
e99ac84c46
Fix TimezoneId mapping, rename TimeZoneId to TimezoneId
2022-06-06 17:00:53 +05:00
ngfrolov
4db67113b4
CrudService очищен от неиспользуемого кода.
...
CrudCacheService Адаптировано для новой схемы кеширования.
Убраны extention методы для mapster.
2022-06-06 15:43:47 +05:00
ngfrolov
1e7f5fe654
Doc
2022-06-01 17:52:26 +05:00
ngfrolov
b89ea13c78
Converted cache
2022-06-01 15:59:02 +05:00
ngfrolov
cb4eb3341c
EfCacheL2 tested.
2022-06-01 12:18:10 +05:00
ngfrolov
fa38c145e7
Add new Permissions
2022-05-31 17:54:43 +05:00
ngfrolov
1a213a0791
merge EFpro
2022-05-31 16:39:23 +05:00
ngfrolov
6fb82e7333
Add new ef layer 2 cache
2022-05-31 16:38:04 +05:00
ngfrolov
213675c5a9
Update packs
2022-05-31 16:37:18 +05:00
ngfrolov
87391ad9b1
Add DateOnly, TimeOnly support
2022-05-31 16:18:31 +05:00
ngfrolov
c568fafa8f
Add ScheduleController.GetByIdWellAsync(..)
2022-05-26 15:32:23 +05:00
ngfrolov
3671dc12a1
Merge branch 'dev' into schedule_task
2022-05-26 14:09:14 +05:00
ngfrolov
23cf8d2108
Убрал ненужные переопределения.
...
Добавил учет часового пояса скважины.
2022-05-26 13:33:59 +05:00
Lyudmila Romanova
80bad5bbe2
Правки по PR
2022-05-25 20:19:08 +05:00
Lyudmila Romanova
7bc977ada6
Добавление бурильщика и графика работы. Покрытие тестами.
2022-05-22 21:18:43 +05:00
ngfrolov
1ea68f5605
fix email body links
2022-05-20 09:01:39 +05:00
ngfrolov
ed8bbf641a
Fix DailyReportMakerExcel. string[] to string
2022-05-18 13:16:03 +05:00
ngfrolov
24ccc2a128
fix emails triggers and bodies
2022-05-18 11:07:39 +05:00
ngfrolov
00cfb0909c
DetectorSlipsTime Add new condition
2022-05-12 17:21:06 +05:00
ngfrolov
8b6a9c78c7
fix DailyReport.MakeDefaultDailyReportAsync
2022-05-06 17:02:53 +05:00
ngfrolov
3e7a8da219
Add StartDate to WellDto
2022-05-06 16:35:16 +05:00
ngfrolov
692517798b
Recreate migration Add_mw_telemetry_datas_saub_stat.
2022-05-06 10:58:52 +05:00
ngfrolov
5458ac5414
debug and fix daily report
2022-05-05 15:14:29 +05:00
ngfrolov
923d2866b0
DrillingProgram emails tested
2022-05-05 13:28:48 +05:00
ngfrolov
31634e653a
disable really email send
2022-05-05 10:45:04 +05:00
ngfrolov
7201f7ca63
merge detected operations
2022-05-05 10:22:51 +05:00
ngfrolov
7112ebc4f2
Merge branch 'DailyReport' into dev
2022-05-05 10:09:47 +05:00
ngfrolov
24b40973bb
merge and fix
2022-05-05 10:06:21 +05:00
ngfrolov
5f21e9e8ce
refactoring BodyCreation => MailBodyFactory
2022-05-04 15:02:12 +05:00
ngfrolov
3c67d22bbd
Fix filter
2022-04-29 15:54:01 +05:00
zikan
251cdb530a
Correction of errors, formation of an excel file
2022-04-29 15:39:12 +05:00
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
92371eaaf5
Set infrastructure assembly marker.
2022-04-19 13:35:20 +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
c31cb55d2b
replace ref projects to ref dlls
2022-04-12 17:40:05 +05:00
ngfrolov
fa9486e44d
grouping services and controllers
2022-04-11 18:00:34 +05:00
ngfrolov
80434475db
Add telemetryWireLine.
...
Add InstantDataRepository
2022-04-11 17:22:52 +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
Фролов
696dbee375
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2022-02-08 10:05:00 +05:00
Фролов
981ae016c7
fix userRole validator. IdType can be anything
2022-02-02 11:11:10 +05:00
Фролов
fc752e8f3b
fix validators. lat, long is nullable.
2022-02-01 17:55:56 +05:00
Харченко Владимир
87d7563ed3
CS2-27: Fixed ClusterService unit tests
2022-01-31 16:13:27 +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
Фролов
2037160545
Edit validators
2022-01-21 17:56:36 +05:00
Фролов
8633616481
Fix DrillFlowChartService.UpdateAsync() utc time
2022-01-21 17:32:10 +05:00
Харченко Владимир
8a3bcf311f
Fixed dto ids validation
2022-01-20 12:07:15 +05:00
Фролов
7a10d26ca6
CS2-145 Добавить специальный ArgumentInvalidException кастомной вылидации для замены ArgumentException
2022-01-18 11:04:44 +05:00
Фролов
1f1f86f00e
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2022-01-17 16:07:09 +05:00
Фролов
2192cdc242
Extract BeforeRunHandle method. It runs some procedures like Migrate() on startup.
2022-01-17 15:33:00 +05:00
Фролов
7cf1a69dd5
CS2-138 Запретить удалять и редактировать пользователя dev
2022-01-17 14:31:07 +05:00
Харченко Владимир
52122358b8
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2022-01-17 10:40:27 +05:00
Фролов
ee4632ae38
Reconnect reports.
2022-01-14 17:59:22 +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
Харченко Владимир
d1440ea0d0
CS2-125: Added newly created dto validators in DependencyInjection
2022-01-12 17:35:14 +05:00
Харченко Владимир
9792fe2196
CS2-125: Added base dto validation
2022-01-12 17:28:27 +05:00
Фролов
2c51c352b1
CS2-139 Добавить контроллер AdminCompanyType
2022-01-12 13:33:16 +05:00
Фролов
fed253d0f6
merge net6_migrate
2022-01-11 11:51:02 +05:00
Фролов
5be4102feb
merge
2022-01-11 11:49:37 +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
Харченко Владимир
42c5974d68
Merge branch 'Validation' into dev
2022-01-10 16:01:06 +05:00
Харченко Владимир
831ef72be4
Removed dtoValidators folder
2022-01-10 16:00:09 +05:00
Фролов
0687efa5af
WellService.Update can get IdTelemetry from dto.IdTelemetry or dto.telemetry.id.
2022-01-10 11:45:14 +05:00
Фролов
28c35b5487
draft unit tests
2022-01-09 11:46:27 +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
Фролов
ab5f43edbe
Migrate projects to net 6.
...
Update nuget packadges.
2021-12-28 16:35:31 +05:00
Харченко Владимир
42ed7f6ec7
CS2-125: Enlarged Dto validation
2021-12-28 16:24:08 +05:00
Харченко Владимир
9f4e7764be
CS2-125: Added FluentValidation lib and AuthDto validation
2021-12-27 17:35:49 +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
Фролов
46c244a7d7
Update report dlls
2021-12-24 17:14:17 +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
Фролов
fdf5a6ecd6
Add startup argument db_init to start just for migrate DB
2021-12-02 11:11:14 +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
Фролов
5c63c086ad
CS2-127 Add lazy service registration.
2021-12-01 11:49:59 +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
Фролов
0f04fbe7b7
clean and update nuget.
2021-11-09 17:19:29 +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
cult
e716c6fbeb
CS2-104: Added deleting of existing drilling program on file marks actions
2021-11-03 14:12:39 +05:00
Фролов
f62ec98ea9
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-11-02 17:50:52 +05:00
Фролов
647bb3b106
fix query in DrillFlowChartService.GetAllAsync()
2021-11-02 17:50:43 +05:00
cult
2f2193da76
CS2-104: Added recreate of drilling program if new files were confirmed
2021-11-02 16:33:49 +05:00
cult
e396066a68
CF2-104: Added drilling program creation only from approved files
2021-11-02 13:44:45 +05:00
cult
a53d557f2a
CS2-104: Added confirm of drilling program parts
2021-11-01 16:41:25 +05:00
Фролов
62a38aeeaf
Refactor TelemetryData*dtos for smaller size.
...
Add protobuf.
2021-10-31 16:35:09 +05:00
cult
e79cf9f5d1
CS2-106: Inserted logic from DrillingProgram controller in fileService.GetFileWebUrlAsync()
2021-10-29 16:03:24 +05:00
cult
96fdd02ca7
CS2-106: Made GoogleDriveService disposable
2021-10-29 15:01:55 +05:00
cult
3e00dac818
CS2-106: Fixed Google drive service disposing
2021-10-29 14:40:15 +05:00
cult
ee1c368f8d
CS2-106: Removed unnecessary comments from GoogleDriveService
2021-10-29 14:22:39 +05:00
cult
07820a5042
Deleted Apache Service for Excel files union
2021-10-29 13:34:56 +05:00
cult
3c2a9f13a2
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-29 12:47:37 +05:00
cult
45b4d8bb23
CS2-106: Fixed Drilling program creation and preview logic
2021-10-29 12:47:18 +05:00
Фролов
ffda19c431
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-28 17:11:42 +05:00
cult
e8ad17bc1d
CS2-106: Added .GetFileWebLinkAsync() in DrillingProgramController.cs
2021-10-28 16:59:00 +05:00
cult
c3be8bceea
CS2-106: Fixed .GetAsync() in DrillingProgramController to return file web url in cloud
2021-10-28 15:08:06 +05:00
Фролов
3484d7bc99
CS2-113 В TelemetryTracker сохранять не только системную дату, но и дату из данных панели.
2021-10-28 11:12:03 +05:00
Фролов
da9e94b4b9
Modify telemetry tracker to keep remote and server dates.
...
Update related services.
Small refactor TelemetryController: exclude dictionaries updates from tracker update. All tracker updates moved to services.
2021-10-28 10:56:18 +05:00
Фролов
5966920019
nit refactoring
2021-10-27 17:48:19 +05:00
cult
ab13e97837
CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController
2021-10-27 17:00:27 +05:00
KharchenkoVladimir
896f2dd9b8
Added crud operation on files at Google drive
2021-10-26 17:22:32 +05:00
KharchenkoVladimir
f800e23aab
Deleted .DeleteOldRequests() from TelemetryTracker
2021-10-25 16:36:45 +05:00
KharchenkoVladimir
4d8780dabc
Changed way of retrieving last telemetry date for wells
2021-10-25 16:32:55 +05:00
KharchenkoVladimir
23a467639a
Merge branch 'NewRegister' into dev
2021-10-25 12:05:44 +05:00
KharchenkoVladimir
2ce110ea8f
Added 'User already exists' check in .Register()
2021-10-25 12:04:34 +05:00
KharchenkoVladimir
6b2c4a359b
Added register params validation
2021-10-22 17:41:00 +05:00
KharchenkoVladimir
9fea1c94a6
Fixed Login. Users with State == 0 will not be authenticated
2021-10-21 17:24:25 +05:00
KharchenkoVladimir
5b82229a94
Fixed WellDto creation in WellService (fixed LastTelemetryDate field)
2021-10-21 15:57:20 +05:00
KharchenkoVladimir
167dd3d5f5
Added Get well by id method in WellController
2021-10-20 16:18:07 +05:00
Фролов
4968ca4382
add IdState to StatWell
2021-10-20 14:15:53 +05:00
Фролов
eab95cb7a1
Refactor GetLastTelemetryDate(..) in services (single resp).
...
Add State and LastTelemetryDate into StatWellDto.
2021-10-20 12:52:31 +05:00
KharchenkoVladimir
1d26c3dc9d
Auth controller very minor changes
2021-10-19 16:58:40 +05:00
KharchenkoVladimir
387b01c44d
CS2-72: Added email, phone and position in UserDto.
2021-10-19 15:22:18 +05:00
Фролов
e92859439e
nit refactor WellService.UpdateWellAsync(..) throw exception instad of return null
2021-10-19 11:17:16 +05:00
Фролов
aab6064153
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-19 10:28:52 +05:00
Фролов
a50913f078
Fix DrillingProgramService sheet duplicate name resolver;
...
Fix FileSrvice.GetInfosByCategoryAsync(..) doesn't return deleted files;
Update Frontend;
2021-10-18 17:38:07 +05:00
KharchenkoVladimir
1a8e7bcb76
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-18 16:30:25 +05:00
KharchenkoVladimir
37e03b3f0d
CS2-98: Added WellUpdateParamsDto in WellController.UpdateWellAsync().
2021-10-18 16:30:14 +05:00
Фролов
6e9ab38d47
nit some refactoring in DrillingProgramService
2021-10-18 16:23:58 +05:00
KharchenkoVladimir
64d6d8c8f8
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-18 12:39:01 +05:00
KharchenkoVladimir
6e4c85843f
CS2-98: Added State to Well. Added .UpdateWell() in WellController.
2021-10-18 12:38:49 +05:00
Фролов
0a3891a332
fix CacheDb. Make cache ConcurrentDictionary
2021-10-18 11:06:42 +05:00
KharchenkoVladimir
ddf8f35214
Fixed .DetLastTelemetryDate() in TelemetryService
2021-10-18 10:44:53 +05:00
KharchenkoVladimir
3a6f5e7f5e
Added last received telemetry date in WellDto
2021-10-15 15:35:18 +05:00
KharchenkoVladimir
02f344569e
CS2-91: Moved TelemetryTracker from WellService to TelemetryService
2021-10-15 12:24:04 +05:00
Фролов
caae2f970c
Add DrillParamsController.SaveAsync() it removes old records before add new ones.
2021-10-14 17:57:25 +05:00
Фролов
b9eaf36a65
Fix CrudServiceBase.Insert*: set "Id" prop to 0 before inserrt.
2021-10-14 17:13:57 +05:00
Фролов
91878bda5c
Fix WellComposite model FK; WellCompositeService automapping
...
Rename DrillFlowChartParams to DrillFlowChart
2021-10-14 14:46:20 +05:00
KharchenkoVladimir
aa977e4db5
Added WellCompositeService in DependencyInjection
2021-10-14 12:30:51 +05:00
KharchenkoVladimir
8e447a040f
Added method for returning wells with drill params only (in DepositController)
2021-10-14 12:04:21 +05:00
KharchenkoVladimir
32732bf058
Fixed DrillFlowChart routes, model, dto names
2021-10-14 10:18:43 +05:00
KharchenkoVladimir
4f4eb4333a
Merge branch 'DrillingFlowChart' into dev
2021-10-13 17:35:14 +05:00
KharchenkoVladimir
911deb5b8b
CS2-97: Added DrillFlowChartParams infrastructure
2021-10-13 17:34:32 +05:00
Фролов
4892d76a90
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-13 17:15:20 +05:00
Фролов
4878a8c25c
Add SpinPlcVersion to TelemetryInfoDto
2021-10-13 17:15:00 +05:00
KharchenkoVladimir
e31780571b
CS2-94: Fixed DrillParamsService queries
2021-10-13 15:56:23 +05:00
Фролов
80fdfce467
nit WellOperationsStatService Add companies to wells with no operations
2021-10-13 15:53:43 +05:00
Фролов
6439bba779
Fix WellOperationsStatService.GetStatClusterAsync() Add empty stat for wells with no operations
2021-10-13 15:45:24 +05:00
KharchenkoVladimir
70ee22bccf
CS2-96: Added DrillParams methods to get composite well drill params
2021-10-13 12:27:40 +05:00
Фролов
50c3cca8b8
CS2-84 При формировании статистики по кусту нет фильтра по доступным скважинам
2021-10-12 18:06:47 +05:00
Фролов
b800759a09
CS2-95 В WellOperationStatController добавить метод получения статистики по скважинам и секциям по массиву id скважин
2021-10-12 16:07:08 +05:00
Фролов
f7fedb16e8
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-12 12:17:58 +05:00
Фролов
3bff1d0daf
Add WellCompositeController
2021-10-12 12:17:46 +05:00
KharchenkoVladimir
2b77fdae98
CS2-94: Added .GetAll() method to DrillParamsService
2021-10-12 12:02:28 +05:00
KharchenkoVladimir
bf7c0895b3
Merge remote-tracking branch 'origin/dev' into dev
2021-10-12 11:30:21 +05:00
KharchenkoVladimir
99f8a36437
CS2-94: Fixed DrillParamsService and Dto
2021-10-12 11:30:07 +05:00
Фролов
638d8eb3da
Drop useless method
2021-10-12 11:26:41 +05:00
Фролов
97df21c58b
Remove WellService.GetOperationsAsync() redundant method
2021-10-12 10:31:17 +05:00
KharchenkoVladimir
a860bde21e
Merge branch 'DrillingModes' into dev
2021-10-11 16:43:48 +05:00
KharchenkoVladimir
32784c31f9
CS2-94: Edited DrillParamsService to extend CrudService
2021-10-11 16:43:10 +05:00
Фролов
eac38b6139
Remove dead "DataController"
2021-10-11 16:00:52 +05:00
KharchenkoVladimir
47397e4ad6
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-11 15:32:06 +05:00
KharchenkoVladimir
4168e63dad
Merge branch 'DrillingModes' into dev
2021-10-11 15:31:17 +05:00
Фролов
d73cc9692f
Replace WellOperationImportTemplate.xltx to WellOperationImportTemplate.xlsx
2021-10-11 15:28:21 +05:00
KharchenkoVladimir
afd2801715
CS2-94: Added main DrillParams controller and service methods
2021-10-11 15:21:26 +05:00
Фролов
9117471f82
WellOperationImportService Add GetTemplate(),
...
Improve error handling.
2021-10-11 13:45:06 +05:00
KharchenkoVV
c962374b6c
CS2-94: Added Drilling params controller, service and model
2021-10-10 13:35:43 +05:00
Фролов
e604d8a031
make WellOperations import and export. ExcelTemplate embedded to infrastructure.
2021-10-09 20:16:22 +05:00
Фролов
2868304546
Draft WellOperationImportService. incomplete
2021-10-08 17:00:30 +05:00
Фролов
4fe570f3e9
Refactor WellOperation WellDepth split to DepthStart and DepthEnd.
...
Fix other services to use new model.
2021-10-08 11:30:06 +05:00
KharchenkoVV
eac35cd3e9
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-10-08 11:12:57 +05:00
KharchenkoVV
47e62f395a
Removed Measures from db demo data
2021-10-08 11:12:43 +05:00
Фролов
4cec602678
refactor IFileService. Rename DeletedAsync method to DeleteAsync
2021-10-06 18:07:35 +05:00
Фролов
197142eca2
Fix tvd predict
2021-10-06 16:30:46 +05:00
KharchenkoVV
1f4a55c5df
Fixed Measure controller to return all measure history at once
2021-10-05 18:02:02 +05:00
Фролов
e1457471c8
unpatch cache path by permanent solution
2021-10-04 15:54:58 +05:00
Фролов
8e6384e46c
make cache sinchronized.
2021-10-04 15:52:22 +05:00
Фролов
cdfcb0b2f7
semaphore
2021-10-03 20:08:17 +05:00
Фролов
031ff8c747
Add migration. Set Telemetry forign keys on delete - cascade.
2021-10-01 17:37:44 +05:00
Фролов
ae9b23cc00
Refactor TelemetryAnalysis.
2021-10-01 15:44:56 +05:00
Фролов
8362aa6ffa
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-30 18:03:34 +05:00
Фролов
427a713095
nit WellOperation.id = default on Add
2021-09-30 18:02:50 +05:00
KharchenkoVV
3c9745474a
Added drilling operations to Telemetry analytics calculation
2021-09-30 17:10:12 +05:00
KharchenkoVV
84cb9f6d3b
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-30 16:41:16 +05:00
KharchenkoVV
a589775ceb
Fixed telemetry analytics calculation logic
2021-09-30 16:41:00 +05:00
Фролов
4c08a2963f
Add fileDto to reportprops dto. For unification download mechanism.
2021-09-30 12:38:29 +05:00
Фролов
90bdb264cb
fix Get* methods. add orderBy, specify dateTimeKind and return value:)
2021-09-29 17:05:27 +05:00
KharchenkoVV
b60b84b45c
Fixed Telemetry analysis start depending on analyze start date
2021-09-29 12:20:19 +05:00
Фролов
c0918652a3
Disable TelemetryAnalyticsBackgroundService
2021-09-29 10:44:11 +05:00
Фролов
093c1eafa3
Fix TelemetryAnalyticsBackgroundService inf loop
2021-09-29 10:27:49 +05:00
Фролов
11604d8157
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-29 10:26:41 +05:00
KharchenkoVV
6a4b426aa2
Changed CacheTable internal List to ConcurrentBag
2021-09-29 10:26:25 +05:00
Фролов
a82b403cb0
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-29 10:26:01 +05:00
Фролов
fb38348618
Add DRAFT telemetry merge
2021-09-29 10:12:54 +05:00
Фролов
c45b5728df
CrudServiceBase add order by id and skip/take
2021-09-29 09:57:11 +05:00
