jacksenma 7 лет назад
Родитель
Сommit
5699eaa4c6

+ 200 - 220
.idea/workspace.xml

@@ -2,23 +2,10 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
     <list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/VIPServiceImplTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/VIPServiceImplTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/bl/ScheduleService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/bl/ScheduleService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/controller/ScheduleController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/controller/ScheduleController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.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" />
+      <change beforePath="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java" afterDir="false" />
     </list>
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -64,36 +51,36 @@
     <session id="-1657780334">
     <session id="-1657780334">
       <usages-collector id="statistics.lifecycle.project">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
         <counts>
-          <entry key="project.closed" value="10" />
+          <entry key="project.closed" value="11" />
           <entry key="project.open.time.1" value="4" />
           <entry key="project.open.time.1" value="4" />
           <entry key="project.open.time.11" value="1" />
           <entry key="project.open.time.11" value="1" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.13" value="1" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.14" value="1" />
           <entry key="project.open.time.15" value="1" />
           <entry key="project.open.time.15" value="1" />
-          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.2" value="3" />
           <entry key="project.open.time.8" value="1" />
           <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="11" />
+          <entry key="project.opened" value="12" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
       <usages-collector id="statistics.file.extensions.open">
         <counts>
         <counts>
           <entry key="gitignore" value="1" />
           <entry key="gitignore" value="1" />
           <entry key="hall" value="2" />
           <entry key="hall" value="2" />
-          <entry key="java" value="213" />
+          <entry key="java" value="220" />
           <entry key="movie" value="9" />
           <entry key="movie" value="9" />
           <entry key="movie_like" value="1" />
           <entry key="movie_like" value="1" />
           <entry key="schedule" value="20" />
           <entry key="schedule" value="20" />
           <entry key="sql" value="14" />
           <entry key="sql" value="14" />
           <entry key="user" value="2" />
           <entry key="user" value="2" />
-          <entry key="view" value="1" />
+          <entry key="view" value="2" />
           <entry key="xml" value="28" />
           <entry key="xml" value="28" />
           <entry key="yml" value="5" />
           <entry key="yml" value="5" />
         </counts>
         </counts>
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
       <usages-collector id="statistics.file.types.open">
         <counts>
         <counts>
-          <entry key="Database Element" value="35" />
-          <entry key="JAVA" value="213" />
+          <entry key="Database Element" value="36" />
+          <entry key="JAVA" value="220" />
           <entry key="PLAIN_TEXT" value="1" />
           <entry key="PLAIN_TEXT" value="1" />
           <entry key="Scratch" value="14" />
           <entry key="Scratch" value="14" />
           <entry key="XML" value="28" />
           <entry key="XML" value="28" />
@@ -105,7 +92,7 @@
           <entry key="cell" value="116" />
           <entry key="cell" value="116" />
           <entry key="dummy" value="8" />
           <entry key="dummy" value="8" />
           <entry key="gitignore" value="6" />
           <entry key="gitignore" value="6" />
-          <entry key="java" value="6737" />
+          <entry key="java" value="7144" />
           <entry key="sql" value="931" />
           <entry key="sql" value="931" />
           <entry key="txt" value="12" />
           <entry key="txt" value="12" />
           <entry key="xml" value="1076" />
           <entry key="xml" value="1076" />
@@ -114,7 +101,7 @@
       </usages-collector>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
       <usages-collector id="statistics.file.types.edit">
         <counts>
         <counts>
-          <entry key="JAVA" value="6737" />
+          <entry key="JAVA" value="7144" />
           <entry key="PLAIN_TEXT" value="26" />
           <entry key="PLAIN_TEXT" value="26" />
           <entry key="SQL" value="61" />
           <entry key="SQL" value="61" />
           <entry key="Scratch" value="1047" />
           <entry key="Scratch" value="1047" />
@@ -126,38 +113,45 @@
   </component>
   </component>
   <component name="FileEditorManager">
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="84" column="41" lean-forward="true" selection-start-line="84" selection-start-column="41" selection-end-line="84" selection-end-column="41" />
+            <state relative-caret-position="402">
+              <caret line="51" column="61" selection-start-line="51" selection-start-column="61" selection-end-line="51" selection-end-column="61" />
               <folding>
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="imports" expanded="true" />
-                <element signature="method#searchScheduleSevenDays#0;class#ScheduleServiceImpl#0" />
-                <element signature="method#setScheduleView#0;class#ScheduleServiceImpl#0" />
-                <element signature="method#preCheck#0;class#ScheduleServiceImpl#0" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="324">
-              <caret line="83" column="8" selection-start-line="83" selection-start-column="8" selection-end-line="83" selection-end-column="8" />
+            <state relative-caret-position="165">
+              <caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
               <folding>
               <folding>
-                <element signature="imports" expanded="true" />
+                <element signature="e#254#255#0" expanded="true" />
+                <element signature="e#301#302#0" expanded="true" />
+                <element signature="e#339#340#0" expanded="true" />
+                <element signature="e#370#371#0" expanded="true" />
+                <element signature="e#397#398#0" expanded="true" />
+                <element signature="e#437#438#0" expanded="true" />
+                <element signature="e#469#470#0" expanded="true" />
+                <element signature="e#500#501#0" expanded="true" />
+                <element signature="e#527#528#0" expanded="true" />
+                <element signature="e#567#568#0" expanded="true" />
+                <element signature="e#599#600#0" expanded="true" />
               </folding>
               </folding>
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="143">
-              <caret line="45" column="5" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+            <state relative-caret-position="285">
+              <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -165,72 +159,26 @@
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-219">
+            <state relative-caret-position="15">
               <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
               <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
       <file pinned="false" current-in-tab="false">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="60">
-              <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql">
-          <provider selected="true" editor-type-id="text-editor">
+        <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/view">
+          <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
             <state>
             <state>
-              <caret column="127" selection-end-column="167" />
+              <filtering enabled="true" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
       </file>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="840">
-              <caret line="59" column="20" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
-              <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/FileController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="135">
-              <caret line="23" column="13" selection-start-line="23" selection-start-column="13" selection-end-line="23" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/AccountController.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-5">
-              <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java">
           <provider selected="true" editor-type-id="text-editor">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="336">
-              <caret line="44" column="35" selection-start-line="44" selection-start-column="35" selection-end-line="44" selection-end-column="35" />
-              <folding>
-                <element signature="imports" expanded="true" />
-                <element signature="e#1679#1680#0" expanded="true" />
-                <element signature="e#1751#1752#0" expanded="true" />
-                <element signature="e#1977#1978#0" expanded="true" />
-                <element signature="e#2035#2036#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="182">
+              <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
             </state>
             </state>
           </provider>
           </provider>
         </entry>
         </entry>
@@ -244,8 +192,8 @@
         <option value="CSS File" />
         <option value="CSS File" />
         <option value="JavaScript File" />
         <option value="JavaScript File" />
         <option value="Interface" />
         <option value="Interface" />
-        <option value="Class" />
         <option value="JUnit4 Test Class" />
         <option value="JUnit4 Test Class" />
+        <option value="Class" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -261,7 +209,6 @@
   <component name="IdeDocumentHistory">
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
     <option name="CHANGED_PATHS">
       <list>
       <list>
-        <option value="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" />
         <option value="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java" />
@@ -305,13 +252,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java" />
-        <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" />
         <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/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" />
       </list>
       </list>
     </option>
     </option>
   </component>
   </component>
@@ -342,6 +290,17 @@
       <foldersAlwaysOnTop value="true" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     </navigator>
     <panes>
     <panes>
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="cinema" type="58d84e3e:PackageViewProjectNode" />
+              <item name="cinema" type="616d4139:PackageViewModuleNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
       <pane id="ProjectPane">
       <pane id="ProjectPane">
         <subPane>
         <subPane>
           <expand>
           <expand>
@@ -349,6 +308,11 @@
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
+            <path>
+              <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
@@ -403,7 +367,18 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
-              <item name="controller" type="462c0819:PsiDirectoryNode" />
+              <item name="po" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="example" type="462c0819:PsiDirectoryNode" />
+              <item name="cinema" type="462c0819:PsiDirectoryNode" />
+              <item name="vo" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
             <path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
@@ -456,22 +431,22 @@
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
               <item name="bl" type="462c0819:PsiDirectoryNode" />
               <item name="bl" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
-          </expand>
-          <select />
-        </subPane>
-      </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane">
-        <subPane>
-          <expand>
             <path>
             <path>
-              <item name="cinema" type="58d84e3e:PackageViewProjectNode" />
-              <item name="cinema" type="616d4139:PackageViewModuleNode" />
+              <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="example" type="462c0819:PsiDirectoryNode" />
+              <item name="cinema" type="462c0819:PsiDirectoryNode" />
+              <item name="blImpl" type="462c0819:PsiDirectoryNode" />
             </path>
             </path>
           </expand>
           </expand>
           <select />
           <select />
         </subPane>
         </subPane>
       </pane>
       </pane>
+      <pane id="Scope" />
     </panes>
     </panes>
   </component>
   </component>
   <component name="PropertiesComponent">
   <component name="PropertiesComponent">
@@ -484,7 +459,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555399190003" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555401458703" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrary" value="JUnit4" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
     <property name="com.intellij.testIntegration.createTest.CreateTestDialog.defaultLibrarySuperClass.JUnit4" value="" />
     <property name="database.console.LAST_STATE" value="false" />
     <property name="database.console.LAST_STATE" value="false" />
@@ -641,43 +616,44 @@
       <workItem from="1555307878450" duration="39000" />
       <workItem from="1555307878450" duration="39000" />
       <workItem from="1555308079660" duration="812000" />
       <workItem from="1555308079660" duration="812000" />
       <workItem from="1555392270296" duration="6024000" />
       <workItem from="1555392270296" duration="6024000" />
+      <workItem from="1555399431899" duration="1945000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TestHistory">
   <component name="TestHistory">
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 56m 56s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 10m 18s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 59m 20s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 11m 51s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 59m 56s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 13m 26s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 17h 02m 13s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 23m 09s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 17h 03m 14s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 24m 21s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 17h 08m 37s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 27m 39s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 09m 20s.xml">
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 28m 44s.xml">
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 10m 18s.xml">
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 29m 12s.xml">
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 11m 51s.xml">
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 47m 40s.xml">
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
-    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 13m 26s.xml">
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 57m 22s.xml">
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
     </history-entry>
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="52491000" />
+    <option name="totallyTimeSpent" value="54607000" />
   </component>
   </component>
   <component name="TodoView">
   <component name="TodoView">
     <todo-panel id="selected-file">
     <todo-panel id="selected-file">
@@ -708,7 +684,7 @@
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Cvs" order="5" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="6" weight="0.4" />
       <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="TODO" order="7" weight="0.32876712" />
-      <window_info anchor="bottom" id="Spring" order="8" />
+      <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" weight="0.3369863" />
       <window_info anchor="bottom" id="Docker" order="10" show_stripe_button="false" />
       <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="Event Log" order="11" sideWeight="0.50080776" side_tool="true" weight="0.32876712" />
@@ -767,10 +743,6 @@
     <option name="myLimit" value="2678400000" />
     <option name="myLimit" value="2678400000" />
   </component>
   </component>
   <component name="editorHistoryManager">
   <component name="editorHistoryManager">
-    <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/user" />
-    <entry file="file://$PROJECT_DIR$/.gitignore">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
     <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor" />
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
     </entry>
@@ -862,13 +834,7 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/form/VIPCardForm.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="9" column="7" selection-start-line="9" selection-start-column="7" selection-end-line="9" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/form/VIPCardForm.java" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/AccountServiceImpl.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/AccountServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="135">
         <state relative-caret-position="135">
@@ -925,16 +891,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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="324">
-          <caret line="24" column="50" lean-forward="true" selection-start-line="24" selection-start-column="50" selection-end-line="24" selection-end-column="50" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="120">
         <state relative-caret-position="120">
@@ -949,44 +905,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="375">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
-          <folding>
-            <element signature="e#228#229#0" expanded="true" />
-            <element signature="e#258#259#0" expanded="true" />
-            <element signature="e#305#306#0" expanded="true" />
-            <element signature="e#343#344#0" expanded="true" />
-            <element signature="e#375#376#0" expanded="true" />
-            <element signature="e#402#403#0" expanded="true" />
-            <element signature="e#443#444#0" expanded="true" />
-            <element signature="e#475#476#0" expanded="true" />
-            <element signature="e#506#507#0" expanded="true" />
-            <element signature="e#533#534#0" expanded="true" />
-            <element signature="e#573#574#0" expanded="true" />
-            <element signature="e#605#606#0" 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="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" />
-          <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">
-          <caret line="16" selection-start-line="16" selection-end-line="17" selection-end-column="15" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/StatisticsMapper.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="195">
         <state relative-caret-position="195">
@@ -997,13 +915,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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="45">
-          <caret line="3" selection-start-line="3" selection-end-line="3" />
-        </state>
-      </provider>
-    </entry>
     <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule">
     <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule">
       <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
       <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
         <state>
         <state>
@@ -1018,13 +929,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="240">
-          <caret line="27" column="82" selection-start-line="27" selection-start-column="82" selection-end-line="27" selection-end-column="82" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="143">
         <state relative-caret-position="143">
@@ -1032,13 +936,6 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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="-219">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="60">
         <state relative-caret-position="60">
@@ -1060,16 +957,12 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="44" column="35" selection-start-line="44" selection-start-column="35" selection-end-line="44" selection-end-column="35" />
+        <state relative-caret-position="1245">
+          <caret line="83" column="8" selection-start-line="83" selection-start-column="8" selection-end-line="83" selection-end-column="8" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
-            <element signature="e#1679#1680#0" expanded="true" />
-            <element signature="e#1751#1752#0" expanded="true" />
-            <element signature="e#1977#1978#0" expanded="true" />
-            <element signature="e#2035#2036#0" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
@@ -1083,7 +976,7 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="840">
+        <state relative-caret-position="885">
           <caret line="59" column="20" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
           <caret line="59" column="20" selection-start-line="59" selection-start-column="20" selection-end-line="59" selection-end-column="20" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
@@ -1091,20 +984,49 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="324">
-          <caret line="83" column="8" selection-start-line="83" selection-start-column="8" selection-end-line="83" selection-end-column="8" />
+        <state relative-caret-position="630">
+          <caret line="42" column="48" selection-start-line="42" selection-start-column="48" selection-end-line="42" selection-end-column="48" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#1679#1680#0" expanded="true" />
+            <element signature="e#1735#1736#0" expanded="true" />
+          </folding>
+        </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="360">
+          <caret line="24" column="40" selection-start-line="24" selection-start-column="40" selection-end-line="24" selection-end-column="40" />
+          <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>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
           </folding>
           </folding>
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </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">
+          <caret line="16" selection-start-line="16" selection-end-line="17" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java">
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="84" column="41" lean-forward="true" selection-start-line="84" selection-start-column="41" selection-end-line="84" selection-end-column="41" />
+        <state relative-caret-position="305">
+          <caret line="239" column="81" lean-forward="true" selection-start-line="238" selection-start-column="8" selection-end-line="239" selection-end-column="81" />
           <folding>
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="imports" expanded="true" />
             <element signature="method#searchScheduleSevenDays#0;class#ScheduleServiceImpl#0" />
             <element signature="method#searchScheduleSevenDays#0;class#ScheduleServiceImpl#0" />
@@ -1114,6 +1036,64 @@
         </state>
         </state>
       </provider>
       </provider>
     </entry>
     </entry>
+    <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/view">
+      <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="15">
+          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="165">
+          <caret line="11" column="33" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" />
+          <folding>
+            <element signature="e#254#255#0" expanded="true" />
+            <element signature="e#301#302#0" expanded="true" />
+            <element signature="e#339#340#0" expanded="true" />
+            <element signature="e#370#371#0" expanded="true" />
+            <element signature="e#397#398#0" expanded="true" />
+            <element signature="e#437#438#0" expanded="true" />
+            <element signature="e#469#470#0" expanded="true" />
+            <element signature="e#500#501#0" expanded="true" />
+            <element signature="e#527#528#0" expanded="true" />
+            <element signature="e#567#568#0" expanded="true" />
+            <element signature="e#599#600#0" 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="402">
+          <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>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="182">
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
+        </state>
+      </provider>
+    </entry>
   </component>
   </component>
   <component name="masterDetails">
   <component name="masterDetails">
     <states>
     <states>

+ 22 - 5
src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java

@@ -4,14 +4,19 @@ import com.example.cinema.bl.StatisticsService;
 import com.example.cinema.data.StatisticsMapper;
 import com.example.cinema.data.StatisticsMapper;
 import com.example.cinema.po.MovieScheduleTime;
 import com.example.cinema.po.MovieScheduleTime;
 import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.ResponseVO;
+import com.example.cinema.vo.ScheduleRateVO;
+import org.omg.PortableInterceptor.SYSTEM_EXCEPTION;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Date;
 import java.util.List;
 import java.util.List;
+import java.util.stream.Collectors;
 
 
 /**
 /**
  * @author fjj
  * @author fjj
@@ -26,13 +31,25 @@ public class StatisticsServiceImpl implements StatisticsService {
         try{
         try{
             Date requireDate = date;
             Date requireDate = date;
             if(requireDate == null){
             if(requireDate == null){
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                requireDate = simpleDateFormat.parse(simpleDateFormat.format(new Date()));
+                requireDate = new Date();
             }
             }
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+            requireDate = simpleDateFormat.parse(simpleDateFormat.format(requireDate));
+
             Date nextDate = getNumDayAfterDate(requireDate, 1);
             Date nextDate = getNumDayAfterDate(requireDate, 1);
-            List<MovieScheduleTime> movieScheduleTime = statisticsMapper.selectMovieScheduleTimes(date, nextDate);
-            System.out.println(movieScheduleTime.size());
-            return ResponseVO.buildSuccess();
+            List<MovieScheduleTime> movieScheduleTimes = statisticsMapper.selectMovieScheduleTimes(requireDate, nextDate);
+
+            //统计该天总排片数
+            int totalTimes = movieScheduleTimes.stream().mapToInt(mst -> mst.getTime()).sum();
+            List<ScheduleRateVO> scheduleRateVOList = new ArrayList<>();
+            for(MovieScheduleTime movieScheduleTime: movieScheduleTimes){
+                ScheduleRateVO scheduleRateVO = new ScheduleRateVO();
+                scheduleRateVO.setMovieId(movieScheduleTime.getMovieId());
+                scheduleRateVO.setRate(Double.parseDouble(String.format("%.2f",(double)movieScheduleTime.getTime() / totalTimes)));
+                scheduleRateVO.setName(movieScheduleTime.getName());
+                scheduleRateVOList.add(scheduleRateVO);
+            }
+            return ResponseVO.buildSuccess(scheduleRateVOList);
 
 
         }catch (Exception e){
         }catch (Exception e){
             e.printStackTrace();
             e.printStackTrace();

+ 35 - 0
src/main/java/com/example/cinema/vo/ScheduleRateVO.java

@@ -0,0 +1,35 @@
+package com.example.cinema.vo;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 3:48 PM
+ */
+public class ScheduleRateVO {
+    private Integer movieId;
+    private Double rate;
+    private String name;
+
+    public Integer getMovieId() {
+        return movieId;
+    }
+
+    public void setMovieId(Integer movieId) {
+        this.movieId = movieId;
+    }
+
+    public Double getRate() {
+        return rate;
+    }
+
+    public void setRate(Double rate) {
+        this.rate = rate;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

+ 5 - 5
src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java

@@ -22,11 +22,11 @@ import static org.junit.Assert.*;
 public class StatisticsServiceImplTest {
 public class StatisticsServiceImplTest {
     @Autowired
     @Autowired
     private StatisticsService statisticsService;
     private StatisticsService statisticsService;
-    @Test
-    public void getScheduleRateByDate() throws ParseException {
-        System.out.println(getNumDayBeforeDate(new Date(),-5));
-        statisticsService.getScheduleRateByDate(getNumDayBeforeDate(new Date(),-5));
-    }
+//    @Test
+//    public void getScheduleRateByDate() throws ParseException {
+//        System.out.println(getNumDayBeforeDate(new Date(),-5));
+//        statisticsService.getScheduleRateByDate(getNumDayBeforeDate(new Date(),-5));
+//    }
 
 
     /**
     /**
      * 获得num天后的日期
      * 获得num天后的日期