排片删改

.idea/workspace.xml

@@ -2,13 +2,32 @@
 <project version="4">
   <component name="ChangeListManager">
     <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 beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+<<<<<<< HEAD
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/request.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/request.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" 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$/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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -34,6 +53,7 @@
     <expand />
     <select />
   </component>
+<<<<<<< HEAD
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
@@ -41,22 +61,111 @@
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="391">
               <caret line="23" selection-start-line="23" selection-end-line="23" />
+=======
+  <component name="FUSProjectUsageTrigger">
+    <session id="-1657780334">
+      <usages-collector id="statistics.lifecycle.project">
+        <counts>
+          <entry key="project.closed" value="10" />
+          <entry key="project.open.time.1" value="4" />
+          <entry key="project.open.time.11" value="1" />
+          <entry key="project.open.time.13" value="1" />
+          <entry key="project.open.time.14" value="1" />
+          <entry key="project.open.time.15" value="1" />
+          <entry key="project.open.time.2" value="2" />
+          <entry key="project.open.time.8" value="1" />
+          <entry key="project.opened" value="11" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.open">
+        <counts>
+          <entry key="gitignore" value="1" />
+          <entry key="hall" value="2" />
+          <entry key="java" value="213" />
+          <entry key="movie" value="9" />
+          <entry key="movie_like" value="1" />
+          <entry key="schedule" value="20" />
+          <entry key="sql" value="14" />
+          <entry key="user" value="2" />
+          <entry key="view" value="1" />
+          <entry key="xml" value="28" />
+          <entry key="yml" value="5" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.open">
+        <counts>
+          <entry key="Database Element" value="35" />
+          <entry key="JAVA" value="213" />
+          <entry key="PLAIN_TEXT" value="1" />
+          <entry key="Scratch" value="14" />
+          <entry key="XML" value="28" />
+          <entry key="YAML" value="5" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.extensions.edit">
+        <counts>
+          <entry key="cell" value="116" />
+          <entry key="dummy" value="8" />
+          <entry key="gitignore" value="6" />
+          <entry key="java" value="6737" />
+          <entry key="sql" value="931" />
+          <entry key="txt" value="12" />
+          <entry key="xml" value="1076" />
+          <entry key="yml" value="34" />
+        </counts>
+      </usages-collector>
+      <usages-collector id="statistics.file.types.edit">
+        <counts>
+          <entry key="JAVA" value="6737" />
+          <entry key="PLAIN_TEXT" value="26" />
+          <entry key="SQL" value="61" />
+          <entry key="Scratch" value="1047" />
+          <entry key="XML" value="1015" />
+          <entry key="YAML" value="34" />
+        </counts>
+      </usages-collector>
+    </session>
+  </component>
+  <component name="FileEditorManager">
+    <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">
+          <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" />
+              <folding>
+                <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>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="510">
               <caret line="191" column="10" lean-forward="true" selection-start-line="177" selection-start-column="7" selection-end-line="191" selection-end-column="10" />
               <folding>
                 <element signature="n#style#0;n#li#0;n#!!top" expanded="true" />
+=======
+        <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="324">
+              <caret line="83" column="8" selection-start-line="83" selection-start-column="8" selection-end-line="83" selection-end-column="8" />
+              <folding>
+                <element signature="imports" expanded="true" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
               </folding>
             </state>
           </provider>
         </entry>
       </file>
+<<<<<<< HEAD
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html">
           <provider selected="true" editor-type-id="text-editor">
@@ -67,29 +176,72 @@
                 <element signature="n#style#0;n#input#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
               </folding>
+=======
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
+          <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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="440">
               <caret line="67" column="40" selection-start-line="67" selection-start-column="40" selection-end-line="67" selection-end-column="40" />
+=======
+        <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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="489">
               <caret line="166" column="66" selection-start-line="166" selection-start-column="66" selection-end-line="166" selection-end-column="88" />
+=======
+        <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">
+            <state>
+              <caret column="127" selection-end-column="167" />
+            </state>
+          </provider>
+        </entry>
+      </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>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="493">
@@ -97,11 +249,18 @@
               <folding>
                 <element signature="imports" expanded="true" />
               </folding>
+=======
+        <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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleViewForm.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="119">
@@ -110,15 +269,35 @@
                 <element signature="e#169#170#0" expanded="true" />
                 <element signature="e#195#196#0" expanded="true" />
               </folding>
+=======
+        <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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
+<<<<<<< HEAD
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="204">
               <caret line="12" column="40" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="40" />
+=======
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+          <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>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
@@ -132,8 +311,8 @@
         <option value="CSS File" />
         <option value="JavaScript File" />
         <option value="Interface" />
-        <option value="JUnit4 Test Class" />
         <option value="Class" />
+        <option value="JUnit4 Test Class" />
       </list>
     </option>
   </component>
@@ -149,6 +328,7 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java" />
         <option value="$PROJECT_DIR$/src/main/resources/static/js/index.js" />
         <option value="$PROJECT_DIR$/src/main/resources/static/css/common.css" />
@@ -156,6 +336,8 @@
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminMovieDetail.html" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" />
+=======
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminSessionManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java" />
@@ -188,6 +370,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java" />
+<<<<<<< HEAD
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" />
@@ -200,6 +383,26 @@
         <option value="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" />
+=======
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/impl/ScheduleServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/blImpl/VIPServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/VIPServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/VIPServiceImplTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" />
+        <option value="$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql" />
+        <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/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.xml" />
+        <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/blImpl/ScheduleServiceImpl.java" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
       </list>
     </option>
   </component>
@@ -209,9 +412,24 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
+<<<<<<< HEAD
   <component name="ProjectFrameBounds" fullScreen="true">
     <option name="width" value="1680" />
     <option name="height" value="1050" />
+=======
+  <component name="JsGulpfileManager">
+    <detection-done>true</detection-done>
+    <sorting>DEFINITION_ORDER</sorting>
+  </component>
+  <component name="ProjectFrameBounds" fullScreen="true">
+    <option name="x" value="46" />
+    <option name="y" value="23" />
+    <option name="width" value="1234" />
+    <option name="height" value="777" />
+  </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true">
+    <ConfirmationsSetting value="2" id="Add" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -220,6 +438,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+<<<<<<< HEAD
       <pane id="Scope" />
       <pane id="PackagesPane">
         <subPane>
@@ -271,6 +490,8 @@
           <select />
         </subPane>
       </pane>
+=======
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -316,13 +537,87 @@
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
+<<<<<<< HEAD
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="templates" 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="controller" 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="test" 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="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" 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="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" 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="test" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="com" type="462c0819:PsiDirectoryNode" />
+              <item name="example" 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="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" />
+            </path>
+            <path>
+              <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="bl" type="462c0819:PsiDirectoryNode" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </path>
           </expand>
           <select />
         </subPane>
       </pane>
+<<<<<<< HEAD
+=======
+      <pane id="Scope" />
+      <pane id="PackagesPane">
+        <subPane>
+          <expand>
+            <path>
+              <item name="cinema" type="58d84e3e:PackageViewProjectNode" />
+              <item name="cinema" type="616d4139:PackageViewModuleNode" />
+            </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -335,7 +630,11 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
+<<<<<<< HEAD
     <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555399275072" />
+=======
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555399190003" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
     <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" />
@@ -350,9 +649,11 @@
   </component>
   <component name="RecentsManager">
     <key name="CreateTestDialog.RecentsKey">
+      <recent name="com.example.cinema.blImpl" />
       <recent name="com.example.cinema.bl" />
     </key>
     <key name="MoveClassesOrPackagesDialog.RECENTS_KEY">
+      <recent name="com.example.cinema" />
       <recent name="com.example.cinema.po" />
       <recent name="com.example.cinema.vo" />
     </key>
@@ -392,7 +693,6 @@
       </extension>
       <option name="PACKAGE_NAME" value="com.example.cinema.bl" />
       <option name="MAIN_CLASS_NAME" value="com.example.cinema.bl.ScheduleServiceImplTest" />
-      <option name="TEST_OBJECT" value="class" />
       <method v="2">
         <option name="Make" enabled="true" />
       </method>
@@ -429,6 +729,22 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
+      <module name="CinemaDemo" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.example.cinema.blImpl.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <option name="PACKAGE_NAME" value="com.example.cinema.blImpl" />
+      <option name="MAIN_CLASS_NAME" value="com.example.cinema.blImpl.StatisticsServiceImplTest" />
+      <option name="METHOD_NAME" value="getScheduleRateByDate" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="CinemaApplication (1)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
       <module name="CinemaDemo" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.example.cinema.CinemaApplication" />
@@ -445,14 +761,16 @@
       </method>
     </configuration>
     <list>
+      <item itemvalue="Spring Boot.CinemaApplication" />
+      <item itemvalue="Spring Boot.CinemaApplication (1)" />
       <item itemvalue="JUnit.ScheduleServiceImplTest.searchScheduleSevenDays" />
       <item itemvalue="JUnit.ScheduleServiceImplTest" />
       <item itemvalue="JUnit.ScheduleServiceImplTest.deleteBatchOfSchedule" />
-      <item itemvalue="Spring Boot.CinemaApplication" />
-      <item itemvalue="Spring Boot.CinemaApplication (1)" />
+      <item itemvalue="JUnit.StatisticsServiceImplTest.getScheduleRateByDate" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.StatisticsServiceImplTest.getScheduleRateByDate" />
         <item itemvalue="JUnit.ScheduleServiceImplTest.deleteBatchOfSchedule" />
         <item itemvalue="JUnit.ScheduleServiceImplTest.searchScheduleSevenDays" />
         <item itemvalue="JUnit.ScheduleServiceImplTest" />
@@ -480,23 +798,16 @@
       <workItem from="1555219773177" duration="330000" />
       <workItem from="1555220261237" duration="2930000" />
       <workItem from="1555307878450" duration="39000" />
+<<<<<<< HEAD
       <workItem from="1555392612547" duration="6054000" />
+=======
+      <workItem from="1555308079660" duration="812000" />
+      <workItem from="1555392270296" duration="6024000" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 26m 52s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 33m 15s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 49m 52s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
-    </history-entry>
-    <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 55m 54s.xml">
-      <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
-    </history-entry>
     <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 16h 56m 56s.xml">
       <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
     </history-entry>
@@ -515,9 +826,25 @@
     <history-entry file="ScheduleServiceImplTest_deleteBatchOfSchedule - 2019.04.13 at 17h 08m 37s.xml">
       <configuration name="ScheduleServiceImplTest.deleteBatchOfSchedule" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 09m 20s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 10m 18s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 11m 51s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 13m 26s.xml">
+      <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< HEAD
     <option name="totallyTimeSpent" value="51883000" />
+=======
+    <option name="totallyTimeSpent" value="52491000" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -529,10 +856,17 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
+<<<<<<< HEAD
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25274727" />
+=======
+    <frame x="0" y="0" width="1280" height="800" extended-state="0" />
+    <editor active="true" />
+    <layout>
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.2092084" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="Image Layers" order="3" />
@@ -544,13 +878,21 @@
       <window_info anchor="bottom" id="Problems" order="0" />
       <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="bottom" id="Find" order="2" weight="0.32876712" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Run" order="3" weight="0.30816326" />
+=======
+      <window_info anchor="bottom" id="Run" order="3" visible="true" weight="0.30547947" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
       <window_info anchor="bottom" id="Debug" order="4" weight="0.4" />
       <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="TODO" order="7" weight="0.32876712" />
       <window_info anchor="bottom" id="Spring" order="8" />
+<<<<<<< HEAD
       <window_info anchor="bottom" id="Terminal" order="9" weight="0.35816327" />
+=======
+      <window_info anchor="bottom" id="Terminal" order="9" weight="0.3369863" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
       <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" />
@@ -567,7 +909,11 @@
       <window_info anchor="right" id="Maven" order="3" />
       <window_info anchor="right" id="Palette" order="4" />
       <window_info anchor="right" id="Capture Analysis" order="5" />
+<<<<<<< HEAD
       <window_info anchor="right" id="Database" order="6" weight="0.22527473" />
+=======
+      <window_info anchor="right" id="Database" order="6" visible="true" weight="0.21728595" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
       <window_info anchor="right" id="Palette&#9;" order="7" />
       <window_info anchor="right" id="Theme Preview" order="8" />
       <window_info anchor="right" id="Bean Validation" order="9" />
@@ -619,6 +965,7 @@
     </option>
   </component>
   <component name="editorHistoryManager">
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/.idea/dataSources.local.xml" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieVO.java">
       <provider selected="true" editor-type-id="text-editor">
@@ -627,6 +974,8 @@
         </state>
       </provider>
     </entry>
+=======
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
     <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" />
@@ -667,10 +1016,17 @@
       </provider>
     </entry>
     <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/movie" />
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ViewController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="435">
           <caret line="45" column="5" selection-start-line="45" selection-start-column="5" selection-end-line="45" selection-end-column="5" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleViewForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="135">
+          <caret line="9" column="29" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
         </state>
       </provider>
     </entry>
@@ -678,93 +1034,190 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="240">
           <caret line="20" selection-start-line="20" selection-end-line="20" />
-          <folding>
-            <element signature="imports" expanded="true" />
-            <element signature="e#406#407#0" expanded="true" />
-            <element signature="e#445#446#0" expanded="true" />
-            <element signature="e#521#522#0" expanded="true" />
-            <element signature="e#577#578#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/56491842-8c26-426b-a604-02dce7d52d03/console.sql" />
     <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/view" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
+=======
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/56491842-8c26-426b-a604-02dce7d52d03/console.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-225">
-          <caret line="8" column="7" selection-start-line="8" selection-start-column="7" selection-end-line="8" selection-end-column="7" />
+        <state relative-caret-position="135">
+          <caret line="9" selection-start-line="9" selection-end-line="12" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java">
+    <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/view" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/User.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="60">
+        <state relative-caret-position="90">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java" />
+    <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/schedule" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/CinemaApplication.java">
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" selection-start-line="13" selection-end-line="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/VIPCardController.java">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ResponseVO.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="36" column="29" selection-start-line="36" selection-start-column="29" selection-end-line="36" selection-end-column="29" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="810">
+          <caret line="74" column="28" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
+        </state>
+      </provider>
+    </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/controller/FileController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/AccountServiceImpl.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" />
+          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/AccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/HallServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="21">
-          <caret line="19" column="13" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="13" />
+        <state relative-caret-position="135">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/User.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="90">
-          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
+        <state relative-caret-position="135">
+          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/VIPCardForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="52">
+          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/VIPServiceImplTest.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="285">
+          <caret line="25" column="5" lean-forward="true" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/VIPServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="120">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
+        <state relative-caret-position="-51">
           <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java" />
     <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/schedule" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/VIPCardController.java">
       <provider selected="true" editor-type-id="text-editor" />
+=======
+    <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/movie">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java">
+    <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="420">
-          <caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
+        <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/ResponseVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="540">
-          <caret line="36" column="29" selection-start-line="36" selection-start-column="29" selection-end-line="36" selection-end-column="29" />
+        <state relative-caret-position="120">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        </state>
+      </provider>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret selection-end-line="2" selection-end-column="59" />
+        </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="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>
+<<<<<<< HEAD
     <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/data/ScheduleMapper.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="110">
           <caret line="36" column="28" selection-start-line="36" selection-start-column="28" selection-end-line="36" selection-end-column="28" />
+=======
+    <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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <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="345">
@@ -776,12 +1229,26 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="735">
           <caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
+=======
+    <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">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="195">
+          <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
+<<<<<<< HEAD
     <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql" />
     <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule" />
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/impl/AccountServiceImpl.java" />
@@ -833,11 +1300,32 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="391">
           <caret line="23" column="22" selection-start-line="23" selection-start-column="9" selection-end-line="23" selection-end-column="22" />
+=======
+    <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="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java">
+    <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/data/StatisticsMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="105">
+          <caret line="7" column="13" lean-forward="true" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
+        </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">
+<<<<<<< HEAD
         <state relative-caret-position="204">
           <caret line="12" column="40" selection-start-line="12" selection-start-column="26" selection-end-line="12" selection-end-column="40" />
         </state>
@@ -891,14 +1379,100 @@
           <caret line="191" column="10" lean-forward="true" selection-start-line="177" selection-start-column="7" selection-end-line="191" selection-end-column="10" />
           <folding>
             <element signature="n#style#0;n#li#0;n#!!top" expanded="true" />
+=======
+        <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">
+      <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>
+      </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="-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">
+      <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>
+    <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>
+    <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>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+      <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>
+      </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>
+          <caret column="127" selection-end-column="167" />
+        </state>
+      </provider>
+    </entry>
+    <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>
+    <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="324">
+          <caret line="83" column="8" selection-start-line="83" selection-start-column="8" selection-end-line="83" selection-end-column="8" />
+          <folding>
+            <element signature="imports" expanded="true" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
+          </folding>
+        </state>
+      </provider>
+    </entry>
+<<<<<<< HEAD
     <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="522">
           <caret line="43" column="58" selection-start-line="43" selection-start-column="58" selection-end-line="43" selection-end-column="58" />
+=======
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java">
+      <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" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
           <folding>
             <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#input#0;n#div#0;n#div#0;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />

src/main/java/com/example/cinema/bl/ScheduleService.java

@@ -48,4 +48,17 @@ public interface ScheduleService {
      * @return
      */
     ResponseVO updateSchedule(ScheduleForm scheduleForm);
+
+    /**
+     * 根据id获取schedule
+     * @param id
+     * @return
+     */
+    ResponseVO getScheduleById(int id);
+
+    /**
+     * 查询排片对观众的可见的天数
+     * @return
+     */
+    ResponseVO getScheduleView();
 }

src/main/java/com/example/cinema/bl/StatisticsService.java

@@ -0,0 +1,18 @@
+package com.example.cinema.bl;
+
+import com.example.cinema.vo.ResponseVO;
+
+import java.util.Date;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 1:34 PM
+ */
+public interface StatisticsService {
+    /**
+     * 获取某日各影片排片率统计数据
+     * @param date
+     * @return
+     */
+    ResponseVO getScheduleRateByDate(Date date);
+}

src/main/java/com/example/cinema/blImpl/ScheduleServiceImpl.java

@@ -71,6 +71,26 @@ public class ScheduleServiceImpl implements ScheduleService {
         }
     }
 
+    @Override
+    public ResponseVO getScheduleById(int id) {
+        try {
+            return ResponseVO.buildSuccess(scheduleMapper.selectScheduleById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseVO.buildFailure("失败");
+        }
+    }
+
+    @Override
+    public ResponseVO getScheduleView() {
+        try {
+            return ResponseVO.buildSuccess(scheduleMapper.selectView());
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseVO.buildFailure("失败");
+        }
+    }
+
     @Override
     public ResponseVO searchScheduleSevenDays(int hallId, Date startDate) {
         try {

src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java

@@ -0,0 +1,59 @@
+package com.example.cinema.blImpl;
+
+import com.example.cinema.bl.StatisticsService;
+import com.example.cinema.data.StatisticsMapper;
+import com.example.cinema.po.MovieScheduleTime;
+import com.example.cinema.vo.ResponseVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 1:34 PM
+ */
+@Service
+public class StatisticsServiceImpl implements StatisticsService {
+    @Autowired
+    private StatisticsMapper statisticsMapper;
+    @Override
+    public ResponseVO getScheduleRateByDate(Date date) {
+        try{
+            Date requireDate = date;
+            if(requireDate == null){
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+                requireDate = simpleDateFormat.parse(simpleDateFormat.format(new Date()));
+            }
+            Date nextDate = getNumDayAfterDate(requireDate, 1);
+            List<MovieScheduleTime> movieScheduleTime = statisticsMapper.selectMovieScheduleTimes(date, nextDate);
+            System.out.println(movieScheduleTime.size());
+            return ResponseVO.buildSuccess();
+
+        }catch (Exception e){
+            e.printStackTrace();
+            return ResponseVO.buildFailure("失败");
+        }
+
+
+    }
+
+
+    /**
+     * 获得num天后的日期
+     * @param oldDate
+     * @param num
+     * @return
+     * @throws ParseException
+     */
+    Date getNumDayAfterDate(Date oldDate, int num) throws ParseException {
+        Calendar calendarTime = Calendar.getInstance();
+        calendarTime.setTime(oldDate);
+        calendarTime.add(Calendar.DAY_OF_YEAR, num);
+        return calendarTime.getTime();
+    }
+}

src/main/java/com/example/cinema/controller/ScheduleController.java

@@ -40,11 +40,23 @@ public class ScheduleController {
         return scheduleService.setScheduleView(scheduleViewForm);
     }
 
+    @RequestMapping(value = "/schedule/view", method = RequestMethod.GET)
+    public ResponseVO setScheduleView(){
+        return scheduleService.getScheduleView();
+    }
+
+
+
     @RequestMapping(value = "/schedule/delete/batch", method = RequestMethod.DELETE)
     public ResponseVO deleteBatchOfSchedule(@RequestBody ScheduleBatchDeleteForm scheduleBatchDeleteForm){
         return scheduleService.deleteBatchOfSchedule(scheduleBatchDeleteForm);
     }
 
+    @RequestMapping(value = "/schedule/{id}", method = RequestMethod.GET)
+    public ResponseVO getScheduleById(@PathVariable int id){
+        return scheduleService.getScheduleById(id);
+    }
+
 
 
 }

src/main/java/com/example/cinema/controller/StatisticsController.java

@@ -0,0 +1,27 @@
+package com.example.cinema.controller;
+
+import com.example.cinema.bl.StatisticsService;
+import com.example.cinema.vo.ResponseVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 1:34 PM
+ */
+@RestController
+public class StatisticsController {
+    @Autowired
+    private StatisticsService statisticsService;
+
+    @RequestMapping(value = "statistics/scheduleRate", method = RequestMethod.GET)
+    public ResponseVO getScheduleRateByDate(@RequestParam(required = false) Date date){
+        //此处date为非必填参数，若不填则默认为当天
+        return statisticsService.getScheduleRateByDate(date);
+    }
+}

src/main/java/com/example/cinema/data/ScheduleMapper.java

@@ -1,6 +1,7 @@
 package com.example.cinema.data;
 
 
+import com.example.cinema.vo.ResponseVO;
 import com.example.cinema.vo.ScheduleForm;
 import com.example.cinema.vo.ScheduleItem;
 import com.example.cinema.vo.ScheduleViewForm;
@@ -88,4 +89,12 @@ public interface ScheduleMapper {
      * @return
      */
     int updateScheduleById(ScheduleForm scheduleForm);
+
+
+    /**
+     * 根据id查找排片信息
+     * @param id
+     * @return
+     */
+    ScheduleItem selectScheduleById(int id);
 }

src/main/java/com/example/cinema/data/ScheduleMapper.xml

@@ -64,6 +64,14 @@
 
     </update>
 
+    <select id="selectScheduleById" resultMap="ScheduleItem">
+        select * from
+          (select * from schedule where id = #{id}) s,
+          (select name as movie_name, id as movie_id from movie) m,
+          (select name as hall_name, id as hall_id from hall) h
+            where s.movie_id = m.movie_id and s.hall_id = h.hall_id
+    </select>
+
     <resultMap id="ScheduleItem" type="com.example.cinema.vo.ScheduleItem">
         <id column="id" property="id"></id>
         <result column="hall_id" property="hallId"></result>

src/main/java/com/example/cinema/data/StatisticsMapper.java

@@ -0,0 +1,22 @@
+package com.example.cinema.data;
+
+import com.example.cinema.po.MovieScheduleTime;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 1:43 PM
+ */
+@Mapper
+public interface StatisticsMapper {
+    /**
+     *
+     * @param date
+     * @return
+     */
+    List<MovieScheduleTime> selectMovieScheduleTimes(@Param("date") Date date, @Param("nextDate") Date nextDate);
+}

src/main/java/com/example/cinema/po/MovieScheduleTime.java

@@ -0,0 +1,38 @@
+package com.example.cinema.po;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 2:48 PM
+ */
+public class MovieScheduleTime {
+    private Integer movieId;
+    /**
+     * 排片次数
+     */
+    private Integer time;
+    private String name;
+
+    public Integer getMovieId() {
+        return movieId;
+    }
+
+    public void setMovieId(Integer movieId) {
+        this.movieId = movieId;
+    }
+
+    public Integer getTime() {
+        return time;
+    }
+
+    public void setTime(Integer time) {
+        this.time = time;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

src/test/java/com/example/cinema/bl/VIPServiceImplTest.java

@@ -20,9 +20,9 @@ public class VIPServiceImplTest {
 
     @Test
     public void addVIPCard() throws Exception {
-        VIPCardForm vipCardForm=new VIPCardForm();
-        //vipCardForm.setUserId(13);
-        vipCardForm.setAmount(300);
+//        VIPCardForm vipCardForm=new VIPCardForm();
+//        vipCardForm.setUserId(13);
+//        vipCardForm.setAmount(300);
     }
 
     @Test

src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java

@@ -0,0 +1,44 @@
+package com.example.cinema.blImpl;
+
+import com.example.cinema.bl.StatisticsService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import java.text.ParseException;
+import java.util.Calendar;
+import java.util.Date;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 3:05 PM
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class StatisticsServiceImplTest {
+    @Autowired
+    private StatisticsService statisticsService;
+    @Test
+    public void getScheduleRateByDate() throws ParseException {
+        System.out.println(getNumDayBeforeDate(new Date(),-5));
+        statisticsService.getScheduleRateByDate(getNumDayBeforeDate(new Date(),-5));
+    }
+
+    /**
+     * 获得num天后的日期
+     * @param oldDate
+     * @param num
+     * @return
+     * @throws ParseException
+     */
+    Date getNumDayBeforeDate(Date oldDate, int num) throws ParseException {
+        Calendar calendarTime = Calendar.getInstance();
+        calendarTime.setTime(oldDate);
+        calendarTime.add(Calendar.DAY_OF_YEAR, num);
+        return calendarTime.getTime();
+    }
+}

target/classes/com/example/cinema/data/ScheduleMapper.xml

@@ -64,6 +64,14 @@
 
     </update>
 
+    <select id="selectScheduleById" resultMap="ScheduleItem">
+        select * from
+          (select * from schedule where id = #{id}) s,
+          (select name as movie_name, id as movie_id from movie) m,
+          (select name as hall_name, id as hall_id from hall) h
+            where s.movie_id = m.movie_id and s.hall_id = h.hall_id
+    </select>
+
     <resultMap id="ScheduleItem" type="com.example.cinema.vo.ScheduleItem">
         <id column="id" property="id"></id>
         <result column="hall_id" property="hallId"></result>