删除锁用户

.idea/workspace.xml

@@ -2,21 +2,15 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="d16108f5-debc-4823-8524-a063f2a24602" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/static/doc/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/doc/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/controller/HotelOrderController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/controller/HotelOrderController.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/scheduled/SystemScheduled.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/scheduled/SystemScheduled.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.class" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/static/doc/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/static/doc/index.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar.original" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.chuanghai.ihotel.IhotelApplicationTests.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/ihotel-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.chuanghai.ihotel.IhotelApplicationTests.xml" beforeDir="false" afterPath="$PROJECT_DIR$/target/surefire-reports/TEST-com.chuanghai.ihotel.IhotelApplicationTests.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt" beforeDir="false" afterPath="$PROJECT_DIR$/target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/classes/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -46,28 +40,86 @@
   <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/chuanghai/ihotel/controller/StatisticalReportController.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/config/RabbitMQConfig.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="286">
-              <caret line="43" column="64" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="64" />
+            <state relative-caret-position="2116">
+              <caret line="110" column="27" selection-start-line="110" selection-start-column="27" selection-end-line="110" selection-end-column="27" />
+              <folding>
+                <element signature="e#2225#2226#0" expanded="true" />
+                <element signature="e#2291#2292#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
+        <entry file="file://$PROJECT_DIR$/src/main/resources/static/doc/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="158">
-              <caret line="545" selection-start-line="545" selection-end-line="545" />
+            <state>
+              <caret column="3269" selection-start-column="3269" selection-end-column="3269" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="239">
+              <caret line="184" column="19" lean-forward="true" selection-start-line="184" selection-start-column="19" selection-end-line="184" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="237">
-              <caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
+            <state relative-caret-position="217">
+              <caret line="124" column="34" lean-forward="true" selection-start-line="124" selection-start-column="34" selection-end-line="124" selection-end-column="34" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="170">
+              <caret line="917" column="31" selection-start-line="917" selection-start-column="16" selection-end-line="917" selection-end-column="31" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="146">
+              <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/RoomThirdSettingService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="299">
+              <caret line="14" column="39" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="39" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomThirdSettingServiceImpl.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="299">
+              <caret line="24" column="46" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="46" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelOrderService.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1518">
+              <caret line="81" column="22" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" />
             </state>
           </provider>
         </entry>
@@ -94,23 +146,9 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>submit</find>
-      <find>1669615819186888706</find>
-      <find>根据I</find>
-      <find>getById</find>
-      <find>submitOrder</find>
-      <find>/return</find>
-      <find>useOfElectric</find>
-      <find>办理退房</find>
-      <find>token</find>
-      <find>user/order/hold</find>
-      <find>queryPowerRealTimeData</find>
-      <find>spring-boot-autoconfigure</find>
-      <find>org.springframework.boot</find>
       <find>generateBill</find>
       <find>userGetOrderById</find>
       <find>userHoldOrder</find>
-      <find>userReturnOrder</find>
       <find>calcBill</find>
       <find>补缴</find>
       <find>1561549059160961028</find>
@@ -124,6 +162,20 @@
       <find>statisticalReport(</find>
       <find>statisticalReportService</find>
       <find>statisticalReport</find>
+      <find>org.apache</find>
+      <find>@Pa</find>
+      <find>handleOrderMessage</find>
+      <find>productOrderHandler</find>
+      <find>order.close.queue</find>
+      <find>orderCloseQueue</find>
+      <find>退房</find>
+      <find>userReturnOrder</find>
+      <find>deleteLockUser</find>
+      <find>findByRoomId</find>
+      <find>deleteByOrderId</find>
+      <find>userDeleteOrder</find>
+      <find>user/order</find>
+      <find>user/order/{orderId}</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -156,7 +208,6 @@
         <option value="$PROJECT_DIR$/src/main/resources/mapper/ihotel/HotelFingerprintDao.xml" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelFingerprintService.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dao/HotelFingerprintDao.java" />
-        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/PasswordIssController.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/enums/OpenElectricStatuEnum.java" />
         <option value="$PROJECT_DIR$/src/main/resources/mapper/ihotel/RoomRealtimeStatuDao.xml" />
@@ -190,6 +241,7 @@
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java" />
         <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java" />
+        <option value="$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java" />
       </list>
     </option>
   </component>
@@ -218,7 +270,7 @@
       <select />
     </treeState>
   </component>
-  <component name="ProjectFrameBounds">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="974" />
     <option name="height" value="1039" />
@@ -228,8 +280,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -270,6 +320,24 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="ihotel" type="462c0819:PsiDirectoryNode" />
+              <item name="component" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ihotel" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ihotel-backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="ihotel" type="462c0819:PsiDirectoryNode" />
+              <item name="constant" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ihotel" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ihotel-backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="ihotel" type="462c0819:PsiDirectoryNode" />
               <item name="controller" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -279,6 +347,24 @@
               <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="java" type="462c0819:PsiDirectoryNode" />
               <item name="ihotel" type="462c0819:PsiDirectoryNode" />
+              <item name="entity" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ihotel" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ihotel-backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="ihotel" type="462c0819:PsiDirectoryNode" />
+              <item name="listener" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ihotel" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ihotel-backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="ihotel" type="462c0819:PsiDirectoryNode" />
               <item name="service" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -296,6 +382,15 @@
               <item name="ihotel-backend" type="462c0819:PsiDirectoryNode" />
               <item name="src" type="462c0819:PsiDirectoryNode" />
               <item name="main" type="462c0819:PsiDirectoryNode" />
+              <item name="java" type="462c0819:PsiDirectoryNode" />
+              <item name="ihotel" type="462c0819:PsiDirectoryNode" />
+              <item name="vo" type="462c0819:PsiDirectoryNode" />
+            </path>
+            <path>
+              <item name="ihotel" type="b2602c69:ProjectViewProjectNode" />
+              <item name="ihotel-backend" type="462c0819:PsiDirectoryNode" />
+              <item name="src" type="462c0819:PsiDirectoryNode" />
+              <item name="main" type="462c0819:PsiDirectoryNode" />
               <item name="resources" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -318,6 +413,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -417,18 +514,28 @@
       <workItem from="1687320126031" duration="1618000" />
       <workItem from="1687328364965" duration="20000" />
       <workItem from="1687329747970" duration="66000" />
-      <workItem from="1687329870975" duration="7042000" />
+      <workItem from="1687329870975" duration="8502000" />
+      <workItem from="1687657652208" duration="4729000" />
+      <workItem from="1687747094986" duration="149000" />
+      <workItem from="1687750068864" duration="297000" />
+      <workItem from="1687763295929" duration="23000" />
+      <workItem from="1687765592976" duration="288000" />
+      <workItem from="1687771747905" duration="15000" />
+      <workItem from="1687850320194" duration="1073000" />
+      <workItem from="1687934389915" duration="2531000" />
+      <workItem from="1687938610218" duration="57000" />
+      <workItem from="1687938713327" duration="193000" />
+      <workItem from="1687938929808" duration="1952000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="179985000" />
+    <option name="totallyTimeSpent" value="192752000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-7" y="0" width="974" height="1039" extended-state="0" />
-    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" weight="0.28198293" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.16301969" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Designer" order="2" />
       <window_info id="JRebel" order="3" side_tool="true" />
@@ -439,8 +546,8 @@
       <window_info id="Web" order="8" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32932165" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32713348" />
-      <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.35911602" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3238512" />
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.35557988" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -457,7 +564,7 @@
       <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="right" id="Maven" order="3" weight="0.84115136" />
+      <window_info anchor="right" id="Maven" order="3" weight="0.78993434" />
       <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" weight="0.32995737" />
@@ -537,478 +644,364 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/ElectricVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/WaterElectricComponent.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="233">
-          <caret line="13" column="24" selection-start-line="13" selection-start-column="24" selection-end-line="13" selection-end-column="24" />
+        <state relative-caret-position="177">
+          <caret line="145" selection-start-line="145" selection-end-line="145" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/RoomRealDataStatuVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="37" column="16" selection-start-line="37" selection-start-column="16" selection-end-line="37" selection-end-column="16" />
+        <state relative-caret-position="-229">
+          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/request/AdminLoginRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/util/AesUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="505">
+          <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/RoomRealtimeStatuController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/OrderBillHandleVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="254">
-          <caret line="75" column="47" selection-start-line="75" selection-start-column="33" selection-end-line="75" selection-end-column="47" />
+        <state relative-caret-position="102">
+          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/static/doc/index.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderBillServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="185">
-          <caret line="777" column="3046" selection-start-line="777" selection-start-column="3046" selection-end-line="777" selection-end-column="3046" />
-          <folding>
-            <element signature="e#371274#371280#0" expanded="true" />
-            <element signature="e#371444#371450#0" expanded="true" />
-            <element signature="e#371581#371587#0" expanded="true" />
-            <element signature="e#371692#371698#0" expanded="true" />
-            <element signature="e#371761#371767#0" expanded="true" />
-            <element signature="e#371844#371850#0" expanded="true" />
-            <element signature="e#371962#371968#0" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#9;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="e#380936#380942#0" expanded="true" />
-            <element signature="e#380942#380948#0" expanded="true" />
-            <element signature="e#380948#380954#0" expanded="true" />
-            <element signature="e#380954#380960#0" expanded="true" />
-            <element signature="e#380960#380966#0" expanded="true" />
-            <element signature="e#381303#381309#0" expanded="true" />
-            <element signature="e#381309#381315#0" expanded="true" />
-            <element signature="e#381315#381321#0" expanded="true" />
-            <element signature="e#381321#381327#0" expanded="true" />
-            <element signature="e#381327#381333#0" expanded="true" />
-            <element signature="e#381668#381674#0" expanded="true" />
-            <element signature="e#381674#381680#0" expanded="true" />
-            <element signature="e#381680#381686#0" expanded="true" />
-            <element signature="e#381686#381692#0" expanded="true" />
-            <element signature="e#381692#381698#0" expanded="true" />
-            <element signature="e#382033#382039#0" expanded="true" />
-            <element signature="e#382039#382045#0" expanded="true" />
-            <element signature="e#382045#382051#0" expanded="true" />
-            <element signature="e#382051#382057#0" expanded="true" />
-            <element signature="e#382057#382063#0" expanded="true" />
-            <element signature="e#382398#382404#0" expanded="true" />
-            <element signature="e#382404#382410#0" expanded="true" />
-            <element signature="e#382410#382416#0" expanded="true" />
-            <element signature="e#382416#382422#0" expanded="true" />
-            <element signature="e#382422#382428#0" expanded="true" />
-            <element signature="e#382767#382773#0" expanded="true" />
-            <element signature="e#382773#382779#0" expanded="true" />
-            <element signature="e#382779#382785#0" expanded="true" />
-            <element signature="e#382785#382791#0" expanded="true" />
-            <element signature="e#382791#382797#0" expanded="true" />
-            <element signature="e#383139#383145#0" expanded="true" />
-            <element signature="e#383145#383151#0" expanded="true" />
-            <element signature="e#383151#383157#0" expanded="true" />
-            <element signature="e#383157#383163#0" expanded="true" />
-            <element signature="e#383163#383169#0" expanded="true" />
-            <element signature="e#383514#383520#0" expanded="true" />
-            <element signature="e#383520#383526#0" expanded="true" />
-            <element signature="e#383526#383532#0" expanded="true" />
-            <element signature="e#383532#383538#0" expanded="true" />
-            <element signature="e#383538#383544#0" expanded="true" />
-            <element signature="e#497098#497104#0" expanded="true" />
-            <element signature="e#497272#497278#0" expanded="true" />
-            <element signature="e#497425#497431#0" expanded="true" />
-            <element signature="e#497494#497500#0" expanded="true" />
-            <element signature="e#497577#497583#0" expanded="true" />
-            <element signature="e#497695#497701#0" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#1;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#2;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#2;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#2;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#2;n#div#3;n#div#0;n#div#12;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="430">
+          <caret line="145" column="74" selection-start-line="145" selection-start-column="65" selection-end-line="145" selection-end-column="74" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/request/StatuIdRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/enums/OrderStatuEnum.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="299">
+          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomThirdSettingServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelOrderBillEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="343">
-          <caret line="40" column="47" selection-start-line="40" selection-start-column="31" selection-end-line="40" selection-end-column="47" />
+        <state relative-caret-position="356">
+          <caret line="75" column="7" selection-start-line="75" selection-start-column="7" selection-end-line="75" selection-end-column="7" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/RoomThirdSettingController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dto/BillHandleResultDTO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="279">
-          <caret line="97" column="45" selection-start-line="97" selection-start-column="45" selection-end-line="97" selection-end-column="45" />
+        <state relative-caret-position="220">
+          <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/RoomTypeEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-751">
-          <caret line="29" column="13" selection-start-line="29" selection-start-column="13" selection-end-line="29" selection-end-column="13" />
+        <state relative-caret-position="269">
+          <caret line="193" column="30" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/RoomTypeController.java">
+    <entry file="file://$PROJECT_DIR$/target/classes/static/doc/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-498">
-          <caret line="80" column="57" lean-forward="true" selection-start-line="80" selection-start-column="57" selection-end-line="80" selection-end-column="57" />
+        <state relative-caret-position="193">
+          <caret line="879" column="462" selection-start-line="879" selection-start-column="462" selection-end-line="879" selection-end-column="462" />
+          <folding>
+            <element signature="e#556114#556120#0" expanded="true" />
+            <element signature="e#556305#556311#0" expanded="true" />
+            <element signature="e#556456#556462#0" expanded="true" />
+            <element signature="e#556576#556582#0" expanded="true" />
+            <element signature="e#556651#556657#0" expanded="true" />
+            <element signature="e#556769#556775#0" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/fasterxml/jackson/core/jackson-annotations/2.13.3/jackson-annotations-2.13.3-sources.jar!/com/fasterxml/jackson/annotation/JsonFormat.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="84" column="17" selection-start-line="84" selection-start-column="17" selection-end-line="84" selection-end-column="17" />
+        <state relative-caret-position="361">
+          <caret line="108" column="42" selection-start-line="108" selection-start-column="42" selection-end-line="108" selection-end-column="42" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/RoomThirdSettingEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/common/utils/PageParam.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="21" column="70" lean-forward="true" selection-start-line="21" selection-start-column="70" selection-end-line="21" selection-end-column="70" />
+        <state relative-caret-position="-80">
+          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelAdminEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/request/StatisticalReportRequest.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="194">
-          <caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
+        <state relative-caret-position="197">
+          <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/chuanghai/ihotel/entity/HotelOrderEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="208">
-          <caret line="67" column="37" lean-forward="true" selection-start-line="67" selection-start-column="37" selection-end-line="67" selection-end-column="37" />
+        <state relative-caret-position="237">
+          <caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/HotelAdminDao.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/StatisticalReportController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="230">
-          <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
+        <state relative-caret-position="667">
+          <caret line="43" column="64" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="64" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/listener/ProductOrderMQListener.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelAdminService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="192">
-          <caret line="29" column="71" lean-forward="true" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
+        <state relative-caret-position="253">
+          <caret line="17" column="69" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="69" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelStaffServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/ConditionController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
+        <state relative-caret-position="437">
+          <caret line="19" selection-start-line="19" selection-end-line="19" selection-end-column="43" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.3.1/mybatis-plus-extension-3.3.1-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/mybatis/mybatis/3.5.3/mybatis-3.5.3-sources.jar!/org/apache/ibatis/annotations/Param.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="195" column="14" selection-start-line="195" selection-start-column="14" selection-end-line="195" selection-end-column="14" />
-          <folding>
-            <element signature="e#5473#5474#0" expanded="true" />
-            <element signature="e#5526#5527#0" expanded="true" />
-          </folding>
+        <state relative-caret-position="23">
+          <caret line="15" column="25" selection-start-line="15" selection-start-column="8" selection-end-line="15" selection-end-column="25" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/RoomEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/AdminOrderIndexVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="49" column="17" selection-start-line="49" selection-start-column="17" selection-end-line="49" selection-end-column="17" />
+        <state relative-caret-position="322">
+          <caret line="14" selection-start-line="14" selection-end-line="14" selection-end-column="5" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/request/SubmitOrderRequest.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-587">
-          <caret line="17" column="13" selection-start-line="17" selection-start-column="13" selection-end-line="17" selection-end-column="13" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/SystemSettingDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/bind/annotation/PostMapping.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="45" column="18" selection-start-line="45" selection-start-column="18" selection-end-line="45" selection-end-column="18" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/SystemNoticeDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/anno/ParamCheck.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="207">
-          <caret line="12" column="18" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/RoomTypeDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelOrderBillService.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="217">
-          <caret line="38" column="24" selection-start-line="38" selection-start-column="24" selection-end-line="38" selection-end-column="24" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/RoomThirdSettingDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/5.3.22/spring-web-5.3.22-sources.jar!/org/springframework/web/client/RestTemplate.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="184">
-          <caret line="148" column="11" selection-start-line="148" selection-start-column="11" selection-end-line="148" selection-end-column="11" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/RoomRealtimeStatuDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/pom.xml">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/common/utils/PageUtils.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="437">
-          <caret line="28" column="21" selection-start-line="19" selection-start-column="8" selection-end-line="28" selection-end-column="21" />
+        <state relative-caret-position="341">
+          <caret line="56" column="44" selection-start-line="56" selection-start-column="36" selection-end-line="56" selection-end-column="44" />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-core/5.3.22/spring-core-5.3.22-sources.jar!/org/springframework/cglib/proxy/MethodProxy.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="92">
-          <caret line="215" column="19" selection-start-line="215" selection-start-column="19" selection-end-line="215" selection-end-column="19" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/HotelUserDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/constant/RedisKey.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="529">
-          <caret line="23" column="31" selection-start-line="23" selection-start-column="31" selection-end-line="23" selection-end-column="31" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/RoomDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/IhotelApplication.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/HotelOrderDao.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="138">
-          <caret line="6" selection-start-line="6" selection-end-line="6" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="460">
+          <caret line="20" column="34" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelAdminService.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/amqp/spring-rabbit/2.4.6/spring-rabbit-2.4.6-sources.jar!/org/springframework/amqp/rabbit/annotation/RabbitHandler.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="253">
-          <caret line="17" column="69" lean-forward="true" selection-start-line="17" selection-start-column="43" selection-end-line="17" selection-end-column="69" />
+        <state relative-caret-position="494">
+          <caret line="48" column="18" selection-start-line="48" selection-start-column="18" selection-end-line="48" selection-end-column="18" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelAdminServiceImpl.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/rabbitmq/amqp-client/5.14.2/amqp-client-5.14.2-sources.jar!/com/rabbitmq/client/Channel.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="115">
-          <caret line="26" selection-start-line="26" selection-end-line="26" selection-end-column="29" />
+        <state relative-caret-position="782">
+          <caret line="57" column="17" selection-start-line="57" selection-start-column="17" selection-end-line="57" selection-end-column="17" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/ConditionController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/HotelAdminDao.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="34" selection-start-line="34" selection-end-line="34" selection-end-column="15" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="230">
+          <caret line="10" column="45" selection-start-line="10" selection-start-column="45" selection-end-line="10" selection-end-column="45" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/WaterElectricComponent.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="177">
-          <caret line="145" selection-start-line="145" selection-end-line="145" />
-        </state>
-      </provider>
+    <entry file="file://$PROJECT_DIR$/src/main/resources/mapper/ihotel/HotelDepartmentDao.xml">
+      <provider selected="true" editor-type-id="text-editor" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/SystemSettingEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelAdminServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-229">
-          <caret line="21" column="13" selection-start-line="21" selection-start-column="13" selection-end-line="21" selection-end-column="13" />
+        <state relative-caret-position="552">
+          <caret line="45" column="65" selection-start-line="45" selection-start-column="56" selection-end-line="45" selection-end-column="65" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/DoorLockComponent.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelDepartmentServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="183">
-          <caret line="47" selection-start-line="47" selection-end-line="47" />
+        <state relative-caret-position="138">
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/util/AesUtils.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelFingerprintServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="505">
-          <caret line="57" column="9" selection-start-line="57" selection-start-column="9" selection-end-line="57" selection-end-column="9" />
+        <state relative-caret-position="805">
+          <caret line="54" column="37" selection-start-line="54" selection-start-column="33" selection-end-line="54" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/OrderBillHandleVO.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/listener/ProductOrderMQListener.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="102">
-          <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" />
+        <state relative-caret-position="207">
+          <caret line="20" column="60" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="60" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="175">
-          <caret line="118" selection-start-line="118" selection-end-line="118" />
+        <state relative-caret-position="243">
+          <caret line="105" column="8" selection-start-line="105" selection-start-column="8" selection-end-line="109" selection-end-column="21" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderBillServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/RoomThirdSettingEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="430">
-          <caret line="145" column="74" selection-start-line="145" selection-start-column="65" selection-end-line="145" selection-end-column="74" />
+        <state relative-caret-position="272">
+          <caret line="18" column="30" selection-start-line="18" selection-start-column="12" selection-end-line="18" selection-end-column="30" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/enums/OrderStatuEnum.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/RoomDoorLockDataEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="299">
-          <caret line="13" column="4" selection-start-line="13" selection-start-column="4" selection-end-line="13" selection-end-column="4" />
+        <state relative-caret-position="677">
+          <caret line="59" column="29" selection-start-line="59" selection-start-column="19" selection-end-line="59" selection-end-column="29" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/entity/HotelOrderBillEntity.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/component/DoorLockComponent.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="356">
-          <caret line="75" column="7" selection-start-line="75" selection-start-column="7" selection-end-line="75" selection-end-column="7" />
+        <state relative-caret-position="295">
+          <caret line="98" column="16" selection-start-line="98" selection-start-column="16" selection-end-line="98" selection-end-column="16" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/dto/BillHandleResultDTO.java">
+    <entry file="jar://$MAVEN_REPOSITORY$/com/baomidou/mybatis-plus-extension/3.3.1/mybatis-plus-extension-3.3.1-sources.jar!/com/baomidou/mybatisplus/extension/service/IService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="220">
-          <caret line="19" column="19" selection-start-line="19" selection-start-column="19" selection-end-line="19" selection-end-column="19" />
+        <state relative-caret-position="295">
+          <caret line="102" column="20" selection-start-line="102" selection-start-column="20" selection-end-line="102" selection-end-column="20" />
+          <folding>
+            <element signature="e#3033#3034#0" expanded="true" />
+            <element signature="e#3105#3106#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/config/RabbitMQConfig.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1138">
-          <caret line="297" column="79" selection-start-line="297" selection-start-column="64" selection-end-line="297" selection-end-column="79" />
+        <state relative-caret-position="2116">
+          <caret line="110" column="27" selection-start-line="110" selection-start-column="27" selection-end-line="110" selection-end-column="27" />
+          <folding>
+            <element signature="e#2225#2226#0" expanded="true" />
+            <element signature="e#2291#2292#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/resources/static/doc/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="269">
-          <caret line="193" column="30" selection-start-line="193" selection-start-column="16" selection-end-line="193" selection-end-column="30" />
+        <state>
+          <caret column="3269" selection-start-column="3269" selection-end-column="3269" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/target/classes/static/doc/index.html">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/RoomThirdSettingService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="193">
-          <caret line="879" column="462" selection-start-line="879" selection-start-column="462" selection-end-line="879" selection-end-column="462" />
-          <folding>
-            <element signature="e#556114#556120#0" expanded="true" />
-            <element signature="e#556305#556311#0" expanded="true" />
-            <element signature="e#556456#556462#0" expanded="true" />
-            <element signature="e#556576#556582#0" expanded="true" />
-            <element signature="e#556651#556657#0" expanded="true" />
-            <element signature="e#556769#556775#0" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#0;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#4;n#colgroup#0;n#table#1;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#0;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#1;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#2;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#col#3;n#colgroup#0;n#table#2;n#div#0;n#div#0;n#div#14;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="299">
+          <caret line="14" column="39" selection-start-line="14" selection-start-column="27" selection-end-line="14" selection-end-column="39" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomRealtimeStatuServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomThirdSettingServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="361">
-          <caret line="108" column="42" selection-start-line="108" selection-start-column="42" selection-end-line="108" selection-end-column="42" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state relative-caret-position="299">
+          <caret line="24" column="46" selection-start-line="24" selection-start-column="34" selection-end-line="24" selection-end-column="46" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/common/utils/PageParam.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/HotelOrderService.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-80">
-          <caret line="11" column="13" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
+        <state relative-caret-position="1518">
+          <caret line="81" column="22" selection-start-line="81" selection-start-column="22" selection-end-line="81" selection-end-column="22" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/request/StatisticalReportRequest.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/StatisticalReportServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="197">
-          <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="276">
+          <caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/StatisticalReportController.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="286">
-          <caret line="43" column="64" selection-start-line="43" selection-start-column="53" selection-end-line="43" selection-end-column="64" />
+        <state relative-caret-position="146">
+          <caret line="90" lean-forward="true" selection-start-line="90" selection-end-line="90" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/StatisticalReportServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="276">
-          <caret line="51" column="13" selection-start-line="51" selection-start-column="13" selection-end-line="51" selection-end-column="37" />
+        <state relative-caret-position="170">
+          <caret line="917" column="31" selection-start-line="917" selection-start-column="16" selection-end-line="917" selection-end-column="31" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="158">
-          <caret line="545" selection-start-line="545" selection-end-line="545" />
+        <state relative-caret-position="239">
+          <caret line="184" column="19" lean-forward="true" selection-start-line="184" selection-start-column="19" selection-end-line="184" selection-end-column="19" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/scheduled/SystemScheduled.java">
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/chuanghai/ihotel/vo/UserOrderDetailVO.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="237">
-          <caret line="37" column="39" selection-start-line="37" selection-start-column="39" selection-end-line="37" selection-end-column="39" />
+        <state relative-caret-position="217">
+          <caret line="124" column="34" lean-forward="true" selection-start-line="124" selection-start-column="34" selection-end-line="124" selection-end-column="34" />
         </state>
       </provider>
     </entry>

src/main/java/com/chuanghai/ihotel/service/impl/RoomDoorLockDataServiceImpl.java

@@ -81,7 +81,7 @@ public class RoomDoorLockDataServiceImpl extends ServiceImpl<RoomDoorLockDataDao
                 throw new RRException(BizCodeEnume.UNKNOW_EXCEPTION, "门锁不存在");
             }
             try {
-                doorLockComponent.deleteLockUser(roomThirdSettingEntity.getLockId(), lockData.getLockId());
+                doorLockComponent.deleteLockUser(roomThirdSettingEntity.getLockId(), lockData.getLockUserId());
             } catch (Exception e) {}
 
             // 删除锁

target/surefire-reports/com.chuanghai.ihotel.IhotelApplicationTests.txt

@@ -1,4 +1,4 @@
 -------------------------------------------------------------------------------
 Test set: com.chuanghai.ihotel.IhotelApplicationTests
 -------------------------------------------------------------------------------
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.344 s - in com.chuanghai.ihotel.IhotelApplicationTests
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.255 s - in com.chuanghai.ihotel.IhotelApplicationTests