|
|
@@ -2,11 +2,7 @@
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" afterDir="false" />
|
|
|
</list>
|
|
|
<ignored path="$PROJECT_DIR$/target/" />
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
@@ -45,13 +41,6 @@
|
|
|
<item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
|
|
|
<item name="cinema: schema" type="c314c289:MysqlImplModel$Schema" />
|
|
|
</path>
|
|
|
- <path>
|
|
|
- <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
|
|
|
- <item name="cinema" type="feb32156:DbDataSourceImpl" />
|
|
|
- <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
|
|
|
- <item name="cinema: schema" type="c314c289:MysqlImplModel$Schema" />
|
|
|
- <item name="movie: table" type="98d5ac3d:MysqlImplModel$Table" />
|
|
|
- </path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</component>
|
|
|
@@ -77,11 +66,11 @@
|
|
|
<entry key="gitignore" value="1" />
|
|
|
<entry key="hall" value="3" />
|
|
|
<entry key="html" value="2" />
|
|
|
- <entry key="java" value="247" />
|
|
|
+ <entry key="java" value="250" />
|
|
|
<entry key="js" value="3" />
|
|
|
<entry key="movie" value="14" />
|
|
|
<entry key="movie_like" value="1" />
|
|
|
- <entry key="schedule" value="23" />
|
|
|
+ <entry key="schedule" value="24" />
|
|
|
<entry key="sql" value="17" />
|
|
|
<entry key="ticket" value="2" />
|
|
|
<entry key="user" value="2" />
|
|
|
@@ -92,9 +81,9 @@
|
|
|
</usages-collector>
|
|
|
<usages-collector id="statistics.file.types.open">
|
|
|
<counts>
|
|
|
- <entry key="Database Element" value="49" />
|
|
|
+ <entry key="Database Element" value="50" />
|
|
|
<entry key="HTML" value="2" />
|
|
|
- <entry key="JAVA" value="247" />
|
|
|
+ <entry key="JAVA" value="250" />
|
|
|
<entry key="JavaScript" value="3" />
|
|
|
<entry key="PLAIN_TEXT" value="1" />
|
|
|
<entry key="SQL" value="2" />
|
|
|
@@ -105,13 +94,13 @@
|
|
|
</usages-collector>
|
|
|
<usages-collector id="statistics.file.extensions.edit">
|
|
|
<counts>
|
|
|
- <entry key="cell" value="146" />
|
|
|
+ <entry key="cell" value="154" />
|
|
|
<entry key="dummy" value="8" />
|
|
|
<entry key="gitignore" value="6" />
|
|
|
<entry key="java" value="8018" />
|
|
|
<entry key="sql" value="934" />
|
|
|
<entry key="txt" value="12" />
|
|
|
- <entry key="xml" value="1363" />
|
|
|
+ <entry key="xml" value="1364" />
|
|
|
<entry key="yml" value="34" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
@@ -120,8 +109,8 @@
|
|
|
<entry key="JAVA" value="8018" />
|
|
|
<entry key="PLAIN_TEXT" value="26" />
|
|
|
<entry key="SQL" value="70" />
|
|
|
- <entry key="Scratch" value="1080" />
|
|
|
- <entry key="XML" value="1293" />
|
|
|
+ <entry key="Scratch" value="1088" />
|
|
|
+ <entry key="XML" value="1294" />
|
|
|
<entry key="YAML" value="34" />
|
|
|
</counts>
|
|
|
</usages-collector>
|
|
|
@@ -130,19 +119,10 @@
|
|
|
<component name="FileEditorManager">
|
|
|
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="-18">
|
|
|
- <caret line="52" column="18" lean-forward="true" selection-start-line="50" selection-start-column="8" selection-end-line="52" selection-end-column="18" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- </file>
|
|
|
- <file pinned="false" current-in-tab="true">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="248">
|
|
|
- <caret line="37" column="45" lean-forward="true" selection-start-line="37" selection-start-column="45" selection-end-line="37" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="413">
|
|
|
+ <caret line="37" column="99" selection-start-line="37" selection-start-column="99" selection-end-line="37" selection-end-column="99" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
@@ -156,6 +136,18 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="305">
|
|
|
+ <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
@@ -174,6 +166,39 @@
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="339">
|
|
|
+ <caret line="24" column="42" lean-forward="true" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="240">
|
|
|
+ <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file pinned="false" current-in-tab="false">
|
|
|
+ <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule">
|
|
|
+ <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
|
|
|
+ <state>
|
|
|
+ <filtering enabled="true" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
<file pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/db.sql">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
@@ -252,7 +277,6 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java" />
|
|
|
- <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" />
|
|
|
<option value="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieForm.java" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieBatchOffForm.java" />
|
|
|
@@ -265,6 +289,7 @@
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" />
|
|
|
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql" />
|
|
|
<option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml" />
|
|
|
+ <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -361,7 +386,7 @@
|
|
|
<item name="com" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="example" type="462c0819:PsiDirectoryNode" />
|
|
|
<item name="cinema" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="data" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="controller" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
<path>
|
|
|
<item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
|
|
|
@@ -398,7 +423,7 @@
|
|
|
<property name="RequestMappingsPanelWidth1" value="75" />
|
|
|
<property name="WebServerToolWindowFactoryState" value="false" />
|
|
|
<property name="aspect.path.notification.shown" value="true" />
|
|
|
- <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555426785350" />
|
|
|
+ <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555428379350" />
|
|
|
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
|
|
|
<property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
|
|
|
<property name="database.console.LAST_STATE" value="false" />
|
|
|
@@ -574,7 +599,7 @@
|
|
|
<workItem from="1555308079660" duration="812000" />
|
|
|
<workItem from="1555392270296" duration="6024000" />
|
|
|
<workItem from="1555399431899" duration="1945000" />
|
|
|
- <workItem from="1555423741374" duration="2810000" />
|
|
|
+ <workItem from="1555423741374" duration="3643000" />
|
|
|
</task>
|
|
|
<servers />
|
|
|
</component>
|
|
|
@@ -611,7 +636,7 @@
|
|
|
</history-entry>
|
|
|
</component>
|
|
|
<component name="TimeTrackingManager">
|
|
|
- <option name="totallyTimeSpent" value="60346000" />
|
|
|
+ <option name="totallyTimeSpent" value="61179000" />
|
|
|
</component>
|
|
|
<component name="TodoView">
|
|
|
<todo-panel id="selected-file">
|
|
|
@@ -643,7 +668,7 @@
|
|
|
<window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="TODO" order="7" weight="0.32876712" />
|
|
|
<window_info anchor="bottom" id="Spring" order="8" weight="0.32876712" />
|
|
|
- <window_info anchor="bottom" id="Terminal" order="9" weight="0.3369863" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="9" visible="true" weight="0.3369863" />
|
|
|
<window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
|
|
|
<window_info anchor="bottom" id="Event Log" order="11" sideWeight="0.50080776" side_tool="true" weight="0.32876712" />
|
|
|
<window_info anchor="bottom" id="Messages" order="12" weight="0.32876712" />
|
|
|
@@ -651,7 +676,7 @@
|
|
|
<window_info anchor="bottom" id="Database Changes" order="14" />
|
|
|
<window_info anchor="bottom" id="Version Control" order="15" show_stripe_button="false" sideWeight="0.49919224" weight="0.32876712" />
|
|
|
<window_info anchor="bottom" id="FindBugs-IDEA" order="16" />
|
|
|
- <window_info anchor="bottom" id="Database Console" order="17" visible="true" weight="0.32739726" />
|
|
|
+ <window_info anchor="bottom" id="Database Console" order="17" weight="0.32739726" />
|
|
|
<window_info anchor="bottom" id="Run with VisualVM" order="18" />
|
|
|
<window_info anchor="bottom" id="Debug with VisualVM" order="19" />
|
|
|
<window_info anchor="right" id="Commander" order="0" weight="0.4" />
|
|
|
@@ -789,26 +814,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="315">
|
|
|
- <caret line="21" column="52" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="52" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="240">
|
|
|
- <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="120">
|
|
|
@@ -954,16 +959,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="540">
|
|
|
- <caret line="36" column="87" selection-start-line="35" selection-start-column="12" selection-end-line="36" selection-end-column="87" />
|
|
|
- <folding>
|
|
|
- <element signature="imports" expanded="true" />
|
|
|
- </folding>
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="-6">
|
|
|
@@ -1001,13 +996,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule">
|
|
|
- <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
|
|
|
- <state>
|
|
|
- <filtering enabled="true" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="317">
|
|
|
@@ -1043,13 +1031,6 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
|
|
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="265">
|
|
|
- <caret line="64" column="36" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="36" />
|
|
|
- </state>
|
|
|
- </provider>
|
|
|
- </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/db.sql">
|
|
|
<provider selected="true" editor-type-id="text-editor" />
|
|
|
</entry>
|
|
|
@@ -1060,6 +1041,13 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="413">
|
|
|
+ <caret line="37" column="99" selection-start-line="37" selection-start-column="99" selection-end-line="37" selection-end-column="99" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
<state relative-caret-position="45">
|
|
|
@@ -1074,10 +1062,47 @@
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
- <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml">
|
|
|
+ <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule">
|
|
|
+ <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
|
|
|
+ <state>
|
|
|
+ <filtering enabled="true" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="265">
|
|
|
+ <caret line="64" column="36" selection-start-line="64" selection-start-column="36" selection-end-line="64" selection-end-column="36" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="339">
|
|
|
+ <caret line="24" column="42" lean-forward="true" selection-start-line="24" selection-start-column="42" selection-end-line="24" selection-end-column="42" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="248">
|
|
|
- <caret line="37" column="45" lean-forward="true" selection-start-line="37" selection-start-column="45" selection-end-line="37" selection-end-column="45" />
|
|
|
+ <state relative-caret-position="240">
|
|
|
+ <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="305">
|
|
|
+ <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
|
|
|
+ <folding>
|
|
|
+ <element signature="imports" expanded="true" />
|
|
|
+ </folding>
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|