房态管理-单日

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.svg" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.svg" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.svg" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.svg" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

.idea/workspace.xml

@@ -5,36 +5,20 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="42a0d34b-c484-4704-92dd-be5ac61d2f66" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/DateUtil.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/common/utils/Func.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HousePricePageVo.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HousePriceVo.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/compiler.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/compiler.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/encodings.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/jarRepositories.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/uiDesigner.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/api/HousePriceAPI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HousePriceAPI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HousePriceController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HousePriceController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HousePriceMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HousePriceMapper.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HousePriceService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HousePriceService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HousePriceServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HousePriceServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HousePriceMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HousePriceMapper.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/META-INF/spring-configuration-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HousePriceController.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HousePriceMapper.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HousePriceServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" beforeDir="false" afterPath="$PROJECT_DIR$/target/mybatis_plus-0.0.1-SNAPSHOT.jar.original" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.template.MybatisPlusApplicationTests.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/TEST-com.template.WrapperTest.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.template.MybatisPlusApplicationTests.txt" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/surefire-reports/com.template.WrapperTest.txt" beforeDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/uiDesigner.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/api/HouseNumberStateAPI.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/java/com/template/model/vo/HouseStateVo.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/template/AutoCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/AutoCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/controller/HouseController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/mapper/HouseNumberMapper.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/HouseNumberService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/template/services/impl/HouseNumberServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/template/HouseNumberMapper.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/AutoCode.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/controller/HouseController.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberMapper.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/mapper/HouseNumberMapper.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/template/services/impl/HouseNumberServiceImpl.class" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -44,6 +28,7 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
+        <option value="Interface" />
         <option value="Class" />
       </list>
     </option>
@@ -78,6 +63,7 @@
     "RequestMappingsPanelWidth1": "75",
     "RunOnceActivity.OpenProjectViewOnStart": "true",
     "RunOnceActivity.ShowReadmeOnStart": "true",
+    "SHARE_PROJECT_CONFIGURATION_FILES": "true",
     "WebServerToolWindowFactoryState": "false",
     "node.js.detected.package.eslint": "true",
     "node.js.detected.package.tslint": "true",
@@ -91,6 +77,10 @@
   }
 }]]></component>
   <component name="RecentsManager">
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper\template" />
+      <recent name="E:\company\iHotel_student_houtai\src\main\resources\mapper" />
+    </key>
     <key name="CopyClassDialog.RECENTS_KEY">
       <recent name="com.template.common.utils" />
     </key>
@@ -102,7 +92,20 @@
       </set>
     </option>
   </component>
-  <component name="RunManager">
+  <component name="RunManager" selected="Spring Boot.MybatisPlusApplication">
+    <configuration name="AutoCode" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
+      <option name="MAIN_CLASS_NAME" value="com.template.AutoCode" />
+      <module name="iHotel_student_houtai" />
+      <extension name="coverage">
+        <pattern>
+          <option name="PATTERN" value="com.template.*" />
+          <option name="ENABLED" value="true" />
+        </pattern>
+      </extension>
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
     <configuration name="MybatisPlusApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot" nameIsGenerated="true">
       <module name="iHotel_student_houtai" />
       <option name="SPRING_BOOT_MAIN_CLASS" value="com.template.MybatisPlusApplication" />
@@ -116,6 +119,11 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Application.AutoCode" />
+      </list>
+    </recent_temporary>
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="SshConsoleOptionsProvider">
@@ -129,7 +137,7 @@
       <option name="presentableId" value="Default" />
       <updated>1700186263832</updated>
       <workItem from="1700186265128" duration="1452000" />
-      <workItem from="1700187845025" duration="12974000" />
+      <workItem from="1700187845025" duration="28998000" />
     </task>
     <servers />
   </component>

src/main/java/com/template/AutoCode.java

@@ -39,10 +39,10 @@ public class AutoCode {
         mpg.setGlobalConfig(gc);
 //2、设置数据源
         DataSourceConfig dsc = new DataSourceConfig();
-        dsc.setUrl("jdbc:mysql://localhost:3306/ihotel_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai");
+        dsc.setUrl("jdbc:mysql://172.16.20.80:3306/ihotel_test?useUnicode=tru&characterEncoding=UTF-8&useSSL=false&useAffectedRows=true&allowPublicKeyRetrieval=true&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("root");
+        dsc.setPassword("Chuanghai_test");
         dsc.setDbType(DbType.MYSQL);
         mpg.setDataSource(dsc);
         //3、包的配置
@@ -56,7 +56,7 @@ public class AutoCode {
         mpg.setPackageInfo(pc);
         //4、策略配置
         StrategyConfig strategy = new StrategyConfig();
-        strategy.setInclude("house_price"); // 设置要映射的表名
+        strategy.setInclude("house_number_state"); // 设置要映射的表名
         strategy.setNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setColumnNaming(NamingStrategy.underline_to_camel);//下划线转驼峰
         strategy.setEntityLombokModel(true); // 自动lombok；

src/main/java/com/template/api/HouseNumberStateAPI.java

@@ -0,0 +1,21 @@
+package com.template.api;
+
+import com.template.model.result.CommonResult;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RequestMapping("/auto/house-number-state")
+public interface HouseNumberStateAPI {
+
+    @GetMapping("/dayList")
+    @ApiOperation(value = "房态管理-单日", notes = "房态管理-单日", httpMethod = "GET")
+    CommonResult page(String keyWord,String houseType,int page,int size);
+
+
+    @GetMapping("/calendarList")
+    @ApiOperation(value = "房态管理-日历", notes = "房态管理-日历", httpMethod = "GET")
+    CommonResult calendarPage(String startTime,String endTime,String keyWord,String houseType,int page,int size);
+
+
+}

src/main/java/com/template/controller/HouseController.java

@@ -1,6 +1,7 @@
 package com.template.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.annotation.Encrypt;
@@ -87,6 +88,15 @@ public class HouseController implements HouseAPI {
             return CommonResult.fail("该房型已存在");
         }
 
+//        房间号不能重复
+        LambdaQueryWrapper<HouseNumber> wrapperHn=new LambdaQueryWrapper<>();
+        wrapperHn.in(HouseNumber::getRoomNumber,roomNumbers);
+        List<HouseNumber> list = houseNumberService.list(wrapperHn);
+        if (ObjectUtils.isNotEmpty(list)&&list.size()>0) {
+            return CommonResult.fail("该房间号已存在");
+        }
+
+
         try {
             houseService.saveOrUpdate(house);
 

src/main/java/com/template/controller/HouseNumberStateController.java

@@ -0,0 +1,73 @@
+package com.template.controller;
+
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.sun.org.apache.bcel.internal.generic.NEW;
+import com.template.api.HouseNumberStateAPI;
+import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.HouseStateVo;
+import com.template.model.vo.HouseVo;
+import com.template.services.HouseNumberService;
+import com.template.services.HouseNumberStateService;
+import com.template.services.HouseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-11-20
+ */
+@RestController
+public class HouseNumberStateController implements HouseNumberStateAPI {
+
+    @Autowired
+    HouseNumberStateService houseNumberStateService;
+
+    @Autowired
+    HouseService houseService;
+
+    @Autowired
+    HouseNumberService houseNumberService;
+
+    @Override
+    public CommonResult page(String keyWord, String houseType, int page, int size) {
+
+        if (ObjectUtils.isEmpty(page) && page <= 0) {
+            page = 1;
+        }
+
+        if (ObjectUtils.isEmpty(size) && size <= 0) {
+            size= 10;
+        }
+
+//        当时时间
+        Date date = new Date();
+
+        PageUtils<HouseStateVo> pageVo=houseNumberService.houseStatePage(keyWord,houseType,page,size,date);
+
+        return CommonResult.ok(pageVo);
+    }
+
+    @Override
+    public CommonResult calendarPage(String startTime, String endTime, String keyWord, String houseType, int page, int size) {
+
+
+
+
+        return null;
+    }
+
+
+
+
+}
+

src/main/java/com/template/mapper/HouseNumberMapper.java

@@ -1,8 +1,14 @@
 package com.template.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.HouseNumber;
+import com.template.model.vo.HouseStateVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -15,4 +21,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface HouseNumberMapper extends BaseMapper<HouseNumber> {
 
+    IPage<HouseStateVo> houseStatePage(Page<HouseStateVo> pageVo, @Param("keyWord") String keyWord,@Param("houseType") String houseType,@Param("date") Date date);
 }

src/main/java/com/template/mapper/HouseNumberStateMapper.java

@@ -0,0 +1,18 @@
+package com.template.mapper;
+
+import com.template.model.pojo.HouseNumberState;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-11-20
+ */
+@Mapper
+public interface HouseNumberStateMapper extends BaseMapper<HouseNumberState> {
+
+}

src/main/java/com/template/model/pojo/HouseNumberState.java

@@ -0,0 +1,74 @@
+package com.template.model.pojo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-11-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="HouseNumberState对象", description="")
+public class HouseNumberState implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "房态表")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @ApiModelProperty(value = "房间的id")
+    private String houseNumberId;
+
+    @ApiModelProperty(value = "状态 1空闲、2预定、3入住、4脏房、5锁定")
+    private Integer status;
+
+    @ApiModelProperty(value = "状态开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "状态结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "预定订单id")
+    private String bookingId;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private Date updateTime;
+
+    @ApiModelProperty(value = "创建人员")
+    @TableField(fill = FieldFill.INSERT)
+    private String createUser;
+
+    @ApiModelProperty(value = "更新人员")
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateUser;
+
+    @ApiModelProperty(value = "逻辑删除 未删除：0；删除：1")
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer deleted;
+
+
+}

src/main/java/com/template/model/vo/HouseStateVo.java

@@ -0,0 +1,31 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class HouseStateVo {
+    private int id;
+
+    private String houseId;
+//      房间号
+    private String houseNumber;
+//   1.净房 2.脏房
+    private Integer houseStatus;
+
+//  房间状态 (无订单时的)  1.空闲 2.正在使用
+    private String houseType;
+//  房态状态(有订单时使用) 状态 1空闲、2预定、3入住、4脏房、5锁定
+    private String status;
+
+//    房型名称
+    private String houseName;
+
+//  预定人
+    private String reserveName;
+//    预计入住时间
+    private String reserveLiveTime;
+//    预计离开时间
+    private String reserveLeaveTime;
+
+
+}

src/main/java/com/template/services/HouseNumberService.java

@@ -2,6 +2,10 @@ package com.template.services;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.pojo.HouseNumber;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.HouseStateVo;
+
+import java.util.Date;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.template.model.pojo.HouseNumber;
  */
 public interface HouseNumberService extends IService<HouseNumber> {
 
+    PageUtils<HouseStateVo> houseStatePage(String keyWord, String houseType, int page, int size, Date date);
 }

src/main/java/com/template/services/HouseNumberStateService.java

@@ -0,0 +1,16 @@
+package com.template.services;
+
+import com.template.model.pojo.HouseNumberState;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-11-20
+ */
+public interface HouseNumberStateService extends IService<HouseNumberState> {
+
+}

src/main/java/com/template/services/impl/HouseNumberServiceImpl.java

@@ -1,11 +1,19 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.mapper.HouseNumberMapper;
 import com.template.model.pojo.HouseNumber;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.HouseStateVo;
+import com.template.model.vo.HouseVo;
 import com.template.services.HouseNumberService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +25,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class HouseNumberServiceImpl extends ServiceImpl<HouseNumberMapper, HouseNumber> implements HouseNumberService {
 
+    @Autowired
+    HouseNumberMapper houseNumberMapper;
+
+    @Override
+    public PageUtils<HouseStateVo> houseStatePage(String keyWord, String houseType, int page, int size, Date date) {
+        Page<HouseStateVo> pageVo = new Page<>(page,size);
+        IPage<HouseStateVo> result=houseNumberMapper.houseStatePage(pageVo,keyWord,houseType,date);
+        return new PageUtils(result);
+    }
 }

src/main/java/com/template/services/impl/HouseNumberStateServiceImpl.java

@@ -0,0 +1,20 @@
+package com.template.services.impl;
+
+import com.template.model.pojo.HouseNumberState;
+import com.template.mapper.HouseNumberStateMapper;
+import com.template.services.HouseNumberStateService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author ceshi
+ * @since 2023-11-20
+ */
+@Service
+public class HouseNumberStateServiceImpl extends ServiceImpl<HouseNumberStateMapper, HouseNumberState> implements HouseNumberStateService {
+
+}

src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -2,4 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.HouseNumberMapper">
 
+    <select id="houseStatePage" resultType="com.template.model.vo.HouseStateVo">
+        SELECT
+        hn.id AS id,
+        hn.house_id as houseId,
+        hn.room_number as houseNumber,
+        hn.house_status as houseStatus,
+        hn.`status` as houseType,
+        h.room_name as houseName,
+        hns.`status` AS status,
+        ho.reserve_name as reserveName,
+        ho.reserve_live_time as reserveLiveTime,
+        ho.reserve_leave_time as reserveLeaveTime
+        FROM
+        `house_number` hn
+        LEFT JOIN house h ON h.id = hn.house_id
+        AND h.deleted = 0
+        LEFT JOIN house_number_state hns ON hn.id = hns.house_number_id
+        AND hns.deleted = 0
+        AND #{date} > hns.start_time
+        AND hns.end_time > #{date}
+        LEFT JOIN house_order ho ON hns.booking_id = ho.id
+        AND ho.deleted = 0
+        <where>
+            hn.deleted = 0
+            <if test="houseType != null and houseType != ''">
+                AND h.room_type = #{houseType}
+            </if>
+
+            <if test="keyWord != null and keyWord != ''">
+                AND ( hn.room_number LIKE '%' #{keyWord} '%' OR ho.reserve_name LIKE '%' #{keyWord} '%' )
+            </if>
+
+        </where>
+        ORDER BY
+        hn.room_number
+    </select>
+
+
 </mapper>

src/main/resources/mapper/template/HouseNumberStateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.HouseNumberStateMapper">
+
+</mapper>

target/classes/mapper/template/HouseNumberMapper.xml

@@ -2,4 +2,42 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.HouseNumberMapper">
 
+    <select id="houseStatePage" resultType="com.template.model.vo.HouseStateVo">
+        SELECT
+        hn.id AS id,
+        hn.house_id as houseId,
+        hn.room_number as houseNumber,
+        hn.house_status as houseStatus,
+        hn.`status` as houseType,
+        h.room_name as houseName,
+        hns.`status` AS status,
+        ho.reserve_name as reserveName,
+        ho.reserve_live_time as reserveLiveTime,
+        ho.reserve_leave_time as reserveLeaveTime
+        FROM
+        `house_number` hn
+        LEFT JOIN house h ON h.id = hn.house_id
+        AND h.deleted = 0
+        LEFT JOIN house_number_state hns ON hn.id = hns.house_number_id
+        AND hns.deleted = 0
+        AND #{date} > hns.start_time
+        AND hns.end_time > #{date}
+        LEFT JOIN house_order ho ON hns.booking_id = ho.id
+        AND ho.deleted = 0
+        <where>
+            hn.deleted = 0
+            <if test="houseType != null and houseType != ''">
+                AND h.room_type = #{houseType}
+            </if>
+
+            <if test="keyWord != null and keyWord != ''">
+                AND ( hn.room_number LIKE '%' #{keyWord} '%' OR ho.reserve_name LIKE '%' #{keyWord} '%' )
+            </if>
+
+        </where>
+        ORDER BY
+        hn.room_number
+    </select>
+
+
 </mapper>

target/classes/mapper/template/HouseNumberStateMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.template.mapper.HouseNumberStateMapper">
+
+</mapper>