Commit Graph

297 Commits

Author SHA1 Message Date
ngfrolov
0486dd9462 Rename ICrudWellRelatedService to IRepositoryWellRelated, and related services 2022-08-11 14:21:28 +05:00
ngfrolov
a5a31d5d82 UserSettingsController replace value type to JsonDocument 2022-08-09 15:59:40 +05:00
ngfrolov
f4b3dfd9fe doc 2022-08-09 11:10:01 +05:00
a20dbf72e0 merge dev to subsystems 2022-08-08 17:02:52 +05:00
ca261f1eb7 before merge 2022-08-08 16:53:01 +05:00
ngfrolov
4a8e15d8a1 doc 2022-08-05 17:52:42 +05:00
ngfrolov
ff357f2794 doc AsbCloudApp 2022-08-05 17:16:11 +05:00
1e694216a9 доделан сервис наработок и статистики.
в контроллере доделан экшн получения списка подсистем и добавлена проверка доступа пользователя к скважине
2022-08-05 17:10:56 +05:00
ngfrolov
d2b98d3a77 Add internal DetectedOperationExportService.
Add DetectedOperation statistics
2022-08-04 15:06:17 +05:00
2c4d6a9a53 дополнен фоновый сервис наработок
доработан контроллер наработок подсистем
переименованы модели ДТО
2022-08-03 16:35:21 +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
421c706ca1 корректировка контроллеров и сервисов 2022-07-18 18:51:49 +05:00
7f4b434a8c Добавлены модели БД ,модели ДТО, интерфейсы, сервисы 2022-07-14 03:47:11 +05:00
ngfrolov
5cc3f50163 DetectedOperationController переделаны route. Добавлено 2 детектора 2022-06-17 17:21:32 +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
ngfrolov
0ac16d37e9 EventService, MessageService, TelemetryUserService uses new cache model. 2022-06-10 17:36: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
dd2a777d3d Crud services, controllers refactoring. Not tested version of new API. 2022-06-09 11:19:52 +05:00
Lyudmila Romanova
6d44dadb27 Модель и сервисы для значений операций 2022-06-07 16:24:05 +05:00
ngfrolov
4db67113b4 CrudService очищен от неиспользуемого кода.
CrudCacheService Адаптировано для новой схемы кеширования.
Убраны extention методы для mapster.
2022-06-06 15:43:47 +05:00
ngfrolov
570cec4162 doc all dtos. 2022-06-02 12:35:51 +05:00
ngfrolov
1e7f5fe654 Doc 2022-06-01 17:52:26 +05:00
ngfrolov
c568fafa8f Add ScheduleController.GetByIdWellAsync(..) 2022-05-26 15:32:23 +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
ngfrolov
3e7a8da219 Add StartDate to WellDto 2022-05-06 16:35:16 +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
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
7b957d0edb Add WitsControllerAbstract.GetLastDataAsync(..) 2022-04-15 14:45:49 +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
3f2a7406d2 Add ScheduleReport 2022-03-17 16:56:13 +05:00
ngfrolov
c2a691f224 Simplify dependencies 2022-03-16 16:07:37 +05:00
Фролов
007f7ac62e Fix UserService.GetNestedPermissions(). returns all permissions for all nested roles 2022-03-15 16:19:51 +05:00
Фролов
bafa372d66 rename some methods 2022-03-02 17:42:34 +05:00
Фролов
45cce481ee Add emailService 2022-02-28 14:44:26 +05:00
Фролов
f286410eff Add DrillingProgramCreateError 2022-02-28 14:44:15 +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
Фролов
4c68045398 Rename_DrillingProgram_FileCategories
Add entity DrillingProgram parts
2022-02-09 14:25:22 +05:00
Фролов
0109e529f6 CS2-142 Изменить UserRole 2022-01-13 14:36: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
Фролов
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
Фролов
889a8a8757 refactor ITelemetryService. Rename FixDatesRangeByTimeZoneAsync to DatesRangeToTelemetryTimeZoneAsync 2021-12-24 11:36:20 +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
Фролов
ea26010719 fix MeasureController.GetHisoryAsync 2021-12-22 12:31:37 +05:00
Фролов
c5ed3c467f fix and refactor WellService. 2021-12-22 11:41:18 +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
Фролов
7c24d52fa2 Merge branch 'dev' into NewUserRoles 2021-12-20 15:13:36 +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
Харченко Владимир
17db1218cc CS2-133: Removed permission mask logic from permissions 2021-12-16 16:00:47 +05:00
Фролов
551c60c4ff Add/refactor services for permissions authorization model.
Rename some fields in DB.permission.
2021-12-11 16:46:04 +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
Фролов
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
b655360835 CS2-123: Added AdminPermissionController methods 2021-12-02 12:03:30 +05:00
KharchenkoVladimir
22c5d33b7e CS2-123: Added AdminPermissionController and Service 2021-12-01 17:10:17 +05:00
KharchenkoVladimir
ad061bbca5 CS2-123: Renamed permission tables, removed roles from claims, etc 2021-11-30 17:22:38 +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
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
Фролов
49eaa76bb0 Improve + fix TelemetryTracker. Now it keeps date range of telemetry data. 2021-11-22 16:02:15 +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
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