Commit Graph

267 Commits

Author SHA1 Message Date
ngfrolov
f6e79e51d7 nit Add detectedOperations diagnostic message;
add basic telemetry validation filter before analisys;
simplify Avg calc;
fix dbcontext refCount;
2022-12-20 11:57:29 +05:00
9b71b14048 #7987467 2022-12-05 12:43:16 +05:00
9b4f14a036 #7987467 Раздел РТК в ЕЦП 2022-12-05 12:39:25 +05:00
ngfrolov
8094c8b1b8 Decrease TelemetryDataCache size. 2022-12-05 10:53:24 +05:00
ngfrolov
c6a1c4dae6 AsbCloudDbContext Add active reference count prop 2022-12-02 10:58:19 +05:00
49cc9c2342 Merge branch 'dev' into feature/7887519 2022-11-18 14:30:34 +05:00
c5aef20dc0 #7887519 Статистика по ограничивающим параметрам backend 2022-11-18 14:29:29 +05:00
ngfrolov
c78246ca7d fix some nit warnings 2022-11-17 17:54:25 +05:00
ngfrolov
4cbe71f8ca merge 2022-09-13 13:34:52 +05:00
c4d88401fd #5998816 дело скважины, исправления 2022-09-12 08:22:46 +05:00
0ad4cebdb8 #5998816 исправление замечаний 2022-09-08 12:05:56 +05:00
ngfrolov
a0ec08fac5 merge dev to subsystem 2022-09-08 09:46:32 +05:00
896ba03589 #5998816 Дело скважины + тесты 2022-09-05 09:13:45 +05:00
ngfrolov
0eb9410ecc remove file share service 2022-08-11 15:14:01 +05:00
a20dbf72e0 merge dev to subsystems 2022-08-08 17:02:52 +05:00
ngfrolov
623a64fa25 Rafactor DB context default data.
Modify WellOperation table (and defaults)
2022-08-08 16:45:20 +05:00
ngfrolov
fb12919d85 Split operation flash. 2022-08-05 17:17:07 +05:00
ngfrolov
5de4e43ad9 merge 2022-08-03 10:57:49 +05:00
d3bbbd5bd6 наполнение сервисов
1)фоновый сервис
2)сервис работы с апи (OperationTimeService)
2022-08-01 13:55:51 +05:00
ngfrolov
b7af07f995 Add UserSettingsController 2022-07-27 18:14:07 +05:00
ngfrolov
cc5fd56f43 DailyReport. Rename dtos and entities. Remove time offset from DailyReportService. 2022-07-25 18:02:39 +05:00
ngfrolov
39b3753bd3 Add Detector Static Surveying MWD 2022-07-20 09:49:36 +05:00
ngfrolov
48cee90d91 Add DetectorFlashing 2022-07-19 10:29:38 +05:00
421c706ca1 корректировка контроллеров и сервисов 2022-07-18 18:51:49 +05:00
Фролов
e634094738 fix nullable warnings 2022-07-04 17:48:14 +05:00
61e2056eea корректировка сервиса (изменение моделей) 2022-07-04 13:15:26 +05:00
ngfrolov
69ac4c74d5 Operation detection algorithm adapt. 2022-06-30 17:37:57 +05:00
ngfrolov
d6b5a9507b Add explicitly props conversion to json for other dbProviders. 2022-06-20 12:42:35 +05:00
ngfrolov
c2608bb24b Add OperationValue Permissions 2022-06-15 15:34:47 +05:00
Lyudmila Romanova
6d44dadb27 Модель и сервисы для значений операций 2022-06-07 16:24:05 +05:00
ngfrolov
fa38c145e7 Add new Permissions 2022-05-31 17:54:43 +05:00
ngfrolov
339921b968 Rename models;
Fix cs8618 (nullables);
Add migration.
2022-05-26 13:28:16 +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
Lyudmila Romanova
192cf8e5b9 Добавление в контекст 2022-05-20 18:21:00 +05:00
Lyudmila Romanova
e152ab8d24 Испрвление контекста что-бы запускался проект 2022-05-20 14:42:47 +05:00
ngfrolov
09b39c14ea split RefreshMaterializedViewAsync to 2 overload 2022-05-11 09:04:32 +05:00
ngfrolov
692517798b Recreate migration Add_mw_telemetry_datas_saub_stat. 2022-05-06 10:58:52 +05:00
ngfrolov
7201f7ca63 merge detected operations 2022-05-05 10:22:51 +05:00
ngfrolov
24b40973bb merge and fix 2022-05-05 10:06:21 +05:00
ngfrolov
93156ef6f8 Remove legacy telemetry analysis db model 2022-04-29 14:29:45 +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
zikan
76ee379785 Added t_daily_report table and related migrations 2022-04-20 18:03:38 +05:00
ngfrolov
fa9486e44d grouping services and controllers 2022-04-11 18:00:34 +05:00
ngfrolov
24b0bc9d8c Add WITS record tables 2022-04-01 17:55:44 +05:00
ngfrolov
102a0e4dbf fix spell "RequerstTracker.get" 2022-03-29 09:51:24 +05:00
Фролов
433bc30316 fix default EF data. 2022-02-21 12:04:26 +05:00
Фролов
e4e906c8d7 DrillingProgramService существенно переработан. 2022-02-12 11:28:16 +05:00
Фролов
4c68045398 Rename_DrillingProgram_FileCategories
Add entity DrillingProgram parts
2022-02-09 14:25:22 +05:00
Фролов
696dbee375 Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev 2022-02-08 10:05:00 +05:00
Фролов
4c19186158 Add UserRole related matrix defaults 2022-02-03 09:58:42 +05:00
Фролов
d0d0200679 Add some permissions, new web client 2022-02-03 08:23:52 +05:00
Фролов
9e546a4cfd Add role type ids 2022-02-01 15:07:06 +05:00
Фролов
3aef211b94 Add Roles Related Dictionaries 2022-02-01 14:31:36 +05:00
Харченко Владимир
87d7563ed3 CS2-27: Fixed ClusterService unit tests 2022-01-31 16:13:27 +05:00
Фролов
2192cdc242 Extract BeforeRunHandle method. It runs some procedures like Migrate() on startup. 2022-01-17 15:33:00 +05:00
Фролов
e09e358cd0 Add RelationUserRoleUserRole for multiple parents. INCOMPLETE 2022-01-12 16:33:53 +05:00
Фролов
962d6e15b6 Fix spelling for defaults.
Replace DateTime to DateTimeOffset in models
2021-12-30 10:45:06 +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
Фролов
e29dbf49df Reorder SectionsTypes to keep existing operations 2021-12-22 19:18:09 +05:00
Харченко Владимир
33c3e74e53 Added new well section types 2021-12-22 16:06:30 +05:00
Фролов
c5ed3c467f fix and refactor WellService. 2021-12-22 11:41:18 +05:00
Фролов
e99f0ff9c9 fix AsbCloudDbContext.RelationUserRolePermissions 2021-12-20 15:16:21 +05:00
Фролов
7c24d52fa2 Merge branch 'dev' into NewUserRoles 2021-12-20 15:13:36 +05:00
Фролов
852e13f140 Rename docs categories 2021-12-17 15:44:18 +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
Фролов
6dc3137627 update default WellOperationCategories 2021-12-08 15:38:38 +05:00
Фролов
00dd39b587 merge dev to this 2021-12-03 09:58:48 +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
KharchenkoVladimir
ad061bbca5 CS2-123: Renamed permission tables, removed roles from claims, etc 2021-11-30 17:22:38 +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
KharchenkoVladimir
ad34e6445c CS2-123: Changed role permissions to bit collection 2021-11-26 17:05:41 +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
Фролов
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
Фролов
b643934411 Replace UserLogin string to userId in FilePublishInfo and some renames. In Model, no migrations needed. 2021-11-09 17:24:30 +05:00
cult
a53d557f2a CS2-104: Added confirm of drilling program parts 2021-11-01 16:41:25 +05:00
Фролов
fdef85a291 WARN mega long migration (~2h). uncomment timeout setter before run. 2021-10-31 18:01:32 +05:00
Фролов
54d78ddd0e Fix import WellOperations edit WellOperationCategory default data 2021-10-19 10:34:11 +05:00
KharchenkoVladimir
6886e86832 Added IdWellOperationCategory to DrillChart model 2021-10-14 17:02:20 +05:00
Фролов
91878bda5c Fix WellComposite model FK; WellCompositeService automapping
Rename DrillFlowChartParams to DrillFlowChart
2021-10-14 14:46:20 +05:00
KharchenkoVladimir
32732bf058 Fixed DrillFlowChart routes, model, dto names 2021-10-14 10:18:43 +05:00
KharchenkoVladimir
911deb5b8b CS2-97: Added DrillFlowChartParams infrastructure 2021-10-13 17:34:32 +05:00
Фролов
3bff1d0daf Add WellCompositeController 2021-10-12 12:17:46 +05:00
Фролов
e05c291b2b Add model WellComposite 2021-10-12 10:39:42 +05:00
KharchenkoVladimir
4168e63dad Merge branch 'DrillingModes' into dev 2021-10-11 15:31:17 +05:00
KharchenkoVladimir
afd2801715 CS2-94: Added main DrillParams controller and service methods 2021-10-11 15:21:26 +05:00
KharchenkoVV
c962374b6c CS2-94: Added Drilling params controller, service and model 2021-10-10 13:35:43 +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
Фролов
1a36609d19 New well operation category 2021-10-06 18:06:07 +05:00
Фролов
031ff8c747 Add migration. Set Telemetry forign keys on delete - cascade. 2021-10-01 17:37:44 +05:00
Фролов
0b1f9683b9 fix jsonSerializer settings;
reafctor TelemetryHub;
Add wellDepth into TelemetryMessage
2021-09-17 16:24:01 +05:00
Фролов
35cd538b1d Refactor DataSaubBase to TelemetryDataSaub;
Add generic TelemetryDataController;
Add TelemetryDataSpin and model;
Add migration;
2021-09-14 17:17:33 +05:00
Фролов
a046194e35 Add default data (operations dictionary) migration 2021-09-13 09:39:11 +05:00
Фролов
c0a4716341 Merge branch 'master' of https://bitbucket.org/autodrilling/asbcloudserver 2021-09-10 11:30:10 +05:00
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +05:00
KharchenkoVV
b022a4c1cb Fixed return of .DepthToInterval() analytics method 2021-09-09 12:55:13 +05:00
KharchenkoVV
5e757e9bbb Added migrations. 2021-09-07 14:04:30 +05:00
KharchenkoVV
e7129f0148 Moved 'Company types' from Demo data to Data in EF context 2021-09-07 09:58:48 +05:00
Фролов
e8bfe3b443 add new file categories 2021-08-31 09:52:32 +05:00
Фролов
14cf99a1dd Add DrillingProgramController 2021-08-29 17:25:16 +05:00
Фролов
06a492a5e5 fix merge plan-fact in WellOperationsStatService 2021-08-29 11:59:20 +05:00
Фролов
9724b24d98 LastData rename to Measure. Implement MeasureService 2021-08-28 20:00:04 +05:00
Фролов
ac57a69670 Add CalcTvd to WellOperationsStatService 2021-08-27 12:15:04 +05:00
Фролов
fb914cc2b9 Fix Rop and RaceSpeed 2021-08-25 17:58:35 +05:00
Фролов
54d4a16d14 Add WellType into StatWellDto 2021-08-25 15:17:24 +05:00
Фролов
99d242101e remove efModel wellSection. Cleanup. Split categories lastData and files 2021-08-24 10:59:10 +05:00
KharchenkoVV
31fd4bda1a CS2-65: Fixed well section calculation 2021-08-23 14:52:34 +05:00
KharchenkoVV
791f72cbdb CS2-65: United GetSectionsData() and GetWholeWellData() methods 2021-08-20 16:56:21 +05:00
KharchenkoVV
e45a693c92 CS2-54: Fixed default well operations in Db 2021-08-19 14:31:02 +05:00
KharchenkoVV
9bda8b986d CS2-54: Added default Well operations data to Db 2021-08-19 14:12:29 +05:00
KharchenkoVV
09c47636d1 CS2-54: Fixed well section calculation for empty data 2021-08-19 10:42:09 +05:00
KharchenkoVV
154426a5fb Changed WellOperation fileds names 2021-08-18 17:09:57 +05:00
KharchenkoVV
1ea6ea83aa Added 1000 interval in WellOperations Ids 2021-08-18 16:51:41 +05:00
KharchenkoVV
ae3a5c1ac7 CS2-54: Added new well operation categories 2021-08-18 16:26:06 +05:00
KharchenkoVV
d7e0eace47 CS2-53: Added WellOperations Controller, Service, Dtos and Models 2021-08-16 14:19:43 +05:00
KharchenkoVV
1db3a81d56 Renamed plural table names to singular 2021-08-16 10:38:48 +05:00
Фролов
57afb6b7d2 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-13 17:26:32 +05:00
Фролов
2e01c4334f fix "order for skip/take" warning. some refactoring. 2021-08-13 17:26:19 +05:00
KharchenkoVV
bc1bcb2ee2 CS2-53: Added basics of WellOperation controller, service, model and dto 2021-08-13 17:25:06 +05:00
KharchenkoVV
fa63d18fa3 CS2-53: Added model for 'TVD' chart 2021-08-13 15:37:33 +05:00
KharchenkoVV
5951953cb6 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-13 14:50:27 +05:00
KharchenkoVV
29ae60e962 CS2-53: Added operation type to TelemetryOperation model 2021-08-13 14:50:13 +05:00
Фролов
9497aaf7e3 Add WellSectionTypes dbSet 2021-08-13 12:33:05 +05:00
KharchenkoVV
f13b757a84 CS2-50: All controllers and services are made async 2021-08-11 16:54:42 +05:00
KharchenkoVV
4c4048865c CS2-50: Controllers and some services are made async 2021-08-11 12:11:21 +05:00
KharchenkoVV
744266336e CS2-50: Added .AsNoTracking() to services' queries. 2021-08-11 10:16:01 +05:00
Фролов
791d09ce2b fix default entities ids 2021-08-10 16:02:33 +05:00
Фролов
ae5954e345 Rename some entities 2021-08-10 15:53:11 +05:00
Фролов
26f291806f add default WellSectionTypes 2021-08-10 15:48:06 +05:00
Фролов
57dd3110b8 Add index by depth 2021-08-10 14:34:21 +05:00
Фролов
3a325f6c94 Очистка и анализ кода 2021-08-09 15:41:42 +05:00
KharchenkoVV
543272ce7b CS2-43: Added 'Last Data' tables saving to Db 2021-08-02 18:35:36 +05:00
KharchenkoVV
4d08e0e562 CS2-43: Доработанный контроллер, Dto и EF модели для 'Последних данных' 2021-08-02 12:23:18 +05:00
Фролов
38b21d80f1 replace automapper to mapster 2021-07-28 09:46:58 +05:00
KharchenkoVV
165cabd5dd Changed Reports to one of the Documents' category 2021-07-27 16:55:32 +05:00
Фролов
16e52cacf5 wellId rename to idWell 2021-07-27 14:43:30 +05:00
Фролов
b76687ecc2 Operation rename to TelemetryOperation 2021-07-27 14:03:08 +05:00
KharchenkoVV
99242f6995 CS2-38: Добавлены модель, контроллер и сервис для сохранения и отправки файлов по категориям 2021-07-23 17:40:31 +05:00
Фролов
e5a3e30183 CS2-36 В контроллер Deposit добавить метод получения "дерева" доступных пользователю месторождений->кустов->скважин для панели навигации фронта 2021-07-22 14:23:47 +05:00
KharchenkoVV
61205fa7c1 В классе контекста автозаполнение разбито на FillData() и FillDemoData 2021-07-21 17:59:18 +05:00
Фролов
beab5a39a1 explicit many to many relation 2021-07-21 16:30:57 +05:00
Фролов
6abbf476b1 авточистка проекта 2021-07-21 15:29:19 +05:00