Фролов
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
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
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
KharchenkoVV
0132407dd8
CS2-88: Fixed analyze start date calculation
2021-09-28 14:37:44 +05:00
KharchenkoVV
130feacdd5
CS2-88: Added refresh of Telemetry analyze start date (to prevent infinite loops)
2021-09-28 10:17:26 +05:00
Фролов
c2c9bad200
merge master (hotfix) to dev.
2021-09-27 16:53:54 +05:00
KharchenkoVV
6730d64df1
CS2-88: Changed telemetry analysis interval (to 12 hours parts)
2021-09-27 16:50:56 +05:00
Фролов
eb3668a8ba
mark legacy as Obsolete. till panels full update.
2021-09-27 16:48:24 +05:00
Фролов
dc156154b0
hotfix telemetryService get Id. UDO this when cache table done
2021-09-27 16:47:16 +05:00
KharchenkoVV
40b83826a4
CS2-88: Changed telemetry analysis start event.
2021-09-27 11:47:39 +05:00
KharchenkoVV
99ec0dedaf
Disabled Telemetry analytics calculation
2021-09-24 15:30:50 +05:00
KharchenkoVV
614519c3c8
Fixed if() expression in CacheTable.Refresh()
2021-09-24 15:17:30 +05:00
KharchenkoVV
8ad98027cb
CS2-85: Added force cache update in .GetOrCreateTelemetryByUid()
2021-09-24 14:19:27 +05:00
KharchenkoVV
804bdc6175
Merge branch 'dev' of https://bitbucket.org/autodrilling/asbcloudserver into dev
2021-09-24 11:17:42 +05:00
KharchenkoVV
53ef4425c9
CS2-87: Added well depth display to messages table.
2021-09-24 11:17:31 +05:00
Фролов
23b044e10e
Logging on bacground task fails
2021-09-23 17:59:31 +05:00
KharchenkoVV
7aa83f8c2d
CS2-82: Sorted operations in Plan\Fact table
2021-09-23 17:34:27 +05:00
KharchenkoVV
a86c2ed971
Merge conflicts solve
2021-09-23 15:53:26 +05:00
KharchenkoVV
059475e96a
CS2-74: Changed using NPOI library to ClosedXML
2021-09-23 15:26:55 +05:00
Фролов
845f1f0fb1
refactor names
2021-09-23 15:26:55 +05:00
KharchenkoVV
84e82438f7
Changed Drilling program creation to ClosedXML lib
2021-09-23 15:26:55 +05:00
Фролов
956e564f56
переименовал ряд методов для лучшего понимания
2021-09-23 15:26:55 +05:00
Фролов
83e592ba86
CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД.
2021-09-23 15:26:55 +05:00
KharchenkoVV
9d609ed402
CS2-74: Changed using NPOI library to ClosedXML
2021-09-23 14:36:05 +05:00
Фролов
04d6b1c1a7
refactor names
2021-09-23 11:56:12 +05:00
Фролов
214c4dc84b
Add IFileService.MoveAsync;
2021-09-23 11:55:25 +05:00
KharchenkoVV
9e89f87d47
Changed Drilling program creation to ClosedXML lib
2021-09-23 11:39:56 +05:00
Фролов
e93e1e72a1
переименовал ряд методов для лучшего понимания
2021-09-23 10:53:48 +05:00
Фролов
44d41fb377
CS2-60 ReportGenerator выдает неправильные значения при отсутствии данных в БД.
2021-09-23 10:52:10 +05:00
Фролов
38e7f624b1
fix reports.
2021-09-20 15:25:08 +05:00
Фролов
711dfa681d
Fix fail messageController on telemetry user is null.
2021-09-20 10:33:15 +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
Фролов
1bf746dff2
Fix operations order
2021-09-13 12:28:57 +05:00
KharchenkoVV
e8063057d7
Added .GetOperationsDateRangeAsync() to Telemetry analytics controller
2021-09-10 15:23:36 +05:00
