Ver Fonte

排片信息

jacksenma há 7 anos atrás
pai
commit
dcc53aff4a

+ 206 - 107
.idea/workspace.xml

@@ -2,20 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="6ab6cf33-62bd-48c1-935e-834777603958" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/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/bl/ScheduleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/bl/ScheduleService.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/bl/ScheduleService.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/bl/ScheduleServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/bl/ScheduleServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/controller/ScheduleController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/controller/ScheduleController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/data/ScheduleMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/example/cinema/vo/ScheduleForm.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/example/cinema/vo/ScheduleForm.class" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/target/" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -88,24 +83,24 @@
         <counts>
           <entry key="gitignore" value="1" />
           <entry key="hall" value="2" />
-          <entry key="java" value="150" />
+          <entry key="java" value="156" />
           <entry key="movie" value="8" />
           <entry key="movie_like" value="1" />
-          <entry key="schedule" value="14" />
+          <entry key="schedule" value="15" />
           <entry key="sql" value="10" />
           <entry key="user" value="2" />
           <entry key="view" value="1" />
-          <entry key="xml" value="22" />
+          <entry key="xml" value="23" />
           <entry key="yml" value="5" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="Database Element" value="28" />
-          <entry key="JAVA" value="150" />
+          <entry key="Database Element" value="29" />
+          <entry key="JAVA" value="156" />
           <entry key="PLAIN_TEXT" value="1" />
           <entry key="Scratch" value="10" />
-          <entry key="XML" value="22" />
+          <entry key="XML" value="23" />
           <entry key="YAML" value="5" />
         </counts>
       </usages-collector>
@@ -114,20 +109,20 @@
           <entry key="cell" value="110" />
           <entry key="dummy" value="8" />
           <entry key="gitignore" value="6" />
-          <entry key="java" value="4976" />
+          <entry key="java" value="5467" />
           <entry key="sql" value="614" />
           <entry key="txt" value="6" />
-          <entry key="xml" value="748" />
+          <entry key="xml" value="902" />
           <entry key="yml" value="34" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="JAVA" value="4976" />
+          <entry key="JAVA" value="5467" />
           <entry key="PLAIN_TEXT" value="20" />
-          <entry key="SQL" value="49" />
+          <entry key="SQL" value="54" />
           <entry key="Scratch" value="724" />
-          <entry key="XML" value="699" />
+          <entry key="XML" value="848" />
           <entry key="YAML" value="34" />
         </counts>
       </usages-collector>
@@ -135,6 +130,18 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="172">
+              <caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -147,11 +154,23 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="329">
+              <caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-1011">
-              <caret line="29" column="64" selection-start-line="29" selection-start-column="64" selection-end-line="29" selection-end-column="64" />
+            <state relative-caret-position="205">
+              <caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
               <folding>
                 <element signature="imports" expanded="true" />
                 <element signature="method#searchScheduleSevenDays#0;class#ScheduleServiceImpl#0" />
@@ -161,6 +180,79 @@
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ResponseVO.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="242">
+              <caret line="36" column="29" selection-start-line="36" selection-start-column="29" selection-end-line="36" selection-end-column="29" />
+            </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="1110">
+              <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#453#454#0" expanded="true" />
+                <element signature="e#482#483#0" expanded="true" />
+                <element signature="e#527#528#0" expanded="true" />
+                <element signature="e#563#564#0" expanded="true" />
+                <element signature="e#598#599#0" expanded="true" />
+                <element signature="e#628#629#0" expanded="true" />
+                <element signature="e#675#676#0" expanded="true" />
+                <element signature="e#713#714#0" expanded="true" />
+                <element signature="e#747#748#0" expanded="true" />
+                <element signature="e#779#780#0" expanded="true" />
+                <element signature="e#827#828#0" expanded="true" />
+                <element signature="e#869#870#0" expanded="true" />
+                <element signature="e#901#902#0" expanded="true" />
+                <element signature="e#931#932#0" expanded="true" />
+                <element signature="e#975#976#0" expanded="true" />
+                <element signature="e#1013#1014#0" expanded="true" />
+                <element signature="e#1044#1045#0" expanded="true" />
+                <element signature="e#1071#1072#0" expanded="true" />
+                <element signature="e#1111#1112#0" expanded="true" />
+                <element signature="e#1143#1144#0" expanded="true" />
+                <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>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <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="164">
+              <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <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="404">
+              <caret line="88" column="26" selection-start-line="88" selection-start-column="8" selection-end-line="88" selection-end-column="26" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FileTemplateManagerImpl">
@@ -175,6 +267,11 @@
       </list>
     </option>
   </component>
+  <component name="FindInProjectRecents">
+    <findStrings>
+      <find>System.out.println</find>
+    </findStrings>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -219,14 +316,14 @@
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ViewDaysForm.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleViewForm.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml" />
-        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java" />
         <option value="$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/controller/ScheduleController.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.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" />
       </list>
     </option>
   </component>
@@ -308,7 +405,7 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
-              <item name="bl" type="462c0819:PsiDirectoryNode" />
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
@@ -319,15 +416,6 @@
               <item name="cinema" type="462c0819:PsiDirectoryNode" />
               <item name="data" 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="java" type="462c0819:PsiDirectoryNode" />
-              <item name="cinema" type="462c0819:PsiDirectoryNode" />
-              <item name="po" type="462c0819:PsiDirectoryNode" />
-            </path>
             <path>
               <item name="cinema" type="b2602c69:ProjectViewProjectNode" />
               <item name="CinemaDemo" type="462c0819:PsiDirectoryNode" />
@@ -383,7 +471,7 @@
     <property name="RequestMappingsPanelWidth1" value="75" />
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
-    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555147142421" />
+    <property name="com.android.tools.idea.instantapp.provision.ProvisionBeforeRunTaskProvider.myTimeStamp" value="1555150083424" />
     <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" />
@@ -504,7 +592,7 @@
       <workItem from="1555049499640" duration="7967000" />
       <workItem from="1555075438175" duration="2603000" />
       <workItem from="1555085752711" duration="4527000" />
-      <workItem from="1555133493417" duration="6753000" />
+      <workItem from="1555133493417" duration="9768000" />
     </task>
     <servers />
   </component>
@@ -541,7 +629,7 @@
     </history-entry>
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="38697000" />
+    <option name="totallyTimeSpent" value="41712000" />
   </component>
   <component name="TodoView">
     <todo-panel id="selected-file">
@@ -566,8 +654,8 @@
       <window_info id="Web" order="7" side_tool="true" />
       <window_info anchor="bottom" id="Problems" order="0" />
       <window_info anchor="bottom" id="Message" order="1" />
-      <window_info anchor="bottom" id="Find" order="2" />
-      <window_info active="true" anchor="bottom" id="Run" order="3" visible="true" weight="0.32054794" />
+      <window_info anchor="bottom" id="Find" order="2" weight="0.32876712" />
+      <window_info anchor="bottom" id="Run" order="3" visible="true" weight="0.32054794" />
       <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" />
@@ -590,7 +678,7 @@
       <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" />
-      <window_info anchor="right" id="Database" order="6" visible="true" weight="0.22617124" />
+      <window_info active="true" anchor="right" id="Database" order="6" visible="true" weight="0.22617124" />
       <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" />
@@ -801,26 +889,6 @@
         </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="337">
-          <caret line="39" column="41" selection-start-line="39" selection-start-column="41" selection-end-line="39" selection-end-column="41" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </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="300">
-          <caret line="38" column="15" selection-start-line="38" selection-start-column="15" selection-end-line="38" selection-end-column="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleBatchDeleteForm.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
@@ -841,51 +909,33 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleItem.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="393">
-          <caret line="28" column="24" lean-forward="true" selection-start-line="9" selection-start-column="4" selection-end-line="28" selection-end-column="24" />
+        <state relative-caret-position="103">
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
           <folding>
-            <element signature="e#453#454#0" expanded="true" />
-            <element signature="e#482#483#0" expanded="true" />
-            <element signature="e#527#528#0" expanded="true" />
-            <element signature="e#563#564#0" expanded="true" />
-            <element signature="e#598#599#0" expanded="true" />
-            <element signature="e#628#629#0" expanded="true" />
-            <element signature="e#675#676#0" expanded="true" />
-            <element signature="e#713#714#0" expanded="true" />
-            <element signature="e#747#748#0" expanded="true" />
-            <element signature="e#779#780#0" expanded="true" />
-            <element signature="e#827#828#0" expanded="true" />
-            <element signature="e#869#870#0" expanded="true" />
-            <element signature="e#901#902#0" expanded="true" />
-            <element signature="e#931#932#0" expanded="true" />
-            <element signature="e#975#976#0" expanded="true" />
-            <element signature="e#1013#1014#0" expanded="true" />
-            <element signature="e#1044#1045#0" expanded="true" />
-            <element signature="e#1071#1072#0" expanded="true" />
-            <element signature="e#1111#1112#0" expanded="true" />
-            <element signature="e#1143#1144#0" expanded="true" />
+            <element signature="e#1027#1028#0" expanded="true" />
+            <element signature="e#1057#1058#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleItem.java">
+    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="103">
-          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
+        <state relative-caret-position="224">
+          <caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
           <folding>
-            <element signature="e#1027#1028#0" expanded="true" />
-            <element signature="e#1057#1058#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/po/Schedule.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="289">
-          <caret line="34" column="28" selection-start-line="34" selection-start-column="28" selection-end-line="34" selection-end-column="28" />
+        <state relative-caret-position="120">
+          <caret line="8" column="16" selection-start-line="8" selection-start-column="16" selection-end-line="8" selection-end-column="16" />
           <folding>
+            <element signature="e#497#498#0" expanded="true" />
             <element signature="e#522#523#0" expanded="true" />
             <element signature="e#559#560#0" expanded="true" />
             <element signature="e#587#588#0" expanded="true" />
@@ -913,34 +963,69 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/vo/ScheduleForm.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1110">
+          <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#453#454#0" expanded="true" />
+            <element signature="e#482#483#0" expanded="true" />
+            <element signature="e#527#528#0" expanded="true" />
+            <element signature="e#563#564#0" expanded="true" />
+            <element signature="e#598#599#0" expanded="true" />
+            <element signature="e#628#629#0" expanded="true" />
+            <element signature="e#675#676#0" expanded="true" />
+            <element signature="e#713#714#0" expanded="true" />
+            <element signature="e#747#748#0" expanded="true" />
+            <element signature="e#779#780#0" expanded="true" />
+            <element signature="e#827#828#0" expanded="true" />
+            <element signature="e#869#870#0" expanded="true" />
+            <element signature="e#901#902#0" expanded="true" />
+            <element signature="e#931#932#0" expanded="true" />
+            <element signature="e#975#976#0" expanded="true" />
+            <element signature="e#1013#1014#0" expanded="true" />
+            <element signature="e#1044#1045#0" expanded="true" />
+            <element signature="e#1071#1072#0" expanded="true" />
+            <element signature="e#1111#1112#0" expanded="true" />
+            <element signature="e#1143#1144#0" expanded="true" />
+            <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/java/com/example/cinema/vo/ResponseVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <caret line="17" column="78" selection-start-line="17" selection-start-column="66" selection-end-line="17" selection-end-column="78" />
+        <state relative-caret-position="242">
+          <caret line="36" column="29" selection-start-line="36" selection-start-column="29" selection-end-line="36" selection-end-column="29" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/data/ScheduleMapper.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="298">
-          <caret line="75" column="21" selection-start-line="75" selection-start-column="21" selection-end-line="75" selection-end-column="21" />
+        <state relative-caret-position="404">
+          <caret line="88" column="26" selection-start-line="88" selection-start-column="8" selection-end-line="88" selection-end-column="26" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </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" />
+    <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="172">
+          <caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/test/java/com/example/cinema/bl/ScheduleServiceImplTest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="224">
-          <caret line="28" column="40" selection-start-line="28" selection-start-column="40" selection-end-line="28" selection-end-column="40" />
+        <state relative-caret-position="329">
+          <caret line="49" column="15" selection-start-line="49" selection-start-column="15" selection-end-line="49" selection-end-column="15" />
           <folding>
             <element signature="imports" expanded="true" />
           </folding>
@@ -949,8 +1034,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-1011">
-          <caret line="29" column="64" selection-start-line="29" selection-start-column="64" selection-end-line="29" selection-end-column="64" />
+        <state relative-caret-position="205">
+          <caret line="55" column="22" selection-start-line="55" selection-start-column="22" selection-end-line="55" selection-end-column="22" />
           <folding>
             <element signature="imports" expanded="true" />
             <element signature="method#searchScheduleSevenDays#0;class#ScheduleServiceImpl#0" />
@@ -959,6 +1044,20 @@
         </state>
       </provider>
     </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/java/com/example/cinema/data/ScheduleMapper.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="164">
+          <caret line="58" column="34" selection-start-line="58" selection-start-column="34" selection-end-line="58" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

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

@@ -41,4 +41,11 @@ public interface ScheduleService {
      * @return
      */
     ResponseVO deleteBatchOfSchedule(ScheduleBatchDeleteForm scheduleBatchDeleteForm);
+
+    /**
+     * 修改排片信息
+     * @param scheduleForm
+     * @return
+     */
+    ResponseVO updateSchedule(ScheduleForm scheduleForm);
 }

+ 82 - 49
src/main/java/com/example/cinema/bl/ScheduleServiceImpl.java

@@ -40,46 +40,26 @@ public class ScheduleServiceImpl implements ScheduleService {
     @Override
     public ResponseVO addSchedule(ScheduleForm scheduleForm) {
         try {
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-
-            // 处理排片跨天错误
-            if(!simpleDateFormat.format(scheduleForm.getStartTime()).equals(simpleDateFormat.format(scheduleForm.getEndTime()))){
-                return ResponseVO.buildFailure(CROSS_DAYS_ERROR_MESSAGE);
-            }
-
-            //检查影厅是否存在
-            if(hallMapper.selectHallById(scheduleForm.getHallId()) == null){
-                return ResponseVO.buildFailure(HALL_NOT_EXIST_ERROR_MESSAGE);
-            }
-
-            // 检查电影是否存在
-            MovieVO movieVO = movieMapper.selectMovieById(scheduleForm.getMovieId());
-            if(movieVO == null){
-                return ResponseVO.buildFailure(MOVIE_NOT_EXIST_ERROR_MESSAGE);
-            }
-
-            // 检查电影的上映时间是否和排片时间匹配
-            if(scheduleForm.getStartTime().before(movieVO.getStartDate())){
-                return ResponseVO.buildFailure(BEFORE_START_DATE_ERROR_MESSAGE);
-            }
-
-            // 校验排片时间段合法性
-            int minutes = movieVO.getLength();
-            Calendar calendarStartTime = Calendar.getInstance();
-            calendarStartTime.setTime(scheduleForm.getStartTime());
-            calendarStartTime.add(Calendar.MINUTE, minutes);
-            Date endTime = calendarStartTime.getTime();
-            if(scheduleForm.getEndTime().before(endTime)){
-                return ResponseVO.buildFailure(DATE_INTERVAL_LESS_THAN_LENGTH_ERROR_MESSAGE);
+            ResponseVO responseVO = preCheck(scheduleForm);
+            if(!responseVO.getSuccess()){
+                return responseVO;
             }
+            scheduleMapper.insertOneSchedule(scheduleForm);
+            return ResponseVO.buildSuccess();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseVO.buildFailure("失败");
+        }
+    }
 
-            // 检查该排片时间段是否和其他排片信息冲突
-            if(0 != scheduleMapper.selectScheduleConflictByHallIdAndTime(scheduleForm.getHallId(), scheduleForm.getStartTime(), scheduleForm.getEndTime()).size()){
-                return ResponseVO.buildFailure(TIME_CONFLICT_ERROR_MESSAGE);
+    @Override
+    public ResponseVO updateSchedule(ScheduleForm scheduleForm) {
+        try {
+            ResponseVO responseVO = preCheck(scheduleForm);
+            if(!responseVO.getSuccess()){
+                return responseVO;
             }
-
-            //插入排片信息
-            scheduleMapper.insertOneSchedule(scheduleForm);
+            scheduleMapper.updateScheduleById(scheduleForm);
             return ResponseVO.buildSuccess();
         } catch (Exception e) {
             e.printStackTrace();
@@ -93,20 +73,14 @@ public class ScheduleServiceImpl implements ScheduleService {
             // 处理查询表单的起止时间
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             startDate = simpleDateFormat.parse(simpleDateFormat.format(startDate));
-
-            Calendar calendarStartDate = Calendar.getInstance();
-            calendarStartDate.setTime(startDate);
-            calendarStartDate.add(Calendar.DAY_OF_YEAR, 7);
-            Date endDate = calendarStartDate.getTime();
+            Date endDate = getNumDayAfterDate(startDate, 7);
 
             // 按照日期整理ScheduleItem
             List<ScheduleItem> scheduleItemList = scheduleMapper.selectSchedule(hallId, startDate, endDate);
             List<ScheduleVO> scheduleVOList = new ArrayList<>();
 
             for(int i = 0; i < 7; i++){
-                calendarStartDate.setTime(startDate);
-                calendarStartDate.add(Calendar.DAY_OF_YEAR, i);
-                Date date = calendarStartDate.getTime();
+                Date date = getNumDayAfterDate(startDate, i);
                 ScheduleVO scheduleVO = new ScheduleVO();
                 scheduleVO.setDate(date);
                 List<ScheduleItem> scheduleItems = new ArrayList<>();
@@ -160,10 +134,7 @@ public class ScheduleServiceImpl implements ScheduleService {
 
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             Date today = simpleDateFormat.parse(simpleDateFormat.format(new Date()));
-            Calendar calendarStartTime = Calendar.getInstance();
-            calendarStartTime.setTime(today);
-            calendarStartTime.add(Calendar.DAY_OF_YEAR, scheduleMapper.selectView());
-            Date endDate = calendarStartTime.getTime();
+            Date endDate = getNumDayAfterDate(today, scheduleMapper.selectView());
 
             List<ScheduleItem> scheduleList = scheduleMapper.selectScheduleBatch(scheduleIdList);
             for(ScheduleItem s : scheduleList){
@@ -179,4 +150,66 @@ public class ScheduleServiceImpl implements ScheduleService {
             return ResponseVO.buildFailure("失败");
         }
     }
+
+
+
+    /**
+     * 获得num天后的日期
+     * @param oldDate
+     * @param num
+     * @return
+     * @throws ParseException
+     */
+    Date getNumDayAfterDate(Date oldDate, int num) throws ParseException {
+        Calendar calendarTime = Calendar.getInstance();
+        calendarTime.setTime(oldDate);
+        calendarTime.add(Calendar.DAY_OF_YEAR, num);
+        return calendarTime.getTime();
+    }
+
+
+    ResponseVO preCheck(ScheduleForm scheduleForm){
+        try {
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+            // 处理排片跨天错误
+            if(!simpleDateFormat.format(scheduleForm.getStartTime()).equals(simpleDateFormat.format(scheduleForm.getEndTime()))){
+                return ResponseVO.buildFailure(CROSS_DAYS_ERROR_MESSAGE);
+            }
+
+            //检查影厅是否存在
+            if(hallMapper.selectHallById(scheduleForm.getHallId()) == null){
+                return ResponseVO.buildFailure(HALL_NOT_EXIST_ERROR_MESSAGE);
+            }
+
+            // 检查电影是否存在
+            MovieVO movieVO = movieMapper.selectMovieById(scheduleForm.getMovieId());
+            if(movieVO == null){
+                return ResponseVO.buildFailure(MOVIE_NOT_EXIST_ERROR_MESSAGE);
+            }
+
+            // 检查电影的上映时间是否和排片时间匹配
+            if(scheduleForm.getStartTime().before(movieVO.getStartDate())){
+                return ResponseVO.buildFailure(BEFORE_START_DATE_ERROR_MESSAGE);
+            }
+
+            // 校验排片时间段合法性
+            int minutes = movieVO.getLength();
+            Calendar calendarStartTime = Calendar.getInstance();
+            calendarStartTime.setTime(scheduleForm.getStartTime());
+            calendarStartTime.add(Calendar.MINUTE, minutes);
+            Date endTime = calendarStartTime.getTime();
+            if(scheduleForm.getEndTime().before(endTime)){
+                return ResponseVO.buildFailure(DATE_INTERVAL_LESS_THAN_LENGTH_ERROR_MESSAGE);
+            }
+
+            // 检查该排片时间段是否和其他排片信息冲突
+            if(0 != scheduleMapper.selectScheduleConflictByHallIdAndTime(scheduleForm.getHallId(), scheduleForm.getStartTime(), scheduleForm.getEndTime()).size()){
+                return ResponseVO.buildFailure(TIME_CONFLICT_ERROR_MESSAGE);
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+        return ResponseVO.buildSuccess();
+    }
 }

+ 5 - 0
src/main/java/com/example/cinema/controller/ScheduleController.java

@@ -24,6 +24,11 @@ public class ScheduleController {
         return scheduleService.addSchedule(scheduleForm);
     }
 
+    @RequestMapping(value = "/schedule/update", method = RequestMethod.POST)
+    public ResponseVO updateSchedule(@RequestBody ScheduleForm scheduleForm){
+        return scheduleService.updateSchedule(scheduleForm);
+    }
+
     @RequestMapping(value = "/schedule/search", method = RequestMethod.GET)
     public ResponseVO searchSchedule(@RequestParam int hallId, @RequestParam Date startDate){
         //这里传递startDate参数时,前端传的是用/分隔的时间,例如startDate=2019/04/12

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

@@ -1,6 +1,6 @@
 package com.example.cinema.data;
 
-import com.example.cinema.po.Schedule;
+
 import com.example.cinema.vo.ScheduleForm;
 import com.example.cinema.vo.ScheduleItem;
 import com.example.cinema.vo.ScheduleViewForm;
@@ -80,4 +80,11 @@ public interface ScheduleMapper {
      * @return
      */
     int selectView();
+
+    /**
+     * 根据id修改排片信息
+     * @param scheduleForm
+     * @return
+     */
+    int updateScheduleById(ScheduleForm scheduleForm);
 }

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

@@ -54,6 +54,13 @@
         select day from view limit 1
     </select>
 
+    <update id="updateScheduleById" parameterType="com.example.cinema.vo.ScheduleForm">
+        update schedule set hall_id = #{hallId}, movie_id = #{movieId}, start_time = #{startTime},
+          end_time = #{endTime}, fare = #{fare}
+          where id = #{id}
+
+    </update>
+
     <resultMap id="ScheduleItem" type="com.example.cinema.vo.ScheduleItem">
         <id column="id" property="id"></id>
         <result column="hall_id" property="hallId"></result>

+ 0 - 82
src/main/java/com/example/cinema/po/Schedule.java

@@ -1,82 +0,0 @@
-package com.example.cinema.po;
-
-import java.util.Date;
-
-/**
- * @author fjj
- * @date 2019/4/13 4:16 PM
- */
-public class Schedule {
-    /**
-     * 排片id
-     */
-    private Integer id;
-    /**
-     * 影厅id
-     */
-    private Integer hallId;
-    /**
-     * 电影id
-     */
-    private Integer movieId;
-    /**
-     *  电影开始放映的时间
-     */
-    private Date startTime;
-    /**
-     * 电影结束放映的时间
-     */
-    private Date endTime;
-    /**
-     * 电影票价
-     */
-    private Double fare;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getHallId() {
-        return hallId;
-    }
-
-    public void setHallId(Integer hallId) {
-        this.hallId = hallId;
-    }
-
-    public Integer getMovieId() {
-        return movieId;
-    }
-
-    public void setMovieId(Integer movieId) {
-        this.movieId = movieId;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public Double getFare() {
-        return fare;
-    }
-
-    public void setFare(Double fare) {
-        this.fare = fare;
-    }
-}

+ 12 - 0
src/main/java/com/example/cinema/vo/ScheduleForm.java

@@ -7,6 +7,10 @@ import java.util.Date;
  * @date 2019/4/11 4:09 PM
  */
 public class ScheduleForm {
+    /**
+     * id
+     */
+    private Integer id;
     /**
      * 影厅id
      */
@@ -67,4 +71,12 @@ public class ScheduleForm {
     public void setFare(Double fare) {
         this.fare = fare;
     }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
 }

BIN
target/classes/com/example/cinema/bl/ScheduleService.class


BIN
target/classes/com/example/cinema/bl/ScheduleServiceImpl.class


BIN
target/classes/com/example/cinema/controller/ScheduleController.class


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


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

@@ -54,6 +54,13 @@
         select day from view limit 1
     </select>
 
+    <update id="updateScheduleById" parameterType="com.example.cinema.vo.ScheduleForm">
+        update schedule set hall_id = #{hallId}, movie_id = #{movieId}, start_time = #{startTime},
+          end_time = #{endTime}, fare = #{fare}
+          where id = #{id}
+
+    </update>
+
     <resultMap id="ScheduleItem" type="com.example.cinema.vo.ScheduleItem">
         <id column="id" property="id"></id>
         <result column="hall_id" property="hallId"></result>

BIN
target/classes/com/example/cinema/vo/ScheduleForm.class