.idea/workspace.xml

@@ -9,6 +9,14 @@
       <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" />
@@ -19,6 +27,7 @@
       <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" />
@@ -41,25 +50,18 @@
     <option name="HIDDEN_KINDS">
       <set />
     </option>
-    <expand>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="cinema" type="feb32156:DbDataSourceImpl" />
-      </path>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="cinema" type="feb32156:DbDataSourceImpl" />
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
-      </path>
-      <path>
-        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
-        <item name="cinema" type="feb32156:DbDataSourceImpl" />
-        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
-        <item name="cinema: schema" type="c314c289:MysqlImplModel$Schema" />
-      </path>
-    </expand>
+    <expand />
     <select />
   </component>
+<<<<<<< HEAD
+  <component name="FileEditorManager">
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
+          <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">
@@ -137,41 +139,77 @@
                 <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">
+            <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" />
+              <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" />
+                <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">
@@ -197,29 +235,57 @@
               <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">
+              <caret line="37" column="47" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="47" />
+              <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">
+              <caret line="7" column="23" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="23" />
+              <folding>
+                <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">
@@ -231,6 +297,7 @@
                 <element signature="e#1977#1978#0" expanded="true" />
                 <element signature="e#2035#2036#0" expanded="true" />
               </folding>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
             </state>
           </provider>
         </entry>
@@ -261,8 +328,17 @@
   <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" />
+        <option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaStatistic.html" />
+        <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/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" />
@@ -294,6 +370,20 @@
         <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" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java" />
+        <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/VIPServiceImplTest.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" />
+        <option value="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/js/request.js" />
+        <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" />
@@ -312,17 +402,21 @@
         <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>
-  <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
-  <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
   <component name="JsFlowSettings">
     <service-enabled>true</service-enabled>
     <exe-path />
     <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>
@@ -335,37 +429,86 @@
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
-    <navigator proportions="" version="1">
+    <navigator currentView="PackagesPane" proportions="" version="1">
       <hideEmptyPackages ProjectPane="false" />
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="ProjectPane">
+<<<<<<< HEAD
+      <pane id="Scope" />
+      <pane id="PackagesPane">
         <subPane>
           <expand>
             <path>
-              <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
-              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="com.example.cinema" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="com.example.cinema" type="1f31426a:PackageElementNode" />
+              <item name="controller" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="com.example.cinema" type="1f31426a:PackageElementNode" />
+              <item name="vo" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="static" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="static" type="1f31426a:PackageElementNode" />
+              <item name="css" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="static" type="1f31426a:PackageElementNode" />
+              <item name="js" type="1f31426a:PackageElementNode" />
+            </path>
+            <path>
+              <item name="CinemaDemo" type="58d84e3e:PackageViewProjectNode" />
+              <item name="CinemaDemo" type="616d4139:PackageViewModuleNode" />
+              <item name="templates" type="1f31426a:PackageElementNode" />
             </path>
+          </expand>
+          <select />
+        </subPane>
+      </pane>
+=======
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
+      <pane id="ProjectPane">
+        <subPane>
+          <expand>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
-              <item name="src" 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" />
             </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
@@ -373,7 +516,6 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
@@ -381,24 +523,24 @@
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
+              <item name="cinema" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="CinemaDemo" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
-              <item name="java" type="462c0819:PsiDirectoryNode" />
-              <item name="com" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-              <item name="cinema" type="462c0819:PsiDirectoryNode" />
+              <item name="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" />
+<<<<<<< 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" />
@@ -455,11 +597,14 @@
               <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>
@@ -472,6 +617,7 @@
           <select />
         </subPane>
       </pane>
+>>>>>>> 5377d276a1c2080b102a74e6cb8720e0a017202b
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -484,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" />
@@ -492,6 +642,9 @@
     <property name="list.type.of.created.stylesheet" value="CSS" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="/usr/local/bin/node" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
+    <property name="project.structure.last.edited" value="Libraries" />
+    <property name="project.structure.proportion" value="0.15" />
+    <property name="project.structure.side.proportion" value="0.2" />
     <property name="settings.editor.selected.configurable" value="project.propCompiler" />
   </component>
   <component name="RecentsManager">
@@ -512,6 +665,11 @@
     </key>
   </component>
   <component name="RunDashboard">
+    <option name="configurationTypes">
+      <set>
+        <option value="SpringBootApplicationConfigurationType" />
+      </set>
+    </option>
     <option name="ruleStates">
       <list>
         <RuleState>
@@ -522,6 +680,7 @@
         </RuleState>
       </list>
     </option>
+    <option name="contentProportion" value="0.012430081" />
   </component>
   <component name="RunManager" selected="Spring Boot.CinemaApplication">
     <configuration name="ScheduleServiceImplTest" type="JUnit" factoryName="JUnit" temporary="true" nameIsGenerated="true">
@@ -639,8 +798,12 @@
       <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>
@@ -677,7 +840,11 @@
     </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">
@@ -689,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" />
@@ -700,16 +874,25 @@
       <window_info id="UI Designer" order="5" />
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info id="Web" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Run Dashboard" visible="true" weight="0.24489796" />
       <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" />
@@ -726,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" />
@@ -762,11 +949,33 @@
         </entry>
       </map>
     </option>
-  </component>
-  <component name="VcsContentAnnotationSettings">
-    <option name="myLimit" value="2678400000" />
+    <option name="RECENT_FILTERS">
+      <map>
+        <entry key="Branch">
+          <value>
+            <list />
+          </value>
+        </entry>
+        <entry key="User">
+          <value>
+            <list />
+          </value>
+        </entry>
+      </map>
+    </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">
+        <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>
+    </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" />
@@ -807,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>
@@ -821,6 +1037,11 @@
         </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="135">
@@ -839,6 +1060,7 @@
     <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" />
@@ -918,6 +1140,12 @@
         </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>
@@ -941,6 +1169,7 @@
           <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">
@@ -970,16 +1199,37 @@
         </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">
+          <caret line="23" column="15" selection-start-line="23" selection-start-column="15" selection-end-line="23" selection-end-column="15" />
+        </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="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">
@@ -991,12 +1241,66 @@
       <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" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/impl/HallServiceImpl.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/impl/MovieServiceImpl.java" />
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java" />
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor" />
+    </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="289">
+          <caret line="23" column="10" selection-start-line="23" selection-start-column="10" selection-end-line="23" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/CinemaApplication.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="221">
+          <caret line="13" lean-forward="true" selection-start-line="13" selection-end-line="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+            <element signature="e#250#251#0" expanded="true" />
+            <element signature="e#318#319#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/CinemaApplicationTests.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="68">
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
+        </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="918">
+          <caret line="74" column="28" selection-start-line="74" selection-start-column="28" selection-end-line="74" selection-end-column="28" />
+          <folding>
+            <element signature="e#1248#1249#0" expanded="true" />
+            <element signature="e#1285#1286#0" expanded="true" />
+            <element signature="e#1313#1314#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/request.js">
+      <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">
@@ -1015,11 +1319,67 @@
       <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>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="391">
+          <caret line="23" selection-start-line="23" selection-end-line="23" />
+        </state>
+      </provider>
+    </entry>
+    <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">
+          <caret line="7" column="23" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="23" />
+          <folding>
+            <element signature="e#169#170#0" expanded="true" />
+            <element signature="e#195#196#0" expanded="true" />
+          </folding>
+        </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="493">
+          <caret line="37" column="47" selection-start-line="37" selection-start-column="29" selection-end-line="37" selection-end-column="47" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <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" />
+        </state>
+      </provider>
+    </entry>
+    <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" />
+        </state>
+      </provider>
+    </entry>
+    <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" />
+=======
         <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>
@@ -1097,19 +1457,26 @@
           <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="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" />
+            <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" />
+            <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>
         </state>
       </provider>
@@ -1117,6 +1484,67 @@
   </component>
   <component name="masterDetails">
     <states>
+      <state key="ArtifactsStructureConfigurable.UI">
+        <settings>
+          <artifact-editor />
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="FacetStructureConfigurable.UI">
+        <settings>
+          <last-edited>No facets are configured</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="GlobalLibrariesConfigurable.UI">
+        <settings>
+          <last-edited>ezmorph-1.0.6</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="JdkListConfigurable.UI">
+        <settings>
+          <last-edited>1.8</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
+      <state key="ModuleStructureConfigurable.UI">
+        <settings>
+          <last-edited>CinemaDemo</last-edited>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+                <option value="0.6" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
       <state key="ProjectJDKs.UI">
         <settings>
           <last-edited>9.0</last-edited>
@@ -1129,6 +1557,17 @@
           </splitter-proportions>
         </settings>
       </state>
+      <state key="ProjectLibrariesConfigurable.UI">
+        <settings>
+          <splitter-proportions>
+            <option name="proportions">
+              <list>
+                <option value="0.2" />
+              </list>
+            </option>
+          </splitter-proportions>
+        </settings>
+      </state>
     </states>
   </component>
 </project>

src/main/resources/static/js/adminCinemaManage.js

@@ -1,5 +1,8 @@
 $(document).ready(function() {
 
+    var canSeeDate = 7;
+
+    getCanSeeDayNum();
     getCinemaHalls();
 
     function getCinemaHalls() {
@@ -38,7 +41,41 @@ $(document).ready(function() {
                 "</div>" +
                 "</div>";
             hallDomStr+=hallDom;
-        })
+        });
         $('#hall-card').append(hallDomStr);
     }
+
+    function getCanSeeDayNum() {
+        $("#can-see-num").text(canSeeDate);
+    }
+
+    $('#canview-modify-btn').click(function () {
+       $("#canview-modify-btn").hide();
+       $("#canview-set-input").val(canSeeDate);
+       $("#canview-set-input").show();
+       $("#canview-confirm-btn").show();
+    });
+
+    $('#canview-confirm-btn').click(function () {
+        var dayNum = $("#canview-set-input").val();
+        // 验证一下是否为数字
+        postRequest(
+            '/schedule/view/set',
+            {day:dayNum},
+            function (res) {
+                if(res.success){
+                    getCanSeeDayNum();
+                    canSeeDate = dayNum;
+                    $("#canview-modify-btn").show();
+                    $("#canview-set-input").hide();
+                    $("#canview-confirm-btn").hide();
+                } else{
+                    alert(res.message);
+                }
+            },
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    })
 });

src/main/resources/static/js/adminScheduleManage.js

@@ -5,7 +5,6 @@ var colors = [
     '#66cccc',
     '#FFCCCC',
     '#3399FF',
-
     '#9966FF',
 
 ];
@@ -20,17 +19,22 @@ function formatDate(date){
 }
 
 function formatTime(date){
-    return date.getHours()+":"+date.getMinutes();
+    var hour = date.getHours()+'';
+    var minutes = date.getMinutes()+'';
+    hour.length===1 && (hour = '0'+hour)
+    minutes.length===1 && (minutes = '0'+minutes)
+    return hour+":"+minutes;
 }
 
 $(document).ready(function() {
     var hallId,
-        scheduleDate = formatDate(new Date());
+        scheduleDate = formatDate(new Date()),
+        schedules = [];
 
     initSelectAndDate();
 
     function getSchedules() {
-        var schedules = [];
+
         getRequest(
             '/schedule/search?hallId='+hallId+'&startDate='+scheduleDate.replace(/-/g,'/'),
             function (res) {
@@ -52,13 +56,14 @@ $(document).ready(function() {
             $(".schedule-container").append(scheduleDateDom);
             scheduleOfDate.scheduleItemList.forEach(function (schedule,index) {
                 var scheduleStyle = mapScheduleStyle(schedule);
-                scheduleDateDom.append(
-                    "<li class='schedule-item' style='background:"+scheduleStyle.color+";top:"+scheduleStyle.top+";height:"+scheduleStyle.height+"'>"+
+                var scheduleItemDom =$(
+                    "<li id='schedule-"+ schedule.id +"' class='schedule-item' data-schedule='"+JSON.stringify(schedule)+"' style='background:"+scheduleStyle.color+";top:"+scheduleStyle.top+";height:"+scheduleStyle.height+"'>"+
                     "<span>"+schedule.movieName+"</span>"+
                     "<span class='error-text'>¥"+schedule.fare+"</span>"+
                     "<span>"+formatTime(new Date(schedule.startTime))+"-"+formatTime(new Date(schedule.endTime))+"</span>"+
                     "</li>");
-            })
+                scheduleDateDom.append(scheduleItemDom);
+            });
         })
     }
 
@@ -98,6 +103,7 @@ $(document).ready(function() {
                 halls.forEach(function (hall) {
                     $('#hall-select').append("<option value="+ hall.id +">"+hall.name+"</option>");
                     $('#schedule-hall-input').append("<option value="+ hall.id +">"+hall.name+"</option>");
+                    $('#schedule-edit-hall-input').append("<option value="+ hall.id +">"+hall.name+"</option>");
                 });
                 getSchedules();
             },
@@ -114,6 +120,7 @@ $(document).ready(function() {
                 var movieList = res.content;
                 movieList.forEach(function (movie) {
                     $('#schedule-movie-input').append("<option value="+ movie.id +">"+movie.name+"</option>");
+                    $("#schedule-edit-movie-input").append("<option value="+ movie.id +">"+movie.name+"</option>");
                 });
             },
             function (error) {
@@ -121,6 +128,18 @@ $(document).ready(function() {
             }
         );
     }
+
+    $(document).on('click','.schedule-item',function (e) {
+        var schedule = JSON.parse(e.target.dataset.schedule);
+        $("#schedule-edit-hall-input").children('option[value='+schedule.hallId+']').attr('selected',true);
+        $("#schedule-edit-movie-input").children('option[value='+schedule.movieId+']').attr('selected',true);
+        $("#schedule-edit-start-date-input").val(schedule.startTime.slice(0,16));
+        $("#schedule-edit-end-date-input").val(schedule.endTime.slice(0,16));
+        $("#schedule-edit-price-input").val(schedule.fare);
+        $('#scheduleEditModal').modal('show');
+        $('#scheduleEditModal')[0].dataset.scheduleId = schedule.id;
+        console.log(schedule);
+    });
     
     $('#schedule-form-btn').click(function () {
         var form = {
@@ -143,6 +162,55 @@ $(document).ready(function() {
                 alert(JSON.stringify(error));
             }
         );
+    });
+
+    $('#schedule-edit-form-btn').click(function () {
+        var form = {
+            id: Number($('#scheduleEditModal')[0].dataset.scheduleId),
+            hallId: $("#schedule-edit-hall-input").children('option:selected').val(),
+            movieId : $("#schedule-edit-movie-input").children('option:selected').val(),
+            startTime: $("#schedule-edit-start-date-input").val(),
+            endTime: $("#schedule-edit-end-date-input").val(),
+            fare: $("#schedule-edit-price-input").val()
+        };
+        //todo 需要做一下表单验证？
+
+        postRequest(
+            '/schedule/update',
+            form,
+            function (res) {
+                if(res.success){
+                    getSchedules();
+                    $("#scheduleEditModal").modal('hide');
+                } else{
+                    alert(res.message);
+                }
+            },
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    });
+
+    $("#schedule-edit-remove-btn").click(function () {
+        var r=confirm("确认要删除该排片信息吗")
+        if (r) {
+            deleteRequest(
+                '/schedule/delete/batch',
+                {scheduleIdList:[Number($('#scheduleEditModal')[0].dataset.scheduleId)]},
+                function (res) {
+                    if(res.success){
+                        getSchedules();
+                        $("#scheduleEditModal").modal('hide');
+                    } else{
+                        alert(res.message);
+                    }
+                },
+                function (error) {
+                    alert(JSON.stringify(error));
+                }
+            );
+        }
     })
 
 });

src/main/resources/static/js/request.js

@@ -21,6 +21,19 @@ function postRequest(url, data, onSuccess, onError) {
     });
 }
 
+function deleteRequest(url, data, onSuccess, onError) {
+    $.ajax({
+        type: 'DELETE',
+        url: url,
+        async: true,
+        data: JSON.stringify(data),
+        contentType: 'application/json',
+        processData: false,
+        success: onSuccess,
+        error: onError
+    });
+}
+
 $(document).ready(function () {
 
     //全局事件

src/main/resources/templates/adminCinemaManage.html

@@ -33,14 +33,15 @@
         <div class="content-item">
             <span class="title gray-text">常规设置</span>
             <div class="content-card card">
-                <span class="">用户可见排片日期：</span><span>7天</span>
-                <input type="number" class="form-control" id="sessionDateSetInput" style="display: none;">
+                <span class="">用户可见排片日期：</span><span id="can-see-num"></span>
+                <a style="margin-left: 20px;" class="primary-text" id="canview-modify-btn">修改</a>
+                <input type="number" class="form-control" id="canview-set-input" style="display: none;width: 200px;">
+                <a style="display: none" class="primary-text" id="canview-confirm-btn">确认</a>
             </div>
         </div>
         <div class="content-item">
             <span class="title gray-text">影厅管理</span>
             <div class="content-card card" id="hall-card">
-
             </div>
         </div>
     </div>

src/main/resources/templates/adminScheduleManage.html

@@ -73,7 +73,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="movieModalLabel">新增排片</h4>
+                <h4 class="modal-title">新增排片</h4>
             </div>
             <div class="modal-body">
                 <form class="form-horizontal" role="form">
@@ -118,5 +118,56 @@
         </div>
     </div>
 </div>
+<div class="modal fade" id="scheduleEditModal" tabindex="-1" role="dialog" aria-labelledby="movieModalLabel">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                <h4 class="modal-title">修改排片</h4>
+            </div>
+            <div class="modal-body">
+                <form class="form-horizontal" role="form">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-movie-input"><span class="error-text">*</span>电影名称</label>
+                        <div class="col-sm-10">
+                            <select id="schedule-edit-movie-input" class="form-control">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-hall-input"><span class="error-text">*</span>放映影厅</label>
+                        <div class="col-sm-10">
+                            <select id="schedule-edit-hall-input" class="form-control">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-edit-start-date-input"><span class="error-text">*</span>开始时间</label>
+                        <div class="col-sm-10">
+                            <input type="datetime-local" class="form-control" id="schedule-edit-start-date-input" placeholder="请选择开始时间">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-edit-end-date-input"><span class="error-text">*</span>结束时间</label>
+                        <div class="col-sm-10">
+                            <input type="datetime-local" class="form-control" id="schedule-edit-end-date-input" placeholder="请选择结束时间">
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label" for="schedule-edit-price-input"><span class="error-text">*</span>场次票价</label>
+                        <div class="col-sm-10">
+                            <input type="text" class="form-control" id="schedule-edit-price-input" placeholder="请输入票价">
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-danger" id="schedule-edit-remove-btn">删除</button>
+                <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                <button type="button" class="btn btn-primary" id="schedule-edit-form-btn">确认</button>
+            </div>
+        </div>
+    </div>
+</div>
 </body>
 </html>