on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity
1,315 Commits 1 Branch 0 Tags 37 MiB
ff12c17496
Commit Graph

907 Commits

Author SHA1 Message Date
Фролов
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
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
Фролов
0bef278911 fix report context wrapper telemetry events and users unsync protect 2021-09-23 18:00:41 +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
Фролов
9ccde70b98 cleanup 2021-09-23 15:26:54 +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
Фролов
01d00e6d18 cleanup 2021-09-21 09:23:17 +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
KharchenkoVV
3017d6d990 Merge branch 'master' of https://bitbucket.org/autodrilling/asbcloudserver 2021-09-10 11:30:38 +05:00
KharchenkoVV
4b8a161ed5 Fixed date intervals in .GetOperationsSummaryAsync() 2021-09-10 11:30:24 +05:00
Фролов
30a59d0809 cleanup 2021-09-10 11:28:57 +05:00
Фролов
3c9718b0de CachedTable implement IEnumerable 2021-09-08 11:51:55 +05:00
Фролов
16bd6749fd fix telemetry user id mapping 2021-09-03 11:35:49 +05:00
Фролов
187c83a7b1 ignoring strange issue. 2021-09-03 11:35:27 +05:00
KharchenkoVV
81e765581c CS2-70: Added wells with no operations into cluster info 2021-09-02 11:42:05 +05:00
KharchenkoVV
95733371a2 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-09-02 10:13:33 +05:00
KharchenkoVV
1debac9505 Fixed exception with .ElementAt(0) call at empty collection 2021-09-02 10:13:20 +05:00
Фролов
b471efc59e File author is optional (for drillingProgram) 2021-09-01 15:55:10 +05:00
Фролов
a7962492af fileController search by companyName (not by companyId). 
Add UserDto into FileInfoDto.
Add CompanyDto into UserDto.
 2021-08-31 18:01:26 +05:00
Фролов
41660af49f FileController Add file size and fix search by file name 2021-08-31 12:29:27 +05:00
Фролов
b3b1230c0a CS2-58 FileController Add filter by filename 2021-08-31 09:59:23 +05:00
Фролов
e8bfe3b443 add new file categories 2021-08-31 09:52:32 +05:00
Фролов
7f0d5bd673 fix di in DrillingProgramService 2021-08-29 17:27:24 +05:00
Фролов
14cf99a1dd Add DrillingProgramController 2021-08-29 17:25:16 +05:00
Фролов
002da70471 fix CalcStat on empty operations list 2021-08-29 12:05:43 +05:00
Фролов
06a492a5e5 fix merge plan-fact in WellOperationsStatService 2021-08-29 11:59:20 +05:00
Фролов
80d74067c0 MeasureService Add GetLastAsync 2021-08-28 22:34:57 +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
Фролов
f744b49824 nit spelling 2021-08-27 15:53:38 +05:00
Фролов
ac57a69670 Add CalcTvd to WellOperationsStatService 2021-08-27 12:15:04 +05:00
Фролов
7231fad19e fixed calculations 2021-08-26 10:18:59 +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
Фролов
590197d3a6 fix helper class 2021-08-25 11:41:09 +05:00
Фролов
85ff9a5903 StatController mathod renames 2021-08-25 11:30:50 +05:00
Фролов
e55f505ea7 Refactor Stat* models 2021-08-25 11:13:56 +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
a2cb8071c8 CS2-64: Ordered returning dtos by DepthPlan value. 2021-08-23 17:31:08 +05:00
KharchenkoVV
a0856fad25 CS2-66: Added well depth filter to .GetOperationsAsync() 2021-08-23 16:59:26 +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
Фролов
cec8e92d77 Clean and doc 2021-08-20 14:17:53 +05:00
Фролов
322208e2b5 clean 2021-08-20 13:59:30 +05:00
Фролов
6db671f955 fixed nullReference in mapping filePropertiesDto 2021-08-20 13:56:20 +05:00
KharchenkoVV
fbff8e986a CS2-65: Added operations calculation for whole well 2021-08-20 13:56:01 +05:00
Фролов
9d50f0d1c9 fix add SemaphoreSlim into Cache.Refresh(..) and Cache.RefreshAsync(..) method to avoid racing 2021-08-20 12:45:26 +05:00
KharchenkoVV
b39f07821d CS2-58: Added files filtering by requested companies ids 2021-08-20 11:20:24 +05:00
KharchenkoVV
d0deefe74f CS2-56: Changed tuple to FileInfoDto 2021-08-19 17:32:22 +05:00
KharchenkoVV
8b5af8d32e CS2-59: Added Delete() to File controller 2021-08-19 16:58:26 +05:00
KharchenkoVV
e8d98a0887 CS2-55: Renamed SaveFileProperties...() to SaveFileInfos() 2021-08-19 16:34:36 +05:00
KharchenkoVV
bf823e1825 CS2-55: Moved file saving logic from File controller to service 2021-08-19 16:32:04 +05:00
KharchenkoVV
e45a693c92 CS2-54: Fixed default well operations in Db 2021-08-19 14:31:02 +05:00
KharchenkoVV
aa87cb1c35 CS2-54: Fixed 'route speed' calculation 2021-08-19 14:13:08 +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
Фролов
582629c8d7 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-18 17:01:16 +05:00
Фролов
7b154abb66 CS2-61 WellOperationController.GetAllAsync(..) добавить параметры фильтрации 2021-08-18 16:57:20 +05:00
KharchenkoVV
1ea6ea83aa Added 1000 interval in WellOperations Ids 2021-08-18 16:51:41 +05:00
KharchenkoVV
8bcaf18cb1 Fixed WellSection service 2021-08-18 16:27:18 +05:00
KharchenkoVV
977645e23a CS2-54: Added Well section data calculation 2021-08-18 14:52:52 +05:00
KharchenkoVV
d6bf5d3252 Added IdUser claim to authenticated user claims 2021-08-17 13:03:17 +05:00
KharchenkoVV
d1f67dc69c WellOperation Controller and Service fix 2021-08-17 09:20:31 +05:00
KharchenkoVV
d7e0eace47 CS2-53: Added WellOperations Controller, Service, Dtos and Models 2021-08-16 14:19:43 +05:00
KharchenkoVV
e1310be988 Added default predicate to CacheTable.Where() method 2021-08-16 14:16:44 +05:00
KharchenkoVV
1db3a81d56 Renamed plural table names to singular 2021-08-16 10:38:48 +05:00
KharchenkoVV
e668b8c2ff CS2-53: Model changes to Well/Operation/SectionType 2021-08-16 10:21:46 +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
1956eafb32 Renamed Analytics Service and Controller to TelemetryAnalytics 2021-08-13 15:57:22 +05:00
KharchenkoVV
12a73a4e21 Renamed 'TelemetryOperation' model to 'Operation' 2021-08-13 15:35:03 +05:00
Фролов
9497aaf7e3 Add WellSectionTypes dbSet 2021-08-13 12:33:05 +05:00
KharchenkoVV
b218187117 CS2-37: Fixed OperationsToInterval() analytics. Half done. 2021-08-13 12:32:43 +05:00
Фролов
eaf1b9509d Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-12 11:52:36 +05:00
Фролов
95a3a0d207 WellSectionController params order 2021-08-12 11:50:04 +05:00
KharchenkoVV
fe5eb39000 CS2-50: Changed some .SaveChanges() to .SaveChangesAsync() 2021-08-11 17:41:51 +05:00
KharchenkoVV
ab63bc4aa1 CS2-50: Added .ConfigureAwait(false) to all async methods. 2021-08-11 17:26:02 +05:00
Фролов
f0f9d1df73 fix clusterService 2021-08-11 17:14:11 +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
e4800bf281 Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-11 10:16:09 +05:00
KharchenkoVV
744266336e CS2-50: Added .AsNoTracking() to services' queries. 2021-08-11 10:16:01 +05:00
Фролов
bb011c5afe Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-08-10 17:43:20 +05:00
Фролов
33f545c7b3 WellSectionController tested and fixed 2021-08-10 17:43:13 +05:00
KharchenkoVV
814f809c3e dbSet initialization in CacheTable is moved to constructor 2021-08-10 16:49:14 +05:00
Фролов
50fc46e007 WellSectionController almost done 2021-08-10 16:37:36 +05:00
Фролов
0f08d71ddb better names for db entities 2021-08-10 16:37:13 +05:00
Фролов
7eed929f33 add AsNoTracking() in cache 2021-08-10 16:35:31 +05:00
Фролов
e96a9820db implement async WellSection controller 2021-08-10 14:36:35 +05:00
Фролов
33c79b6c8b Cyrilic 'С' to eng 'C' 2021-08-09 15:57:41 +05:00
Фролов
3a325f6c94 Очистка и анализ кода 2021-08-09 15:41:42 +05:00
Фролов
a14e5134bf добавлен фильтр сообщений по тексту 2021-08-09 15:09:46 +05:00
Фролов
9e69ff4ce7 Add DbContext Set method into interface 2021-08-09 14:39:56 +05:00
KharchenkoVV
91da4fa9c2 Deleted link to AsbCloudDb from AsbCloudApp + codefix 2021-08-09 14:01:57 +05:00
KharchenkoVV
433900a1ee CS2-43: Fixed 'Last data' tables saving issues 2021-08-04 14:22:00 +05:00
KharchenkoVV
17c07f8c8e CS2-43: Added save and get 'LastData' for Fluid 2021-08-03 17:55:28 +05:00
KharchenkoVV
543272ce7b CS2-43: Added 'Last Data' tables saving to Db 2021-08-02 18:35:36 +05:00
Фролов
4cb797e9c8 add CrudController 2021-08-02 14:45:13 +05:00
Фролов
d5d52daa53 + 2021-08-02 12:52:44 +05:00
KharchenkoVV
4d08e0e562 CS2-43: Доработанный контроллер, Dto и EF модели для 'Последних данных' 2021-08-02 12:23:18 +05:00
KharchenkoVV
4f703fb53e CS2-43: Контроллер и сервис для 'Последних данных' 2021-08-02 11:39:39 +05:00
Фролов
77f1f54c30 IsCompanyOwnsWell rename to IsCompanyInvolvedInWell 2021-07-29 12:39:22 +05:00
Фролов
59a86e4c4b Обход бага .net 2021-07-29 12:36:29 +05:00
Фролов
1e878aaa03 cleanup 2021-07-28 09:56:17 +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
Фролов
05cf7244ef wellService.CheckWellOwnership rename to wellService.IsCompanyOwnsWell 2021-07-27 12:37:10 +05:00
KharchenkoVV
1325663d7e Изменен путь до контроллера получения документов 2021-07-26 17:26:07 +05:00
KharchenkoVV
9072abe152 CS2-38: Добавлена пагинация для таблицы с файлами 2021-07-26 11:54:50 +05:00
KharchenkoVV
99242f6995 CS2-38: Добавлены модель, контроллер и сервис для сохранения и отправки файлов по категориям 2021-07-23 17:40:31 +05:00
Фролов
1d69ddf4e5 CS2-28 Починить библиотеку генерации репортов 2021-07-23 14:55:31 +05:00
KharchenkoVV
2d2a7d744e Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-07-22 15:22:50 +05:00
KharchenkoVV
016522fbd5 Поле Duration заменено на DurationSec (в Dto и модели для Operation) 2021-07-22 15:22:33 +05:00
Фролов
e5a3e30183 CS2-36 В контроллер Deposit добавить метод получения "дерева" доступных пользователю месторождений->кустов->скважин для панели навигации фронта 2021-07-22 14:23:47 +05:00
KharchenkoVV
eaafc7fd04 Изменены некоторые имена полей TelemetryAnalysis 2021-07-21 17:57:59 +05:00
Фролов
9c5c1fc9c5 fix WellService controller 2021-07-21 17:23:57 +05:00
KharchenkoVV
e447473a71 CS2-34: Добавлена пагинация в метод, возвращающий список событий на скважине 2021-07-21 16:49:24 +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
Фролов
d0378e4f1d Customer to company. Db model opt. 2021-07-21 15:22:58 +05:00
Фролов
28a1295332 CS2-30 Создать контроллер куста и контроллер месторождения. 
Разработана модель данных
 2021-07-21 12:48:37 +05:00
Фролов
11f5bd00f1 CS2-30 Создать контроллер куста и контроллер месторождения. 
Разработана модель данных
 2021-07-21 12:30:51 +05:00
KharchenkoVV
54d917c17e CS2-34: В AnalyticsService добавлен метод, возвращающий все операции на скважине 2021-07-20 15:13:26 +05:00
KharchenkoVV
2586bacaf6 CS2-31: Добавлены параметры id_feed_regulator и MSE в передачу и сохранение в БД (в DataSaubBase) 2021-07-20 13:42:07 +05:00
KharchenkoVV
f7ed377572 CacheTable.Insert() methods fix 2021-07-20 12:28:56 +05:00
KharchenkoVV
1dadc96882 Заменены "Hours" на "Seconds" в именах Unix timestamp параметров. 2021-07-20 11:50:35 +05:00
KharchenkoVV
28c42da58a Правки к аналитике 2021-07-20 11:24:57 +05:00
KharchenkoVV
faaa4bedda CS2-33: Сохранение аналитики целой операцией с продолжительностью. 2021-07-20 09:36:40 +05:00
Фролов
5c783b332b Merge branch 'master' of https://bitbucket.org/frolovng/asbcloudserver 2021-07-19 17:46:00 +05:00
KharchenkoVV
e3c4b262d9 CS2-29: Изменены имя и поля модели DrillingAnalysis (на TelemetryAnalysis) 2021-07-19 15:57:38 +05:00
KharchenkoVV
41111a5535 CS2-29: Изменены имя и поля модели DrillingAnalysis (на TelemetryAnalysis) 2021-07-19 15:31:50 +05:00
Фролов
f30cafcb1e CS2-30 Создать контроллер куста и контроллер месторождения 2021-07-19 15:11:01 +05:00
Фролов
e99b476f47 meged 2021-07-16 09:19:50 +05:00
Фролов
0c645ed960 fix dictionaries sync 2021-07-16 09:15:10 +05:00
KharchenkoVV
d4e9a5f889 CS2-21: Получение имени репорта из его пути заменено на .GetFileName() 2021-07-02 12:29:13 +05:00
KharchenkoVV
88f0453a32 CS2-22: Исправлено выпадение исключения при запросе диапазона дат 2021-07-01 17:54:29 +05:00
KharchenkoVV
fd5871a9ec CS2-24: Добавлены данные аналитики по операциям 2021-06-30 10:16:06 +05:00
KharchenkoVV
3e6a55b547 CS2-24: Логика расчета линейной функции вынесена в отдельный класс 2021-06-28 11:35:52 +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
5409f5a38f CS2-24: Исправлены либо заменены заглушками данные для графиков аналитики. 2021-06-22 09:49:53 +05:00
KharchenkoVV
70dca51987 CS2-24: Добавлены методы получения данных "глубина-день" и "скорость проходки-интервал". 2021-06-17 15:12:39 +05:00
KharchenkoVV
1bc374523a CS2-3: Добавлено получение отчетов с сервера и оповещение о прогрессе получения 2021-06-07 16:31:14 +05:00
KharchenkoVV
528e649813 Исправлено получение диапазона дат для Репортов 2021-05-31 16:28:50 +05:00
KharchenkoVV
b0155a19c0 Исправлена логика получения диапазона дат для репортов 2021-05-31 14:56:44 +05:00
KharchenkoVV
6803f836b4 CS2-10: Добавлен поиск по имеющимся отчетам, которые удовлетворяют заданным параметрам 2021-05-31 12:33:17 +05:00
KharchenkoVV
3a4a27942a CS2-16: Fix критической ошибки при получении двух юзеров с одинаковым Id 2021-05-28 15:04:11 +05:00
KharchenkoVV
b21fe640e0 CS2-15: Исправлено прореживание больших возвращаемых данных о скважинах 2021-05-28 11:25:07 +05:00
Фролов
c3eb24cbb5 fix defix devision by zero exception 2021-05-25 11:51:09 +05:00
Фролов
7e1ccc21ab fix report model error 2021-05-24 16:31:02 +05:00
Фролов
7f12f48cb9 fix backgroundService exception handler 2021-05-24 16:30:35 +05:00
KharchenkoVV
ae85cdedd5 CS2-13: Добавлена потокобезопасность для данных в CaсheTable 2021-05-21 17:42:18 +05:00
KharchenkoVV
7b00cedb47 CS2-11: Добавлено обновление устаревших CacheTable при их вызове 2021-05-21 12:30:25 +05:00
KharchenkoVV
802fdd1015 bugfix: Замена .Any() на !.Any() там, где это необходимо 2021-05-21 11:02:43 +05:00
KharchenkoVV
d45f8cb429 CS2-12: Удален интерфейс ICacheTable<T> 2021-05-20 14:14:51 +05:00
Фролов
d57f495ff0 fix report progress notification mech 2021-05-20 12:38:25 +05:00
KharchenkoVV
1c6990487f Очистка кода 2021-05-20 11:17:55 +05:00
KharchenkoVV
4507b26581 CS2-3: Добавлен SignalR ReportHub и его применение в ReportController 2021-05-20 11:07:45 +05:00
KharchenkoVV
dfdfeff32e Очистка кода v2.0 2021-05-19 15:50:09 +05:00
KharchenkoVV
e3c916bc42 Очистка кода 2021-05-19 15:21:19 +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
2c0eb7b238 Переход на .NET 5 2021-05-18 11:13:21 +05:00
KharchenkoVV
583866d75d CS2-1: Убран лишний параметр из метода GetDatesRange() 2021-05-17 14:04:33 +05:00
KharchenkoVV
abbc461330 CS2-1: Добавлена возможность получения диапазона дат архива 2021-05-17 12:53:30 +05:00
KharchenkoVV
335792ae94 CS2-1: Исправлена возможность получения диапазона дат сообщений 2021-05-14 17:02:29 +05:00
KharchenkoVV
0bfec5dcb1 CS2-6: Изменено имя метода получения uids передеющих скважин 2021-05-14 10:58:23 +05:00
KharchenkoVV
026fbea529 CS2-6: В TelemetryTracker изменены имена методов 2021-05-14 09:58:02 +05:00
KharchenkoVV
dd9c985e65 CS2-1: Добавлена возможность получения диапазона дат сообщений 2021-05-13 17:50:37 +05:00
KharchenkoVV
0be4847f58 CS2-5: Добавлена проверка данных на наличие при добавлении в архив 2021-05-13 12:24:21 +05:00
KharchenkoVV
7df66b314e Удалены нижние подчеркивания из имен private полей 2021-05-13 10:26:24 +05:00
KharchenkoVV
7bbcdf8483 Правки к предыдущему коммиту по задаче CS2-6 2021-05-12 17:25:52 +05:00
KharchenkoVV
a1eb94901e Добавлена возможность получения списка активно передающих данные скважин 2021-05-12 16:03:14 +05:00
Фролов
7d8974a8e5 Заработала синхронизация с панели 2021-04-30 17:35:35 +05:00
Фролов
fce20a2a10 autocleanup 2021-04-23 10:21:25 +05:00
Фролов
42cc4d491f fix 2021-04-10 22:02:31 +05:00
Фролов
24e0bed979 настроил разделение по группас в signalR, отправку из веб апи. доработал кеш. 2021-04-09 17:59:07 +05:00
Фролов
ef9bb8f39f среда:) 2021-04-07 18:01:56 +05:00
Фролов
31a2e1e878 Добавьте файлы проекта. 2021-04-02 17:28:07 +05:00