Browse Source

下架电影

jacksenma 7 years ago
parent
commit
e629f3d5e7

+ 329 - 263
.idea/workspace.xml

@@ -2,10 +2,19 @@
 <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/vo/ScheduleRateVO.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieBatchOffForm.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/MovieServiceImplTest.java" 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/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" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/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/main/java/com/example/cinema/vo/MovieForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieForm.java" 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" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -51,61 +60,68 @@
     <session id="-1657780334">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="11" />
-          <entry key="project.open.time.1" value="4" />
+          <entry key="project.closed" value="12" />
+          <entry key="project.open.time.1" value="5" />
           <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="3" />
           <entry key="project.open.time.8" value="1" />
-          <entry key="project.opened" value="12" />
+          <entry key="project.opened" value="13" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
+          <entry key="coupon" value="1" />
+          <entry key="coupon_user" value="1" />
           <entry key="gitignore" value="1" />
-          <entry key="hall" value="2" />
-          <entry key="java" value="220" />
-          <entry key="movie" value="9" />
+          <entry key="hall" value="3" />
+          <entry key="html" value="2" />
+          <entry key="java" value="242" />
+          <entry key="js" value="3" />
+          <entry key="movie" value="13" />
           <entry key="movie_like" value="1" />
-          <entry key="schedule" value="20" />
+          <entry key="schedule" value="22" />
           <entry key="sql" value="14" />
+          <entry key="ticket" value="2" />
           <entry key="user" value="2" />
           <entry key="view" value="2" />
-          <entry key="xml" value="28" />
+          <entry key="xml" value="34" />
           <entry key="yml" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="Database Element" value="36" />
-          <entry key="JAVA" value="220" />
+          <entry key="Database Element" value="47" />
+          <entry key="HTML" value="2" />
+          <entry key="JAVA" value="242" />
+          <entry key="JavaScript" value="3" />
           <entry key="PLAIN_TEXT" value="1" />
           <entry key="Scratch" value="14" />
-          <entry key="XML" value="28" />
+          <entry key="XML" value="34" />
           <entry key="YAML" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="cell" value="116" />
+          <entry key="cell" value="120" />
           <entry key="dummy" value="8" />
           <entry key="gitignore" value="6" />
-          <entry key="java" value="7144" />
+          <entry key="java" value="7886" />
           <entry key="sql" value="931" />
           <entry key="txt" value="12" />
-          <entry key="xml" value="1076" />
+          <entry key="xml" value="1163" />
           <entry key="yml" value="34" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="7144" />
+          <entry key="JAVA" value="7886" />
           <entry key="PLAIN_TEXT" value="26" />
-          <entry key="SQL" value="61" />
-          <entry key="Scratch" value="1047" />
-          <entry key="XML" value="1015" />
+          <entry key="SQL" value="67" />
+          <entry key="Scratch" value="1051" />
+          <entry key="XML" value="1096" />
           <entry key="YAML" value="34" />
         </counts>
       </usages-collector>
@@ -114,59 +130,43 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java">
+        <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="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 relative-caret-position="304">
+              <caret line="52" column="18" lean-forward="true" selection-start-line="50" selection-start-column="8" selection-end-line="52" selection-end-column="18" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java">
+      <file pinned="false" current-in-tab="true">
+        <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="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 relative-caret-position="318">
+              <caret line="160" column="34" selection-start-line="160" selection-start-column="34" selection-end-line="160" selection-end-column="34" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="285">
-              <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+            <state relative-caret-position="325">
+              <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java">
+        <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/MovieServiceImplTest.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 relative-caret-position="270">
+              <caret line="28" column="15" lean-forward="true" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/view">
+        <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" />
@@ -174,15 +174,6 @@
           </provider>
         </entry>
       </file>
-      <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">
-            <state relative-caret-position="182">
-              <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
-            </state>
-          </provider>
-        </entry>
-      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -192,8 +183,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>
@@ -209,13 +200,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <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/java/com/example/cinema/vo/UserVO.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieLikeMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/DateLikeForm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/AccountMapper.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/AccountController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/AccountService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/AccountServiceImpl.java" />
@@ -226,7 +210,6 @@
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/HallService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/HallServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleVO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleItem.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleSearchForm.java" />
@@ -246,8 +229,6 @@
         <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" />
@@ -260,6 +241,16 @@
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/StatisticsServiceImplTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieForm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/MovieController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieBatchOffForm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml" />
+        <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/MovieServiceImplTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -290,17 +281,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <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">
         <subPane>
           <expand>
@@ -308,11 +288,6 @@
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
-              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
-              <item name=".idea" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
@@ -367,7 +342,7 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
-              <item name="po" type="462c0819:PsiDirectoryNode" />
+              <item name="blImpl" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
@@ -378,7 +353,39 @@
               <item name="com" type="462c0819:PsiDirectoryNode" />
               <item name="example" type="462c0819:PsiDirectoryNode" />
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
-              <item name="vo" type="462c0819:PsiDirectoryNode" />
+              <item name="data" 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="resources" 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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" 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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="static" type="462c0819:PsiDirectoryNode" />
+              <item name="js" 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="resources" type="462c0819:PsiDirectoryNode" />
+              <item name="templates" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
@@ -446,6 +453,17 @@
           <select />
         </subPane>
       </pane>
+      <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="Scope" />
     </panes>
   </component>
@@ -459,7 +477,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555401458703" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555425735013" />
     <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" />
@@ -499,6 +517,22 @@
     </option>
   </component>
   <component name="RunManager" selected="Spring Boot.CinemaApplication">
+    <configuration name="MovieServiceImplTest.pullOfBatchOfMovie" 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.MovieServiceImplTest" />
+      <option name="METHOD_NAME" value="pullOfBatchOfMovie" />
+      <option name="TEST_OBJECT" value="method" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="ScheduleServiceImplTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
       <module name="cinema" />
       <extension name="coverage">
@@ -583,9 +617,11 @@
       <item itemvalue="JUnit.ScheduleServiceImplTest" />
       <item itemvalue="JUnit.ScheduleServiceImplTest.deleteBatchOfSchedule" />
       <item itemvalue="JUnit.StatisticsServiceImplTest.getScheduleRateByDate" />
+      <item itemvalue="JUnit.MovieServiceImplTest.pullOfBatchOfMovie" />
     </list>
     <recent_temporary>
       <list>
+        <item itemvalue="JUnit.MovieServiceImplTest.pullOfBatchOfMovie" />
         <item itemvalue="JUnit.StatisticsServiceImplTest.getScheduleRateByDate" />
         <item itemvalue="JUnit.ScheduleServiceImplTest.deleteBatchOfSchedule" />
         <item itemvalue="JUnit.ScheduleServiceImplTest.searchScheduleSevenDays" />
@@ -617,19 +653,11 @@
       <workItem from="1555308079660" duration="812000" />
       <workItem from="1555392270296" duration="6024000" />
       <workItem from="1555399431899" duration="1945000" />
+      <workItem from="1555423741374" duration="1697000" />
     </task>
     <servers />
   </component>
   <component name="TestHistory">
-    <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>
     <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 23m 09s.xml">
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
@@ -651,9 +679,18 @@
     <history-entry file="StatisticsServiceImplTest_getScheduleRateByDate - 2019.04.16 at 15h 57m 22s.xml">
       <configuration name="StatisticsServiceImplTest.getScheduleRateByDate" configurationId="JUnit" />
     </history-entry>
+    <history-entry file="MovieServiceImplTest_pullOfBatchOfMovie - 2019.04.16 at 22h 08m 45s.xml">
+      <configuration name="MovieServiceImplTest.pullOfBatchOfMovie" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MovieServiceImplTest_pullOfBatchOfMovie - 2019.04.16 at 22h 09m 27s.xml">
+      <configuration name="MovieServiceImplTest.pullOfBatchOfMovie" configurationId="JUnit" />
+    </history-entry>
+    <history-entry file="MovieServiceImplTest_pullOfBatchOfMovie - 2019.04.16 at 22h 11m 24s.xml">
+      <configuration name="MovieServiceImplTest.pullOfBatchOfMovie" configurationId="JUnit" />
+    </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="54607000" />
+    <option name="totallyTimeSpent" value="59233000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -743,203 +780,197 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <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/ScheduleSearchForm.java" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="27" column="12" selection-start-line="27" selection-start-column="12" selection-end-line="27" selection-end-column="12" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/HallMapper.xml">
+    <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="90">
-          <caret line="6" column="30" selection-start-line="6" selection-start-column="16" selection-end-line="6" selection-end-column="30" />
+        <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/data/MovieMapper.xml">
+    <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="480">
-          <caret line="32" column="62" lean-forward="true" selection-start-line="28" selection-start-column="8" selection-end-line="32" selection-end-column="62" />
+        <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/data/HallMapper.java">
+    <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">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="300">
-          <caret line="23" column="36" selection-start-line="23" selection-start-column="36" selection-end-line="23" selection-end-column="36" />
+        <state relative-caret-position="135">
+          <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="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/movie" />
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleViewForm.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="135">
-          <caret line="9" column="29" selection-start-line="9" selection-start-column="29" selection-end-line="9" selection-end-column="29" />
+          <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/vo/ScheduleVO.java">
+    <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="240">
-          <caret line="20" selection-start-line="20" selection-end-line="20" />
+        <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://$APPLICATION_CONFIG_DIR$/consoles/db/56491842-8c26-426b-a604-02dce7d52d03/console.sql">
+    <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="135">
-          <caret line="9" selection-start-line="9" selection-end-line="12" selection-end-column="74" />
+        <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="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/view" />
-    <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/vo/ScheduleItem.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="-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>
-    <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">
+    <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" selection-start-line="13" selection-end-line="13" />
+          <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
         </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">
+    <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="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="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" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+    <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="810">
-          <caret line="74" column="28" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
+        <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/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/controller/HallController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
+        <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/blImpl/HallServiceImpl.java">
+    <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="135">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <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/blImpl/MovieServiceImpl.java">
+    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="135">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state>
+          <caret column="127" selection-end-column="167" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/VIPCardForm.java">
+    <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="52">
-          <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" />
+        <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" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/VIPServiceImplTest.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="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 relative-caret-position="315">
+          <caret line="21" column="52" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="52" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/VIPServiceImpl.java">
+    <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="120">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <state relative-caret-position="240">
+          <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleItem.java">
+    <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="-51">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <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="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/movie">
+    <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/vo/ScheduleBatchDeleteForm.java">
+    <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="120">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <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/data/ScheduleMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-line="2" selection-end-column="59" />
+        <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/data/StatisticsMapper.java">
+    <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="195">
-          <caret line="13" column="7" selection-start-line="13" selection-start-column="7" selection-end-line="13" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="182">
+          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
         </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/coupon">
       <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" />
-        </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" />
+    <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/coupon_user">
+      <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/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" />
+    <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/hall">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
         </state>
       </provider>
     </entry>
@@ -950,44 +981,55 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/AccountController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/userMember.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/userHome.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/userHome.html">
       <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>
+        <state relative-caret-position="-958" />
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/userMovie.html">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/userMovie.js">
       <provider selected="true" editor-type-id="text-editor">
-        <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" />
+        <state relative-caret-position="-52">
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="n#style#0;n#div#3;n#div#0;n#li#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#span#1;n#div#3;n#div#0;n#li#0;n#!!top" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/console.sql">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieLikeMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="127" selection-end-column="167" />
+        <state relative-caret-position="285">
+          <caret line="19" column="4" lean-forward="true" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="4" />
         </state>
       </provider>
     </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/vo/MovieForm.java">
       <provider selected="true" editor-type-id="text-editor">
         <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" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+          <caret line="59" column="25" lean-forward="true" selection-start-line="59" selection-start-column="25" selection-end-line="59" selection-end-column="25" />
+        </state>
+      </provider>
+    </entry>
+    <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="180">
+          <caret line="12" column="41" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="12" selection-end-column="41" />
         </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="630">
-          <caret line="42" column="48" selection-start-line="42" selection-start-column="48" selection-end-line="42" selection-end-column="48" />
+        <state relative-caret-position="291">
+          <caret line="50" column="74" lean-forward="true" selection-start-line="50" selection-start-column="74" selection-end-line="50" selection-end-column="74" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="e#1679#1680#0" expanded="true" />
@@ -996,36 +1038,76 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/StatisticsController.java">
+    <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="381">
+          <caret line="59" column="39" selection-start-line="59" selection-start-column="39" selection-end-line="59" selection-end-column="39" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieBatchOffForm.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" />
+        <state relative-caret-position="210">
+          <caret line="14" column="43" selection-start-line="14" selection-start-column="43" selection-end-line="14" selection-end-column="43" />
           <folding>
-            <element signature="imports" expanded="true" />
+            <element signature="e#289#290#0" expanded="true" />
+            <element signature="e#350#351#0" expanded="true" />
+            <element signature="e#396#397#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/StatisticsService.java">
+    <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="240">
-          <caret line="16" column="15" selection-start-line="16" selection-start-column="15" selection-end-line="16" selection-end-column="15" />
+        <state relative-caret-position="120">
+          <caret line="14" selection-start-line="14" selection-end-line="15" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/MovieService.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="339">
+          <caret line="75" column="15" selection-start-line="75" selection-start-column="15" selection-end-line="75" selection-end-column="15" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/blImpl/StatisticsServiceImpl.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="540">
+          <caret line="36" column="87" selection-start-line="35" selection-start-column="12" selection-end-line="36" selection-end-column="87" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.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="120">
-          <caret line="16" selection-start-line="16" selection-end-line="17" selection-end-column="15" />
+        <state relative-caret-position="-6">
+          <caret line="3" selection-start-line="3" selection-end-line="3" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/schedule">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="das://b10fd3be-0173-48f3-8d0f-883ecd8b2fcd/schema/cinema/table/ticket">
+      <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/blImpl/ScheduleServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="305">
+        <state relative-caret-position="1623">
           <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>
             <element signature="imports" expanded="true" />
@@ -1036,61 +1118,45 @@
         </state>
       </provider>
     </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" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="374">
+          <caret line="55" column="30" selection-start-line="55" selection-start-column="8" selection-end-line="55" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <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/data/ScheduleMapper.xml">
       <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 relative-caret-position="304">
+          <caret line="52" column="18" lean-forward="true" selection-start-line="50" selection-start-column="8" selection-end-line="52" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/MovieScheduleTime.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/MovieMapper.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="285">
-          <caret line="25" lean-forward="true" selection-start-line="25" selection-end-line="25" />
+        <state relative-caret-position="325">
+          <caret line="28" column="47" selection-start-line="28" selection-start-column="47" selection-end-line="28" selection-end-column="47" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleRateVO.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/blImpl/MovieServiceImplTest.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 relative-caret-position="270">
+          <caret line="28" column="15" lean-forward="true" selection-start-line="28" selection-start-column="15" selection-end-line="28" selection-end-column="15" />
         </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>
+    <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/blImpl/StatisticsServiceImplTest.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="182">
-          <caret line="29" lean-forward="true" selection-start-line="29" selection-end-line="29" />
+        <state relative-caret-position="318">
+          <caret line="160" column="34" selection-start-line="160" selection-start-column="34" selection-end-line="160" selection-end-column="34" />
         </state>
       </provider>
     </entry>

+ 7 - 0
src/main/java/com/example/cinema/bl/MovieService.java

@@ -1,5 +1,6 @@
 package com.example.cinema.bl;
 
+import com.example.cinema.vo.MovieBatchOffForm;
 import com.example.cinema.vo.MovieForm;
 import com.example.cinema.vo.ResponseVO;
 
@@ -67,4 +68,10 @@ public interface MovieService {
      */
     ResponseVO getLikeNumsGroupByDate(int movieId);
 
+    /**
+     * 批量下架电影
+     * @param movieBatchOffForm
+     * @return
+     */
+    ResponseVO pullOfBatchOfMovie(MovieBatchOffForm movieBatchOffForm);
 }

+ 47 - 0
src/main/java/com/example/cinema/blImpl/MovieServiceImpl.java

@@ -5,11 +5,19 @@ import com.example.cinema.data.AccountMapper;
 import com.example.cinema.data.MovieLikeMapper;
 import com.example.cinema.data.MovieMapper;
 
+import com.example.cinema.data.ScheduleMapper;
+import com.example.cinema.vo.MovieBatchOffForm;
 import com.example.cinema.vo.MovieForm;
 import com.example.cinema.vo.ResponseVO;
+import com.example.cinema.vo.ScheduleItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.swing.plaf.synth.SynthScrollBarUI;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+
 /**
  * @author fjj
  * @date 2019/3/12 6:43 PM
@@ -21,6 +29,7 @@ public class MovieServiceImpl implements MovieService {
     private static final String UNLIKE_ERROR_MESSAGE = "用户未标记该电影为想看";
     private static final String USER_NOT_EXIST_ERROR_MESSAGE = "用户不存在";
     private static final String MOVIE_NOT_EXIST_ERROR_MESSAGE = "电影不存在";
+    private static final String SCHEDULE_ERROR_MESSAGE = "有电影后续仍有排片或已有观众购票且未使用";
 
     @Autowired
     private MovieMapper movieMapper;
@@ -28,6 +37,8 @@ public class MovieServiceImpl implements MovieService {
     private MovieLikeMapper movieLikeMapper;
     @Autowired
     private AccountMapper accountMapper;
+    @Autowired
+    private ScheduleMapper scheduleMapper;
 
     @Override
     public ResponseVO addMovie(MovieForm addMovieForm) {
@@ -121,6 +132,42 @@ public class MovieServiceImpl implements MovieService {
         }
     }
 
+    @Override
+    public ResponseVO pullOfBatchOfMovie(MovieBatchOffForm movieBatchOffForm) {
+        try {
+            List<Integer> movieIdList =  movieBatchOffForm.getMovieIdList();
+            ResponseVO responseVO = preCheck(movieIdList);
+            if(!responseVO.getSuccess()){
+                return responseVO;
+            }
+            movieMapper.updateMovieStatusBatch(movieIdList);
+            return ResponseVO.buildSuccess();
+
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseVO.buildFailure("失败");
+        }
+    }
+
+    /**
+     * 下架和修改电影的前置检查
+     * @param movieIdList
+     * @return
+     */
+    public ResponseVO preCheck(List<Integer> movieIdList){
+        Date thisTime = new Date();
+        List<ScheduleItem> scheduleItems = scheduleMapper.selectScheduleByMovieIdList(movieIdList);
+
+        // 检查是否有电影后续有排片及是否有观众购票未使用
+        for(ScheduleItem s : scheduleItems){
+            if(s.getEndTime().after(thisTime)){
+                return ResponseVO.buildFailure(SCHEDULE_ERROR_MESSAGE);
+            }
+        }
+        return ResponseVO.buildSuccess();
+    }
+
+
     private boolean userLikeTheMovie(int userId, int movieId) {
         return movieLikeMapper.selectLikeMovie(movieId, userId) == 0 ? false : true;
     }

+ 8 - 0
src/main/java/com/example/cinema/controller/MovieController.java

@@ -1,5 +1,6 @@
 package com.example.cinema.controller;
 
+import com.example.cinema.vo.MovieBatchOffForm;
 import com.example.cinema.vo.MovieForm;
 import com.example.cinema.bl.MovieService;
 import com.example.cinema.vo.ResponseVO;
@@ -53,4 +54,11 @@ public class MovieController {
     public ResponseVO getMovieByKeyword(@RequestParam String keyword){
         return movieService.getMovieByKeyword(keyword);
     }
+
+    @RequestMapping(value = "/movie/off/batch",method = RequestMethod.POST)
+    public ResponseVO pullOfBatchOfMovie(@RequestBody MovieBatchOffForm movieBatchOffForm){
+        return movieService.pullOfBatchOfMovie(movieBatchOffForm);
+    }
+
+
 }

+ 7 - 0
src/main/java/com/example/cinema/data/MovieMapper.java

@@ -47,4 +47,11 @@ public interface MovieMapper {
      * @return
      */
     List<MovieVO> selectMovieByKeyword(@Param("keyword") String keyword);
+
+    /**
+     * 批量更新电影状态
+     * @param movieIdList
+     * @return
+     */
+    int updateMovieStatusBatch(List<Integer> movieIdList);
 }

+ 8 - 1
src/main/java/com/example/cinema/data/MovieMapper.xml

@@ -4,7 +4,7 @@
     <insert id="insertOneMovie" parameterType="com.example.cinema.vo.MovieForm"
             useGeneratedKeys="true" keyProperty="id">
         insert into movie(name, poster_url, director, screen_writer, starring, type, country, language, length, start_date, description, status)
-        values(#{name}, #{posterUrl}, #{director},  #{screenWriter}, #{starring}, #{type}, #{country}, #{language}, #{length}, #{startDate}, #{description},#{status})
+        values(#{name}, #{posterUrl}, #{director},  #{screenWriter}, #{starring}, #{type}, #{country}, #{language}, #{length}, #{startDate}, #{description}, 0)
     </insert>
 
     <select id="selectMovieById" resultMap="Movie">
@@ -25,6 +25,13 @@
         like concat('%',#{keyword},'%');
     </select>
 
+    <update id="updateMovieStatusBatch" parameterType="java.util.List">
+        update movie set status = 1 where id in
+        <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </update>
+
     <resultMap id="Movie" type="com.example.cinema.vo.MovieVO">
         <id column="id" property="id"></id>
         <result column="poster_url" property="posterUrl"></result>

+ 7 - 1
src/main/java/com/example/cinema/data/ScheduleMapper.java

@@ -1,7 +1,6 @@
 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;
@@ -97,4 +96,11 @@ public interface ScheduleMapper {
      * @return
      */
     ScheduleItem selectScheduleById(int id);
+
+    /**
+     * 查询所有涉及到movieIdList中电影的排片信息
+     * @param movieIdList
+     * @return
+     */
+    List<ScheduleItem> selectScheduleByMovieIdList(List<Integer> movieIdList);
 }

+ 7 - 0
src/main/java/com/example/cinema/data/ScheduleMapper.xml

@@ -26,6 +26,13 @@
           or (start_time between #{startTime} and #{endTime}))
     </select>
 
+    <select id="selectScheduleByMovieIdList" resultMap="ScheduleItem" parameterType="java.util.List">
+        select * from schedule where movie_id in
+        <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
     <insert id="insertOneView" parameterType="com.example.cinema.vo.ScheduleViewForm"
             useGeneratedKeys="true" keyProperty="id">
         insert into view(day) values(#{day})

+ 22 - 0
src/main/java/com/example/cinema/vo/MovieBatchOffForm.java

@@ -0,0 +1,22 @@
+package com.example.cinema.vo;
+
+import java.util.List;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 9:51 PM
+ */
+public class MovieBatchOffForm {
+    /**
+     * 要下架的电影id列表
+     */
+    private List<Integer> movieIdList;
+
+    public List<Integer> getMovieIdList() {
+        return movieIdList;
+    }
+
+    public void setMovieIdList(List<Integer> movieIdList) {
+        this.movieIdList = movieIdList;
+    }
+}

+ 1 - 1
src/main/java/com/example/cinema/vo/MovieForm.java

@@ -57,7 +57,7 @@ public class MovieForm {
      */
     private String description;
     /**
-     * 电影状态,0:未上映,1:上映中,2:已结束
+     * 电影状态,0:上架状态,1:下架状态
      */
     private Integer status;
 

+ 31 - 0
src/test/java/com/example/cinema/blImpl/MovieServiceImplTest.java

@@ -0,0 +1,31 @@
+package com.example.cinema.blImpl;
+
+import com.example.cinema.bl.MovieService;
+import com.example.cinema.vo.MovieBatchOffForm;
+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.util.Arrays;
+
+import static org.junit.Assert.*;
+
+/**
+ * @author fjj
+ * @date 2019/4/16 10:06 PM
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class MovieServiceImplTest {
+
+    @Autowired
+    private MovieService movieService;
+//    @Test
+//    public void pullOfBatchOfMovie() {
+//        MovieBatchOffForm movieBatchOffForm = new MovieBatchOffForm();
+//        movieBatchOffForm.setMovieIdList(Arrays.asList(10));
+//        movieService.pullOfBatchOfMovie(movieBatchOffForm);
+//    }
+}

BIN
target/classes/com/example/cinema/data/ScheduleMapper.class


+ 7 - 0
target/classes/com/example/cinema/data/ScheduleMapper.xml

@@ -26,6 +26,13 @@
           or (start_time between #{startTime} and #{endTime}))
     </select>
 
+    <select id="selectScheduleByMovieIdList" resultMap="ScheduleItem" parameterType="java.util.List">
+        select * from schedule where movie_id in
+        <foreach collection="list" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+
     <insert id="insertOneView" parameterType="com.example.cinema.vo.ScheduleViewForm"
             useGeneratedKeys="true" keyProperty="id">
         insert into view(day) values(#{day})