ngfrolov
7585aefc4e
WellOperationService to WellOperationRepository
2022-12-28 17:38:53 +05:00
ngfrolov
fb4bb375e1
Merge branch 'dev' into feature/ProcessMapReport
2022-12-28 15:22:50 +05:00
bfc9376733
#7987467 +
2022-12-27 14:30:52 +05:00
ngfrolov
4a4b7852b7
Remove ClusterController, ClusterService.
2022-12-23 14:35:23 +05:00
169968da44
Скорректированная версия
...
-добавлена миграция
-изменены методы
- добавлен CRUD
2022-12-22 18:08:58 +05:00
e9bd1e4789
#7987467 report
2022-12-14 08:41:19 +05:00
07fe9fcc5a
#7987467 Исправления
2022-12-07 15:04:36 +05:00
398a6d443e
#7987467 правки
2022-12-07 08:47:41 +05:00
4b9cd6694b
#7987467
2022-12-05 12:44:46 +05:00
9b71b14048
#7987467
2022-12-05 12:43:16 +05:00
9b4f14a036
#7987467 Раздел РТК в ЕЦП
2022-12-05 12:39:25 +05:00
ngfrolov
a859c096d1
Merge branch 'dev' into feature/8101318
2022-12-05 09:28:38 +05:00
ngfrolov
8e9baf22d8
BackgroundWorker Move periodic services
2022-12-02 17:18:16 +05:00
ngfrolov
89e0495d09
BackgroundWorker adapt other services to this one.
2022-12-02 14:48:23 +05:00
fb5483299d
#8101318 Изменение работы кэша
2022-12-01 15:56:11 +05:00
5041b30686
#7798026
2022-11-23 08:23:08 +05:00
ngfrolov
b2844cd5b2
remove CacheDB from DI and project
2022-11-18 15:34:08 +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
abb6a513fd
Merge branch 'dev' into Microsoft_MemoryCache
2022-11-17 17:57:20 +05:00
ngfrolov
c78246ca7d
fix some nit warnings
2022-11-17 17:54:25 +05:00
ngfrolov
fa0389c08f
Trying to use microsoft in memeory cache
2022-11-17 16:09:51 +05:00
ngfrolov
eed8c3eeaa
#7579139 Tests
2022-11-15 17:46:58 +05:00
211f300973
#7205798 Перенос сервиса пользователей и ролей в репозиторий
2022-10-27 11:22:39 +05:00
5ea6919738
#7205798 Перенос сервиса пользователей и ролей в репозиторий
2022-10-26 15:36:49 +05:00
25cd263598
Merge pull request ' #7053070 Перенос справочника бурильщиков в репозиторий' ( #8 ) from feature/driller_repository into dev
...
Reviewed-on: http://46.146.209.148:8080/DDrilling/AsbCloudServer/pulls/8
2022-10-19 16:00:35 +05:00
b1512f7de3
#7053070 fix
2022-10-19 15:37:41 +05:00
dd469a0f9a
#7053070 Перенос справочника бурильщиков в репозиторий
2022-10-19 15:31:53 +05:00
51d4e30100
#7051313 Перенос создания композитной скважины в репозиторий
2022-10-19 13:56:34 +05:00
ngfrolov
d86f3fc1de
Merge branch 'Redice_telemetry_sampling' into dev
2022-10-11 17:05:27 +05:00
ngfrolov
707f2a638a
Add ReduceSamplingController.
2022-10-11 17:04:26 +05:00
ngfrolov
0f1b4285f5
Merge branch 'feature/file_repository' into dev
2022-10-06 14:56:12 +05:00
fe49c90e58
#6539681 file service refactor
2022-10-06 14:37:03 +05:00
b6ce4cad77
#6539681 file storage repository + tests
2022-10-06 13:41:46 +05:00
ngfrolov
c891c78782
Merge branch 'feature/file_repository' into dev
2022-10-04 09:43:22 +05:00
9644f73090
#6539681 Удалил лишние референсы
2022-09-30 13:34:50 +05:00
ngfrolov
90026f95d3
при конфигурации отладки используется строка подключения к pg с более подробными ошибками.
2022-09-28 14:51:47 +05:00
863749cfe1
##6539681 Файловый репозиторий
2022-09-28 10:46:12 +05:00
ngfrolov
4cbe71f8ca
merge
2022-09-13 13:34:52 +05:00
c4d88401fd
#5998816 дело скважины, исправления
2022-09-12 08:22:46 +05:00
ngfrolov
d3daef5b17
Fix dependencies
2022-09-08 14:02:49 +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
20f79f461f
- В SubsystemStatDto свойство UsedTimeHours double. TimeSpan.
...
- В SubsystemDto свойство Subsystem переименовано в SubsystemName
- миграция для заполнения Subsystem
- метод bsystemOperationTimeService.GetSubsystemByIdWellAsync перенесен в SubsystemService.
2022-08-15 15:08:17 +05:00
ngfrolov
0eb9410ecc
remove file share service
2022-08-11 15:14:01 +05:00
ngfrolov
0486dd9462
Rename ICrudWellRelatedService to IRepositoryWellRelated, and related services
2022-08-11 14:21:28 +05:00
a20dbf72e0
merge dev to subsystems
2022-08-08 17:02:52 +05:00
1e694216a9
доделан сервис наработок и статистики.
...
в контроллере доделан экшн получения списка подсистем и добавлена проверка доступа пользователя к скважине
2022-08-05 17:10:56 +05:00
2c4d6a9a53
дополнен фоновый сервис наработок
...
доработан контроллер наработок подсистем
переименованы модели ДТО
2022-08-03 16:35:21 +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
7f4b434a8c
Добавлены модели БД ,модели ДТО, интерфейсы, сервисы
2022-07-14 03:47:11 +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
Lyudmila Romanova
cf8c61c1a7
Изменение dto для анализа
2022-06-08 14:37:05 +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
87391ad9b1
Add DateOnly, TimeOnly support
2022-05-31 16:18:31 +05:00
Lyudmila Romanova
7bc977ada6
Добавление бурильщика и графика работы. Покрытие тестами.
2022-05-22 21:18:43 +05:00
ngfrolov
7201f7ca63
merge detected operations
2022-05-05 10:22:51 +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
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
3f2a7406d2
Add ScheduleReport
2022-03-17 16:56:13 +05:00
Фролов
45cce481ee
Add emailService
2022-02-28 14:44:26 +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
Харченко Владимир
52122358b8
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2022-01-17 10:40:27 +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
Харченко Владимир
831ef72be4
Removed dtoValidators folder
2022-01-10 16:00:09 +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
Харченко Владимир
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
Фролов
6924a6bac7
start refactoring// fire alarm
2021-12-21 11:52:53 +05:00
Фролов
a0208f412e
refactor UserRoleService
2021-12-20 15:17:09 +05:00
Харченко Владимир
d94b2e685e
CS2-133: Fixed CRUD operations over Permissions
2021-12-17 12:38:34 +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
Фролов
5752ad40b7
some rider recommendations and spelling
2021-12-07 18:27:52 +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
Фролов
fdf5a6ecd6
Add startup argument db_init to start just for migrate DB
2021-12-02 11:11:14 +05:00
KharchenkoVladimir
22c5d33b7e
CS2-123: Added AdminPermissionController and Service
2021-12-01 17:10:17 +05:00
Фролов
5c63c086ad
CS2-127 Add lazy service registration.
2021-12-01 11:49:59 +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
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
d361c9a9b4
CS2-107: Added calculation of max and average Rop for cluster wells
2021-11-22 17:29:19 +05:00
Фролов
1eaa1efb03
Refactor. Extract TimezoneService.
2021-11-22 11:30:08 +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
07820a5042
Deleted Apache Service for Excel files union
2021-10-29 13:34:56 +05:00
cult
ab13e97837
CS2-106: Added GoogleDriveService and .GetWebLink() to DrillingProgramController
2021-10-27 17:00:27 +05:00
KharchenkoVladimir
aa977e4db5
Added WellCompositeService in DependencyInjection
2021-10-14 12:30:51 +05:00
KharchenkoVladimir
911deb5b8b
CS2-97: Added DrillFlowChartParams infrastructure
2021-10-13 17:34:32 +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
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
Фролов
e604d8a031
make WellOperations import and export. ExcelTemplate embedded to infrastructure.
2021-10-09 20:16:22 +05:00
Фролов
ae9b23cc00
Refactor TelemetryAnalysis.
2021-10-01 15:44:56 +05:00
KharchenkoVV
a589775ceb
Fixed telemetry analytics calculation logic
2021-09-30 16:41:00 +05:00
KharchenkoVV
40b83826a4
CS2-88: Changed telemetry analysis start event.
2021-09-27 11:47:39 +05:00
KharchenkoVV
84e82438f7
Changed Drilling program creation to ClosedXML lib
2021-09-23 15:26:55 +05:00
Фролов
0b1f9683b9
fix jsonSerializer settings;
...
reafctor TelemetryHub;
Add wellDepth into TelemetryMessage
2021-09-17 16:24:01 +05:00
Фролов
30a59d0809
cleanup
2021-09-10 11:28:57 +05:00
Фролов
14cf99a1dd
Add DrillingProgramController
2021-08-29 17:25:16 +05:00
Фролов
9724b24d98
LastData rename to Measure. Implement MeasureService
2021-08-28 20:00:04 +05:00
Фролов
843dd276a3
NotCompleted LasdData Weekend
2021-08-27 17:55:22 +05:00
Фролов
94b7dd3ef7
All statisstic moved to WellOperationStatService.
...
Stats reorganized
2021-08-24 16:47:10 +05:00
Фролов
99d242101e
remove efModel wellSection. Cleanup. Split categories lastData and files
2021-08-24 10:59:10 +05:00
KharchenkoVV
bc1bcb2ee2
CS2-53: Added basics of WellOperation controller, service, model and dto
2021-08-13 17:25:06 +05:00
KharchenkoVV
1956eafb32
Renamed Analytics Service and Controller to TelemetryAnalytics
2021-08-13 15:57:22 +05:00
Фролов
e96a9820db
implement async WellSection controller
2021-08-10 14:36:35 +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
99242f6995
CS2-38: Добавлены модель, контроллер и сервис для сохранения и отправки файлов по категориям
2021-07-23 17:40:31 +05:00
KharchenkoVV
e3c4b262d9
CS2-29: Изменены имя и поля модели DrillingAnalysis (на TelemetryAnalysis)
2021-07-19 15:57:38 +05:00
Фролов
0c645ed960
fix dictionaries sync
2021-07-16 09:15:10 +05:00
KharchenkoVV
5259a1c730
CS2-24: Правки к предыдущим 3 коммитам
2021-06-25 15:10:05 +05:00
KharchenkoVV
9aa78e9e2c
CS2-24: Добавлено распознавание операции по телеметрии
2021-06-24 13:02:31 +05:00
KharchenkoVV
70dca51987
CS2-24: Добавлены методы получения данных "глубина-день" и "скорость проходки-интервал".
2021-06-17 15:12:39 +05:00
KharchenkoVV
b39be3547c
CS2-3: В контроллер репортов добавлено создание репорта
2021-05-19 14:41:27 +05:00
KharchenkoVV
35b24176ff
CS2-3: Добавлена инфраструктура для работы с репортами
2021-05-18 12:33:23 +05:00
KharchenkoVV
a1eb94901e
Добавлена возможность получения списка активно передающих данные скважин
2021-05-12 16:03:14 +05:00
Фролов
fce20a2a10
autocleanup
2021-04-23 10:21:25 +05:00
Фролов
ef9bb8f39f
среда:)
2021-04-07 18:01:56 +05:00
Фролов
31a2e1e878
Добавьте файлы проекта.
2021-04-02 17:28:07 +05:00
