|
@@ -2,7 +2,13 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="b5beace6-e4f4-419b-8299-c67e17af5998" name="Default Changelist" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Routes/api.php" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Routes/api.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Routes/api.php" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" beforeDir="false" afterPath="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -18,8 +24,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="613">
|
|
|
- <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
|
|
|
+ <state relative-caret-position="316">
|
|
|
+ <caret line="40" column="26" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="26" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
@@ -27,8 +33,8 @@
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="409">
|
|
|
- <caret line="68" column="46" lean-forward="true" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="522">
|
|
|
+ <caret line="47" column="51" lean-forward="true" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
|
|
|
<folding>
|
|
|
<element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -36,11 +42,32 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1323">
|
|
|
+ <caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#139#160#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="523">
|
|
|
- <caret line="738" column="27" selection-start-line="738" selection-start-column="27" selection-end-line="738" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="156">
|
|
|
+ <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
|
|
|
<folding>
|
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
@@ -49,12 +76,12 @@
|
|
|
</entry>
|
|
|
</file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="406">
|
|
|
+ <caret line="173" column="71" selection-start-line="173" selection-start-column="71" selection-end-line="173" selection-end-column="71" />
|
|
|
<folding>
|
|
|
- <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
@@ -64,7 +91,6 @@
|
|
|
</component>
|
|
|
<component name="FindInProjectRecents">
|
|
|
<findStrings>
|
|
|
- <find>Module</find>
|
|
|
<find>QUEUE_CONNECTION</find>
|
|
|
<find>Predis\Client</find>
|
|
|
<find>REDIS_QUEUE</find>
|
|
@@ -94,6 +120,7 @@
|
|
|
<find>menu</find>
|
|
|
<find>public</find>
|
|
|
<find>$file_exists</find>
|
|
|
+ <find>all()</find>
|
|
|
</findStrings>
|
|
|
</component>
|
|
|
<component name="Git.Settings">
|
|
@@ -110,7 +137,6 @@
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Http/Controllers/LoginController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_26_024115_add_sort_to_camera_list_table.php" />
|
|
|
<option value="$PROJECT_DIR$/storage/logs/laravel-2021-04-26.log" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Helpers.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/StopStreamDelFiles.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_04_28_111556_create_mine_list_ext_table.php" />
|
|
@@ -133,12 +159,9 @@
|
|
|
<option value="$PROJECT_DIR$/app/Console/Commands/UpdateHkList.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Database/Migrations/2021_04_23_032650_update_camera_list_table_fields.php" />
|
|
|
<option value="$PROJECT_DIR$/.env" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Enum/ApiEnum.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/HaiKangController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Database/Migrations/2021_05_26_074955_create_working_surface_table.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Entities/WorkingSurface.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/MineController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Services/MineServices.php" />
|
|
@@ -149,10 +172,14 @@
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Routes/web.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/CameraController.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/SurfaceController.php" />
|
|
|
- <option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Admin/Database/Seeders/AdminDatabaseSeeder.php" />
|
|
|
<option value="$PROJECT_DIR$/app/Http/Controllers/TestsController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Routes/api.php" />
|
|
|
<option value="$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Routes/api.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php" />
|
|
|
+ <option value="$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
@@ -368,38 +395,14 @@
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Entities" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controllers" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Camera" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="Routes" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Http" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Controllers" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Api" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
@@ -411,13 +414,6 @@
|
|
|
<path>
|
|
|
<item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Modules" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Mine" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Services" type="462c0819:PsiDirectoryNode" />
|
|
|
- </path>
|
|
|
- <path>
|
|
|
- <item name="video_system" type="b2602c69:ProjectViewProjectNode" />
|
|
|
- <item name="video_system" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="routes" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
@@ -470,7 +466,7 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="291210000" />
|
|
|
+ <option name="totallyTimeSpent" value="296016000" />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
<frame x="0" y="0" width="1440" height="900" extended-state="0" />
|
|
@@ -619,13 +615,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="357">
|
|
|
- <caret line="17" column="28" selection-start-line="17" selection-start-column="21" selection-end-line="17" selection-end-column="28" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/vendor/laravel/framework/src/Illuminate/Support/Facades/Cache.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="210">
|
|
@@ -643,13 +632,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="168">
|
|
|
- <caret line="17" column="76" selection-start-line="17" selection-start-column="76" selection-end-line="17" selection-end-column="76" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/app/Helpers.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="950">
|
|
@@ -708,16 +690,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="260">
|
|
|
- <caret line="31" column="55" selection-start-line="31" selection-start-column="55" selection-end-line="31" selection-end-column="55" />
|
|
|
- <folding>
|
|
|
- <element signature="e#139#160#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Auxiliary/View/FromAuxiliary.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="260">
|
|
@@ -787,16 +759,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="251">
|
|
|
- <caret line="108" column="35" selection-start-line="108" selection-start-column="35" selection-end-line="108" selection-end-column="35" />
|
|
|
- <folding>
|
|
|
- <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Admin/Routes/web.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="613">
|
|
@@ -838,37 +800,71 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="613">
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Routes/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="483">
|
|
|
+ <caret line="23" column="32" selection-start-line="23" selection-start-column="17" selection-end-line="23" selection-end-column="32" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Routes/api.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="126">
|
|
|
+ <caret line="15" column="15" selection-start-line="15" selection-start-column="15" selection-end-line="15" selection-end-column="15" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Http/Controllers/Api/MineApiController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1323">
|
|
|
<caret line="68" column="41" selection-start-line="68" selection-start-column="41" selection-end-line="68" selection-end-column="41" />
|
|
|
+ <folding>
|
|
|
+ <element signature="e#139#160#0#PHP" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Mine/Services/SurfaceServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="409">
|
|
|
- <caret line="68" column="46" lean-forward="true" selection-start-line="68" selection-start-column="46" selection-end-line="68" selection-end-column="46" />
|
|
|
+ <state relative-caret-position="406">
|
|
|
+ <caret line="173" column="71" selection-start-line="173" selection-start-column="71" selection-end-line="173" selection-end-column="71" />
|
|
|
<folding>
|
|
|
- <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#127#148#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/app/Http/Controllers/TestsController.php">
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Enum/CameraEnum.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="210">
|
|
|
- <caret line="22" column="5" lean-forward="true" selection-start-line="22" selection-start-column="5" selection-end-line="22" selection-end-column="5" />
|
|
|
+ <state relative-caret-position="316">
|
|
|
+ <caret line="40" column="26" selection-start-line="40" selection-start-column="10" selection-end-line="40" selection-end-column="26" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Modules/Camera/Http/Controllers/Api/CameraApiController.php">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="522">
|
|
|
+ <caret line="47" column="51" lean-forward="true" selection-start-line="47" selection-start-column="51" selection-end-line="47" selection-end-column="51" />
|
|
|
<folding>
|
|
|
- <element signature="e#126#164#0#PHP" expanded="true" />
|
|
|
+ <element signature="e#141#162#0#PHP" expanded="true" />
|
|
|
</folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Modules/Camera/Services/CameraServices.php">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="523">
|
|
|
- <caret line="738" column="27" selection-start-line="738" selection-start-column="27" selection-end-line="738" selection-end-column="27" />
|
|
|
+ <state relative-caret-position="156">
|
|
|
+ <caret line="99" lean-forward="true" selection-start-line="99" selection-end-line="99" />
|
|
|
<folding>
|
|
|
<element signature="e#129#150#0#PHP" expanded="true" />
|
|
|
</folding>
|