排片

.idea/workspace.xml

@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/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/css/adminSchedule.css" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" 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/templates/adminScheduleManage.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" afterDir="false" />
     </list>
@@ -27,61 +27,60 @@
     <option name="HIDDEN_KINDS">
       <set />
     </option>
-    <expand />
+    <expand>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="cinema@47.101.183.63" type="feb32156:DbDataSourceImpl" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="cinema@47.101.183.63" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="cinema@47.101.183.63" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="cinema: schema" type="76f4a085:MysqlImplModel$Schema" />
+      </path>
+      <path>
+        <item name="Database" type="3277223f:DatabaseStructure$DbRootGroup" />
+        <item name="cinema@47.101.183.63" type="feb32156:DbDataSourceImpl" />
+        <item name="schemas" type="d4e8921:DatabaseStructure$FamilyGroup" />
+        <item name="cinema: schema" type="76f4a085:MysqlImplModel$Schema" />
+        <item name="schedule: table" type="285a2a93:MysqlImplModel$Table" />
+      </path>
+    </expand>
     <select />
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="402">
-              <caret line="37" column="19" lean-forward="true" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <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="136">
-              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="257">
-              <caret line="19" column="7" lean-forward="true" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/HallVO.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <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="479">
+              <caret line="75" column="39" lean-forward="true" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="39" />
+              <folding>
+                <element signature="n#style#0;n#li#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserForm.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/common.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <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="-270">
+              <caret line="52" column="11" selection-start-line="52" selection-start-column="1" selection-end-line="52" selection-end-column="11" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="102">
-              <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="441">
+              <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
             </state>
           </provider>
         </entry>
@@ -89,14 +88,15 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="377">
-              <caret line="93" column="59" lean-forward="true" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="59" />
+            <state relative-caret-position="430">
+              <caret line="64" column="47" selection-start-line="64" selection-start-column="47" selection-end-line="64" selection-end-column="47" />
               <folding>
                 <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;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#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
                 <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+                <element signature="n#div#1;n#body#0;n#html#0;n#!!top" />
               </folding>
             </state>
           </provider>
@@ -113,6 +113,11 @@
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>.schedule-date-container</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -130,10 +135,10 @@
         <option value="$PROJECT_DIR$/src/main/resources/static/css/cinemaHall.css" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminPromotionManage.html" />
-        <option value="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" />
         <option value="$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js" />
         <option value="$PROJECT_DIR$/src/main/resources/templates/adminScheduleManage.html" />
         <option value="$PROJECT_DIR$/src/main/resources/static/js/adminScheduleManage.js" />
+        <option value="$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css" />
       </list>
     </option>
   </component>
@@ -182,6 +187,11 @@
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
+              <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
+              <item name=".idea" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
@@ -241,6 +251,15 @@
               <item name="resources" type="462c0819:PsiDirectoryNode" />
               <item name="static" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="cinema" 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="css" type="462c0819:PsiDirectoryNode" />
+            </path>
             <path>
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
@@ -275,19 +294,20 @@
     <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="1555055051655" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555072261876" />
+    <property name="database.console.LAST_STATE" value="false" />
     <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="settings.editor.selected.configurable" value="project.propCompiler" />
   </component>
   <component name="RecentsManager">
-    <key name="MoveFile.RECENT_KEYS">
+    <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/static/images" />
-      <recent name="$PROJECT_DIR$/src/main/resources/static/css" />
     </key>
-    <key name="CopyFile.RECENT_KEYS">
+    <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/src/main/resources/static/images" />
+      <recent name="$PROJECT_DIR$/src/main/resources/static/css" />
     </key>
   </component>
   <component name="RunDashboard">
@@ -327,7 +347,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="13141000" />
+    <option name="totallyTimeSpent" value="17970000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -341,6 +361,7 @@
       <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="Database Console" />
       <window_info anchor="bottom" id="Problems" order="0" weight="0.32959184" />
       <window_info anchor="bottom" id="Message" order="1" />
       <window_info anchor="bottom" id="Find" order="2" />
@@ -456,13 +477,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/common.css">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="406">
-          <caret line="56" column="18" selection-start-line="56" selection-start-column="12" selection-end-line="56" selection-end-column="18" />
-        </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="170">
@@ -509,125 +523,157 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/adminSchedule.css">
+    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="21" column="24" selection-start-line="21" selection-start-column="24" selection-end-line="21" selection-end-column="24" />
+        <state relative-caret-position="-391">
+          <caret line="6" column="14" selection-start-line="6" selection-start-column="14" selection-end-line="6" selection-end-column="14" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/.idea/workspace.xml">
+    <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="-302">
-          <caret line="30" column="14" selection-start-line="30" selection-start-column="14" selection-end-line="30" selection-end-column="14" />
+        <state relative-caret-position="153">
+          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="16" column="13" selection-start-line="16" selection-start-column="13" selection-end-line="16" selection-end-column="13" />
+        <state relative-caret-position="170">
+          <caret line="10" column="17" lean-forward="true" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="238">
-          <caret line="47" selection-start-line="47" selection-end-line="131" selection-end-column="6" />
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/HallController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/HallVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/application.yml">
+    <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="170">
-          <caret line="10" column="17" lean-forward="true" selection-start-line="10" selection-start-column="17" selection-end-line="10" selection-end-column="17" />
+        <state relative-caret-position="136">
+          <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/resources/templates/adminCinemaManage.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserForm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="17">
-          <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
-          <folding>
-            <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" />
-          </folding>
+        <state relative-caret-position="102">
+          <caret line="6" column="13" selection-start-line="6" selection-start-column="13" selection-end-line="6" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleSearchForm.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret selection-end-column="30" />
+        <state relative-caret-position="204">
+          <caret line="12" column="26" selection-start-line="12" selection-start-column="20" selection-end-line="12" selection-end-column="26" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminMovieManage.js">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminMovieManage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="854">
-          <caret line="65" lean-forward="true" selection-start-line="65" selection-end-line="65" />
+        <state relative-caret-position="238">
+          <caret line="47" selection-start-line="47" selection-end-line="131" selection-end-column="6" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserVO.java">
+    <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="102">
-          <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="342">
+          <caret line="24" column="24" selection-start-line="24" selection-start-column="17" selection-end-line="24" selection-end-column="24" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/HallVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/request.js">
+      <provider selected="true" editor-type-id="text-editor" />
+    </entry>
+    <entry file="das://56491842-8c26-426b-a604-02dce7d52d03/schema/cinema/table/schedule">
+      <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
+        <state>
+          <filtering enabled="true" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminMovieManage.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <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="212">
+          <caret line="14" column="47" lean-forward="true" selection-start-line="14" selection-start-column="16" selection-end-line="14" selection-end-column="47" />
+          <folding>
+            <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://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/MovieForm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/js/adminCinemaManage.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="136">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state>
+          <caret selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/UserForm.java">
+    <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="102">
-          <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="221">
+          <caret line="21" column="42" lean-forward="true" selection-start-line="21" selection-start-column="29" selection-end-line="21" selection-end-column="42" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/templates/adminCinemaManage.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="257">
-          <caret line="19" column="7" lean-forward="true" selection-start-line="19" selection-start-column="7" selection-end-line="19" selection-end-column="7" />
+        <state relative-caret-position="17">
+          <caret line="4" column="15" selection-start-line="4" selection-start-column="15" selection-end-line="4" selection-end-column="15" />
+          <folding>
+            <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" />
+          </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="377">
-          <caret line="93" column="59" lean-forward="true" selection-start-line="93" selection-start-column="40" selection-end-line="93" selection-end-column="59" />
+        <state relative-caret-position="430">
+          <caret line="64" column="47" selection-start-line="64" selection-start-column="47" selection-end-line="64" selection-end-column="47" />
           <folding>
             <element signature="n#style#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#select#0;n#div#0;n#div#0;n#div#1;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#1;n#div#0;n#div#1;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
             <element signature="n#style#0;n#div#2;n#div#1;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#div#1;n#body#0;n#html#0;n#!!top" />
           </folding>
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/css/common.css">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="-270">
+          <caret line="52" column="11" selection-start-line="52" selection-start-column="1" selection-end-line="52" selection-end-column="11" />
+        </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="402">
-          <caret line="37" column="19" lean-forward="true" selection-start-line="37" selection-start-column="19" selection-end-line="37" selection-end-column="19" />
+        <state relative-caret-position="479">
+          <caret line="75" column="39" lean-forward="true" selection-start-line="75" selection-start-column="39" selection-end-line="75" selection-end-column="39" />
+          <folding>
+            <element signature="n#style#0;n#li#0;n#!!top" expanded="true" />
+          </folding>
+        </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="441">
+          <caret line="26" column="23" selection-start-line="26" selection-start-column="23" selection-end-line="26" selection-end-column="23" />
         </state>
       </provider>
     </entry>

src/main/resources/static/css/adminSchedule.css

@@ -5,33 +5,33 @@
 
 .schedule-time-line {
     width: 80px;
-    height: 720px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
 }
 
 .schedule-item-line {
-    height: 720px;
+    height: 960px;
     width: 150px;
     border-left: 1px solid #ccc;
     position: relative;
 }
 
 .schedule-item {
-    background: #1caaaa;
-    height:80px;
+    width: 100%;
     display: flex;
     flex-direction: column;
-    justify-content: center;
     align-items: center;
     color: #fff;
+    position: absolute;
+    overflow-y: scroll;
 }
 
 .schedule-date-container {
     padding-left: 100px;
-    height: 30px;
+    height: 40px;
     line-height: 30px;
+    display: flex;
 }
 
 .schedule-date {

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

@@ -1,12 +1,13 @@
 var colors = [
-    '#66cccc',
-    '#0099cc',
+    '#FF6666',
+    '#FFFF33',
     '#FF9933',
+    '#66cccc',
     '#FFCCCC',
     '#3399FF',
-    '#FFFF33',
+
     '#9966FF',
-    '#FF6666',
+
 ];
 
 function formatDate(date){
@@ -18,19 +19,78 @@ function formatDate(date){
     return year+'-'+month+'-'+day;
 }
 
+function formatTime(date){
+    return date.getHours()+":"+date.getMinutes();
+}
+
 $(document).ready(function() {
     var hallId,
         scheduleDate = formatDate(new Date());
 
     initSelectAndDate();
 
+    function getSchedules() {
+        var schedules = [];
+        postRequest(
+            '/schedule/search',
+            {
+                hallId: hallId,
+                startDate: scheduleDate
+             },
+            function (res) {
+                schedules = res.content;
+                console.log(schedules);
+                renderScheduleTable(schedules);
+             },
+            function (error) {
+                alert(JSON.stringify(error));
+             }
+        );
+    }
+
+    function renderScheduleTable(schedules){
+        $('.schedule-date-container').empty();
+        $(".schedule-time-line").siblings().remove();
+        schedules.forEach(function (scheduleOfDate) {
+            $('.schedule-date-container').append("<div class='schedule-date'>"+formatDate(new Date(scheduleOfDate.date))+"</div>");
+            var scheduleDateDom = $(" <ul class='schedule-item-line'></ul>");
+            $(".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+"'>"+
+                    "<span>"+schedule.movieName+"</span>"+
+                    "<span class='error-text'>¥"+schedule.fare+"</span>"+
+                    "<span>"+formatTime(new Date(schedule.startTime))+"-"+formatTime(new Date(schedule.endTime))+"</span>"+
+                    "</li>");
+            })
+        })
+    }
+
+    function mapScheduleStyle(schedule) {
+        var start = new Date(schedule.startTime).getHours()+new Date(schedule.startTime).getMinutes()/60,
+            end = new Date(schedule.endTime).getHours()+new Date(schedule.endTime).getMinutes()/60 ;
+        return {
+            color: colors[schedule.movieId%colors.length],
+            top: 40*start+'px',
+            height: 40*(end-start)+'px'
+        }
+    }
+
     function initSelectAndDate() {
         $('#schedule-date-input').val(scheduleDate);
         getCinemaHalls();
+        getAllMovies();
+        
+        // 过滤条件变化后重新查询
         $('#hall-select').change (function () {
             hallId=$(this).children('option:selected').val();
+            getSchedules();
+        });
+        $('#schedule-date-input').change(function () {
+            scheduleDate = $('#schedule-date-input').val();
+            getSchedules();
         });
-
     }
 
     function getCinemaHalls() {
@@ -39,10 +99,12 @@ $(document).ready(function() {
             '/hall/all',
             function (res) {
                 halls = res.content;
+                hallId = halls[0].id;
                 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>");
-                })
+                });
+                getSchedules();
             },
             function (error) {
                 alert(JSON.stringify(error));
@@ -50,5 +112,43 @@ $(document).ready(function() {
         );
     }
 
+    function getAllMovies() {
+        getRequest(
+            '/movie/all',
+            function (res) {
+                var movieList = res.content;
+                movieList.forEach(function (movie) {
+                    $('#schedule-movie-input').append("<option value="+ movie.id +">"+movie.name+"</option>");
+                });
+            },
+            function (error) {
+                alert(error);
+            }
+        );
+    }
+    
+    $('#schedule-form-btn').click(function () {
+        var form = {
+            hallId: $("#schedule-hall-input").children('option:selected').val(),
+            movieId : $("#schedule-movie-input").children('option:selected').val(),
+            startTime: $("#schedule-start-date-input").val(),
+            endTime: $("#schedule-end-date-input").val(),
+            fare: $("#schedule-price-input").val()
+        };
+        //todo 需要做一下表单验证？
+
+        postRequest(
+            '/schedule/add',
+            form,
+            function (res) {
+                getSchedules();
+                $("#scheduleModal").modal('hide');
+            },
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    })
+
 });
 

src/main/resources/templates/adminScheduleManage.html

@@ -63,10 +63,6 @@
                     <li class="schedule-time-item">24:00</li>
                 </ul>
                 <ul class="schedule-item-line">
-                    <li class="schedule-item">
-                        <span>电影1</span>
-                        <span>00:00-02:00</span>
-                    </li>
                 </ul>
             </div>
         </div>

target/classes/static/css/adminSchedule.css

@@ -5,33 +5,33 @@
 
 .schedule-time-line {
     width: 80px;
-    height: 720px;
     display: flex;
     flex-direction: column;
     justify-content: space-between;
 }
 
 .schedule-item-line {
-    height: 720px;
+    height: 960px;
     width: 150px;
     border-left: 1px solid #ccc;
     position: relative;
 }
 
 .schedule-item {
-    background: #1caaaa;
-    height:80px;
+    width: 100%;
     display: flex;
     flex-direction: column;
-    justify-content: center;
     align-items: center;
     color: #fff;
+    position: absolute;
+    overflow-y: scroll;
 }
 
 .schedule-date-container {
     padding-left: 100px;
-    height: 30px;
+    height: 40px;
     line-height: 30px;
+    display: flex;
 }
 
 .schedule-date {

target/classes/static/js/adminScheduleManage.js

@@ -1,12 +1,13 @@
 var colors = [
-    '#66cccc',
-    '#0099cc',
+    '#FF6666',
+    '#FFFF33',
     '#FF9933',
+    '#66cccc',
     '#FFCCCC',
     '#3399FF',
-    '#FFFF33',
+
     '#9966FF',
-    '#FF6666',
+
 ];
 
 function formatDate(date){
@@ -18,19 +19,78 @@ function formatDate(date){
     return year+'-'+month+'-'+day;
 }
 
+function formatTime(date){
+    return date.getHours()+":"+date.getMinutes();
+}
+
 $(document).ready(function() {
     var hallId,
         scheduleDate = formatDate(new Date());
 
     initSelectAndDate();
 
+    function getSchedules() {
+        var schedules = [];
+        postRequest(
+            '/schedule/search',
+            {
+                hallId: hallId,
+                startDate: scheduleDate
+             },
+            function (res) {
+                schedules = res.content;
+                console.log(schedules);
+                renderScheduleTable(schedules);
+             },
+            function (error) {
+                alert(JSON.stringify(error));
+             }
+        );
+    }
+
+    function renderScheduleTable(schedules){
+        $('.schedule-date-container').empty();
+        $(".schedule-time-line").siblings().remove();
+        schedules.forEach(function (scheduleOfDate) {
+            $('.schedule-date-container').append("<div class='schedule-date'>"+formatDate(new Date(scheduleOfDate.date))+"</div>");
+            var scheduleDateDom = $(" <ul class='schedule-item-line'></ul>");
+            $(".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+"'>"+
+                    "<span>"+schedule.movieName+"</span>"+
+                    "<span class='error-text'>¥"+schedule.fare+"</span>"+
+                    "<span>"+formatTime(new Date(schedule.startTime))+"-"+formatTime(new Date(schedule.endTime))+"</span>"+
+                    "</li>");
+            })
+        })
+    }
+
+    function mapScheduleStyle(schedule) {
+        var start = new Date(schedule.startTime).getHours()+new Date(schedule.startTime).getMinutes()/60,
+            end = new Date(schedule.endTime).getHours()+new Date(schedule.endTime).getMinutes()/60 ;
+        return {
+            color: colors[schedule.movieId%colors.length],
+            top: 40*start+'px',
+            height: 40*(end-start)+'px'
+        }
+    }
+
     function initSelectAndDate() {
         $('#schedule-date-input').val(scheduleDate);
         getCinemaHalls();
+        getAllMovies();
+        
+        // 过滤条件变化后重新查询
         $('#hall-select').change (function () {
             hallId=$(this).children('option:selected').val();
+            getSchedules();
+        });
+        $('#schedule-date-input').change(function () {
+            scheduleDate = $('#schedule-date-input').val();
+            getSchedules();
         });
-
     }
 
     function getCinemaHalls() {
@@ -39,10 +99,12 @@ $(document).ready(function() {
             '/hall/all',
             function (res) {
                 halls = res.content;
+                hallId = halls[0].id;
                 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>");
-                })
+                });
+                getSchedules();
             },
             function (error) {
                 alert(JSON.stringify(error));
@@ -50,5 +112,43 @@ $(document).ready(function() {
         );
     }
 
+    function getAllMovies() {
+        getRequest(
+            '/movie/all',
+            function (res) {
+                var movieList = res.content;
+                movieList.forEach(function (movie) {
+                    $('#schedule-movie-input').append("<option value="+ movie.id +">"+movie.name+"</option>");
+                });
+            },
+            function (error) {
+                alert(error);
+            }
+        );
+    }
+    
+    $('#schedule-form-btn').click(function () {
+        var form = {
+            hallId: $("#schedule-hall-input").children('option:selected').val(),
+            movieId : $("#schedule-movie-input").children('option:selected').val(),
+            startTime: $("#schedule-start-date-input").val(),
+            endTime: $("#schedule-end-date-input").val(),
+            fare: $("#schedule-price-input").val()
+        };
+        //todo 需要做一下表单验证？
+
+        postRequest(
+            '/schedule/add',
+            form,
+            function (res) {
+                getSchedules();
+                $("#scheduleModal").modal('hide');
+            },
+            function (error) {
+                alert(JSON.stringify(error));
+            }
+        );
+    })
+
 });
 

target/classes/templates/adminScheduleManage.html

@@ -63,10 +63,6 @@
                     <li class="schedule-time-item">24:00</li>
                 </ul>
                 <ul class="schedule-item-line">
-                    <li class="schedule-item">
-                        <span>电影1</span>
-                        <span>00:00-02:00</span>
-                    </li>
                 </ul>
             </div>
         </div>