修改门锁记录表结构，开锁记录表结构和有关门禁记录表和开锁记录表的接口

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

@@ -18,7 +18,7 @@ public interface HouseLockControllerAPI {
 
     @GetMapping("/particular")
     @ApiOperation(value = "门锁详情展示", notes = "门锁详情展示", httpMethod = "GET")
-    CommonResult particular(String permissionSettingId,String equipmentType);
+    CommonResult particular(String permissionSettingId,Integer houseNumberId);
 
     @GetMapping("/key")
     @ApiOperation(value = "钥匙管理", notes = "钥匙管理", httpMethod = "GET")

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

@@ -10,7 +10,7 @@ public interface OperatingRecordControllerAPI {
 
     @GetMapping("/pageList")
     @ApiOperation(value = "操作记录表", notes = "操作记录表", httpMethod = "GET")
-    CommonResult pageList(String permissionSettingId, int page, int size, String roomNumber);
+    CommonResult pageList(String permissionSettingId, int page, int size, Integer houseNumberId);
 
 
 

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

@@ -10,7 +10,7 @@ public interface UnlockingRecordControllerAPI {
 
     @GetMapping("/pageList")
     @ApiOperation(value = "开锁记录表", notes = "开锁记录表", httpMethod = "GET")
-    CommonResult pageList(String permissionSettingId,int page, int size,String roomNumber);
+    CommonResult pageList(String permissionSettingId,int page, int size,Integer houseNumberId);
 
 
 }

src/main/java/com/template/common/utils/SubscribeSample.java

@@ -119,9 +119,11 @@ public class SubscribeSample{
                             HouseLock houseLock = list.get(0);
                             Integer houseNumberId = houseLock.getHouseNumberId();
                             HouseNumber byId = houseNumberService.getById(houseNumberId);
+                            unlockingRecord.setHouseNumberId(houseNumberId);
                             if (ObjectUtils.isNotEmpty(byId)) {
                                 String roomNumber = byId.getRoomNumber();
                                 unlockingRecord.setRoomNumber(roomNumber);
+                                unlockingRecord.setHouseNumberId(houseNumberId);
                             }
                         }
 

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

@@ -115,7 +115,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     }
 
     @Override
-    public CommonResult particular(String permissionSettingId, String equipmentType) {
+    public CommonResult particular(String permissionSettingId,Integer houseNumberId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -125,15 +125,34 @@ public class HouseLockController implements HouseLockControllerAPI {
         if (!"0".equals(houseTypeManagement) && !houseTypeManagement.contains("4")) {
             return CommonResult.fail("此账号暂无该权限");
         }
-
-        if (ObjectUtils.isEmpty(equipmentType)) {
+        if (ObjectUtils.isEmpty(houseNumberId)) {
             return CommonResult.fail("参数异常");
         }
 
+        LambdaQueryWrapper<HouseLock> wrapper=new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId,houseNumberId);
+        HouseLock houseLock = houseLockService.getOne(wrapper);
+        if (ObjectUtils.isEmpty(houseLock)) {
+            return CommonResult.fail("请先绑定门锁");
+        }
+
+        String equipmentType = houseLock.getEquipmentType();
+        if (ObjectUtils.isEmpty(equipmentType)) {
+            return CommonResult.fail("未绑定门锁设备");
+        }
         JSONObject particular = passwordIssController.particular(equipmentType);
+//        设备连接状态
+        String state = particular.getString("state");
+//        电量
+        String battery = particular.getString("battery");
+
+        houseLock.setElectricQuantity(battery);
+        houseLock.setNetworkState(state);
+        houseLock.setEquipmentState(state);
 
+        houseLockService.updateById(houseLock);
 
-        return CommonResult.ok(particular);
+        return CommonResult.ok(houseLock);
 
     }
 
@@ -188,6 +207,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 
             UnlockingRecord unlockingRecord = new UnlockingRecord();
             unlockingRecord.setRoomNumber(remoteUnlockingDto.getRoomNumber());
+            unlockingRecord.setHouseNumberId(remoteUnlockingDto.getHouseNumberId());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             unlockingRecord.setDateTime(LocalDateTime.now().format(dateTimeFormatter1));
             unlockingRecord.setUnlockType("远程开锁");
@@ -242,6 +262,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 
             OperatingRecord operatingRecord = new OperatingRecord();
             operatingRecord.setType("解绑设备");
+           operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -323,6 +344,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 //            操作记录
             OperatingRecord operatingRecord = new OperatingRecord();
             operatingRecord.setType("绑定设备");
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

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

@@ -376,13 +376,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         if (ObjectUtils.isNotEmpty(houseNumberState)) {
 
-//            状态 1空闲、2预定、3入住、4脏房、5锁定、6维修
+//            状态 1空闲、2脏房、3预定、4入住、5锁定、6维修
             Integer status1 = houseNumberState.getStatus();
 //            订单号
             String bookingId = houseNumberState.getOrderNumber();
             vo.setHouseStatus(status1);
 //            预定
-            if (status1 == 2) {
+            if (status1 == 3) {
 //                预定
                 String statusBar = "2,5,11";
                 vo.setStatusBar(statusBar);
@@ -392,8 +392,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     HouseOrder houseOrder = houseOrderService.getOne(wrapperHo);
                     String reserveName = houseOrder.getReserveName();
                     vo.setName(reserveName);
+//                    入住时间
+                    vo.setLiveTime(houseOrder.getReserveLiveTime());
+//                    预定离店时间
+                    vo.setLeaveTime(houseOrder.getReserveLeaveTime());
                 }
-            } else if (status1 == 3) {
+            } else if (status1 == 4) {
 //                入住
                 if (ObjectUtils.isNotEmpty(bookingId)) {
                     LambdaQueryWrapper<HouseOrder> wrapperHo = new LambdaQueryWrapper<>();
@@ -405,7 +409,9 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     vo.setStatusBar(statusBar);
                     Date liveTime = houseOrder.getLiveTime();
 //                    入住时间
-                    vo.setLiveTime(liveTime);
+                    vo.setLiveTime(houseOrder.getReserveLiveTime());
+//                    预定离店时间
+                    vo.setLeaveTime(houseOrder.getReserveLeaveTime());
 //                  付款
                     vo.setPayPrice(houseOrder.getPayPrice());
 //                    已入住时间
@@ -432,7 +438,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
 
                 }
-            } else if (status1 == 4) {
+            } else if (status1 == 2) {
 //                脏房
                 String statusBar = "11,12";
                 vo.setStatusBar(statusBar);
@@ -440,6 +446,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //                锁定
                 String statusBar = "6,11";
                 vo.setStatusBar(statusBar);
+                String startTime = houseNumberState.getStartTime();
+                String endTime = houseNumberState.getEndTime();
+//              开始时间，结束时间
+                vo.setStateTime(startTime);
+                vo.setEndTime(endTime);
             } else if (status1 == 6) {
 //                维修
                 String statusBar = "5,11";
@@ -905,6 +916,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             Admin byId = adminService.getById(checkIdCardDto.getAdminId());
 
             OperatingRecord operatingRecord = new OperatingRecord();
+
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setRoomNumber(roomNumber);
             operatingRecord.setOperatorName(byId.getName());
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
@@ -1171,6 +1184,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
 
                 OperatingRecord operatingRecord = new OperatingRecord();
+
+                operatingRecord.setHouseNumberId(houseNumber1.getId());
                 operatingRecord.setRoomNumber(houseNumber1.getRoomNumber());
                 operatingRecord.setOperatorName(byId.getName());
                 DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -1194,6 +1209,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //          添加锁的操作记录
 
             OperatingRecord operatingRecord = new OperatingRecord();
+
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
             operatingRecord.setOperatorName(byId.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

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

@@ -490,6 +490,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //              添加锁的操作记录
                 OperatingRecord operatingRecord = new OperatingRecord();
                 operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+                operatingRecord.setHouseNumberId(houseNumber.getId());
                 operatingRecord.setOperatorName(users.getUserName());
                 operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
                 operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
@@ -853,6 +854,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
             OperatingRecord operatingRecord = new OperatingRecord();
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setOperatorName(byId.getName());
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
             operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
@@ -1199,6 +1201,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
                 OperatingRecord operatingRecord = new OperatingRecord();
                 operatingRecord.setRoomNumber(houseNumber1.getRoomNumber());
+                operatingRecord.setHouseNumberId(houseNumber1.getId());
                 operatingRecord.setOperatorName(byId.getName());
                 DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
@@ -1222,6 +1225,7 @@ public class HouseOrderController implements HouseOrderAPI {
 //             添加锁的操作记录
             OperatingRecord operatingRecord = new OperatingRecord();
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setOperatorName(byId.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));

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

@@ -8,13 +8,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.OperatingRecordControllerAPI;
 import com.template.model.pojo.OperatingRecord;
 import com.template.model.pojo.PermissionSetting;
-import com.template.model.pojo.UnlockingRecord;
 import com.template.model.result.CommonResult;
 import com.template.services.OperatingRecordService;
 import com.template.services.PermissionSettingService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -35,7 +32,7 @@ public class OperatingRecordController implements OperatingRecordControllerAPI {
     OperatingRecordService operatingRecordService;
 
     @Override
-    public CommonResult pageList(String permissionSettingId, int page, int size, String roomNumber) {
+    public CommonResult pageList(String permissionSettingId, int page, int size, Integer houseNumberId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -52,12 +49,12 @@ public class OperatingRecordController implements OperatingRecordControllerAPI {
         if (ObjectUtils.isEmpty(size) && size <= 0) {
             size = 10;
         }
-        if (ObjectUtils.isEmpty(roomNumber)) {
+        if (ObjectUtils.isEmpty(houseNumberId)) {
             return CommonResult.fail("参数异常");
         }
 
         LambdaQueryWrapper<OperatingRecord> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(OperatingRecord::getRoomNumber,roomNumber)
+        wrapper.eq(OperatingRecord::getHouseNumberId,houseNumberId)
                 .orderByDesc(OperatingRecord::getDataTime);
         IPage<OperatingRecord> operatingRecordIPage = operatingRecordService.page(new Page<>(page, size), wrapper);
 

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

@@ -12,14 +12,11 @@ import com.template.model.result.CommonResult;
 import com.template.services.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * <p>
@@ -112,6 +109,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
 
             OperatingRecord operatingRecord = new OperatingRecord();
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
@@ -171,6 +169,8 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
 //        添加操作记录
 
             OperatingRecord operatingRecord = new OperatingRecord();
+
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -231,6 +231,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
 //        添加操作记录
 
             OperatingRecord operatingRecord = new OperatingRecord();
+            operatingRecord.setHouseNumberId(houseNumber.getId());
             operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

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

@@ -1,12 +1,10 @@
 package com.template.controller;
 
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.template.api.UnlockingControllerAPI;
 import com.template.api.UnlockingRecordControllerAPI;
 import com.template.model.pojo.PermissionSetting;
 import com.template.model.pojo.UnlockingRecord;
@@ -14,8 +12,6 @@ import com.template.model.result.CommonResult;
 import com.template.services.PermissionSettingService;
 import com.template.services.UnlockingRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -36,7 +32,7 @@ public class UnlockingRecordController implements UnlockingRecordControllerAPI {
     PermissionSettingService permissionSettingService;
 
     @Override
-    public CommonResult pageList(String permissionSettingId, int page, int size,String roomNumber) {
+    public CommonResult pageList(String permissionSettingId, int page, int size,Integer houseNumberId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -53,12 +49,12 @@ public class UnlockingRecordController implements UnlockingRecordControllerAPI {
         if (ObjectUtils.isEmpty(size) && size <= 0) {
             size = 10;
         }
-        if (ObjectUtils.isEmpty(roomNumber)) {
+        if (ObjectUtils.isEmpty(houseNumberId)) {
             return CommonResult.fail("参数异常");
         }
 
         LambdaQueryWrapper<UnlockingRecord> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(UnlockingRecord::getRoomNumber,roomNumber)
+        wrapper.eq(UnlockingRecord::getHouseNumberId,houseNumberId)
                 .orderByDesc(UnlockingRecord::getDateTime);
         IPage<UnlockingRecord> unlockingRecordIPage = unlockingRecordService.page(new Page<>(page, size), wrapper);
 

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

@@ -18,6 +18,6 @@ import org.apache.ibatis.annotations.Param;
 public interface UnlockingRecordMapper extends BaseMapper<UnlockingRecord> {
 
 
-    void getSave(@Param("roomNumber") String roomNumber, @Param("unlockType") String unlockType,@Param("dateTime") String dateTime,@Param("createTime") String createTime,@Param("updateTime") String updateTime,@Param("createUser") String createUser, @Param("updateUser")String updateUser);
+    void getSave(@Param("houseNumberId") Integer houseNumberId,@Param("roomNumber") String roomNumber, @Param("unlockType") String unlockType,@Param("dateTime") String dateTime,@Param("createTime") String createTime,@Param("updateTime") String updateTime,@Param("createUser") String createUser, @Param("updateUser")String updateUser);
 
 }

src/main/java/com/template/model/dto/RemoteUnlocking.java

@@ -13,9 +13,12 @@ public class RemoteUnlocking {
     public String luid;
 
     //    房间号id
-    @NotNull(message = "房间号id不能为空")
+    @NotNull(message = "房间号不能为空")
     private String roomNumber;
 
+    @NotNull(message = "房间号id不能为空")
+    private Integer houseNumberId;
+
     @NotNull(message = "权限表id不能为空")
     private String permissionSettingId;
 

src/main/java/com/template/model/mqtt/PushCallback.java

@@ -129,6 +129,7 @@ public class PushCallback implements MqttCallback {
                     if (ObjectUtils.isNotEmpty(byId)) {
                         String roomNumber = byId.getRoomNumber();
                         unlockingRecord.setRoomNumber(roomNumber);
+                        unlockingRecord.setHouseNumberId(houseNumberId);
                     }
                 }
 

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

@@ -1,19 +1,14 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -34,6 +29,9 @@ public class OperatingRecord implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty(value = "房间号id")
+    private Integer houseNumberId;
+
     @ApiModelProperty(value = "房间号")
     private String roomNumber;
 

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

@@ -1,19 +1,14 @@
 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 com.baomidou.mybatisplus.annotation.*;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * <p>
  * 
@@ -34,8 +29,11 @@ public class UnlockingRecord implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
-     @ApiModelProperty(value = "房间号")
-    private String roomNumber;;
+    @ApiModelProperty(value = "房间号")
+    private String roomNumber;
+
+    @ApiModelProperty(value = "房间号Id")
+    private Integer houseNumberId;
 
     @ApiModelProperty(value = "开锁类型")
     private String unlockType;

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

@@ -3,7 +3,6 @@ package com.template.model.vo;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 public class ParticularHouseNumberStatusVo {
@@ -20,10 +19,10 @@ public class ParticularHouseNumberStatusVo {
     private String name;
 
 //  入住时间
-    private Date liveTime;
+    private String liveTime;
 
 //    离开时间
-    private Date leaveTime;
+    private String leaveTime;
 
 //    付款金额
     private BigDecimal payPrice;
@@ -44,6 +43,6 @@ public class ParticularHouseNumberStatusVo {
 //    结束时间
     private String endTime;
 
-//    房间状态 状态 1空闲、2预定、3入住、4脏房、5锁定、6维修
+//    房间状态 状态 1空闲、2脏房、3预定、4入住、5锁定、6维修
     private int houseStatus;
 }

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

@@ -1,11 +1,10 @@
 package com.template.services.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.template.mapper.UnlockingRecordMapper;
 import com.template.model.mqtt.SpringUtil;
 import com.template.model.pojo.UnlockingRecord;
-import com.template.mapper.UnlockingRecordMapper;
 import com.template.services.UnlockingRecordService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
@@ -24,7 +23,7 @@ public class UnlockingRecordServiceImpl extends ServiceImpl<UnlockingRecordMappe
     @Override
     public void getSave(UnlockingRecord unlockingRecord){
         UnlockingRecordMapper unlockingRecordMapper = SpringUtil.getBean(UnlockingRecordMapper.class);
-        unlockingRecordMapper.getSave(unlockingRecord.getRoomNumber(),unlockingRecord.getUnlockType(),unlockingRecord.getDateTime(),unlockingRecord.getCreateTime(),unlockingRecord.getUpdateTime(),unlockingRecord.getCreateUser(),unlockingRecord.getUpdateUser());
+        unlockingRecordMapper.getSave(unlockingRecord.getHouseNumberId(),unlockingRecord.getRoomNumber(),unlockingRecord.getUnlockType(),unlockingRecord.getDateTime(),unlockingRecord.getCreateTime(),unlockingRecord.getUpdateTime(),unlockingRecord.getCreateUser(),unlockingRecord.getUpdateUser());
 
     }
 }

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

@@ -3,6 +3,6 @@
 <mapper namespace="com.template.mapper.UnlockingRecordMapper">
 
     <select id="getSave" resultType="java.lang.Boolean">
-        insert into  unlocking_record (room_number,unlock_type,date_time,create_time,update_time,create_user,update_user,deleted) values (#{roomNumber},#{unlockType},#{dateTime},#{createTime},#{updateTime},#{createUser},#{updateUser},0)
+        insert into  unlocking_record (house_number_id,room_number,unlock_type,date_time,create_time,update_time,create_user,update_user,deleted) values (#{houseNumberId},#{roomNumber},#{unlockType},#{dateTime},#{createTime},#{updateTime},#{createUser},#{updateUser},0)
     </select>
 </mapper>