修改小程序房型管理接口，管理端房态管理换房，订单管理换房接口

src/main/java/com/template/MybatisPlusApplication.java

@@ -1,7 +1,6 @@
 package com.template;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationArguments;
+
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cache.annotation.EnableCaching;
@@ -22,7 +21,9 @@ public class MybatisPlusApplication {
     public static void main(String[] args) {
 
         SpringApplication.run(MybatisPlusApplication.class, args);
+
     }
+   
 
 //    /**
 //     * mqtt 初始化

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

@@ -0,0 +1,90 @@
+package com.template.common.utils;
+
+import cn.hutool.core.exceptions.UtilException;
+
+import java.util.concurrent.*;
+
+/**
+ * 全局公共线程池
+ */
+public class MyGlobalThreadPool {
+	private static ExecutorService executor;
+
+	private MyGlobalThreadPool() {
+	}
+
+	static {
+		init();
+	}
+
+	/**
+	 * 初始化全局线程池
+	 */
+	synchronized public static void init() {
+		if (null != executor) {
+			executor.shutdownNow();
+		}
+		executor = new ThreadPoolExecutor(1, 5, 60L, TimeUnit.SECONDS, new SynchronousQueue<Runnable>());
+	}
+
+	/**
+	 * 关闭公共线程池
+	 * 
+	 * @param isNow 是否立即关闭而不等待正在执行的线程
+	 */
+	synchronized public static void shutdown(boolean isNow) {
+		if (null != executor) {
+			if (isNow) {
+				executor.shutdownNow();
+			} else {
+				executor.shutdown();
+			}
+		}
+	}
+
+	/**
+	 * 获得 {@link ExecutorService}
+	 * 
+	 * @return {@link ExecutorService}
+	 */
+	public static ExecutorService getExecutor() {
+		return executor;
+	}
+
+	/**
+	 * 直接在公共线程池中执行线程
+	 * 
+	 * @param runnable 可运行对象
+	 */
+	public static void execute(Runnable runnable) {
+		try {
+			executor.execute(runnable);
+		} catch (Exception e) {
+			throw new UtilException(e, "Exception when running task!");
+		}
+	}
+
+	/**
+	 * 执行有返回值的异步方法<br>
+	 * Future代表一个异步执行的操作，通过get()方法可以获得操作的结果，如果异步操作还没有完成，则，get()会使当前线程阻塞
+	 * 
+	 * @param <T> 执行的Task
+	 * @param task {@link Callable}
+	 * @return Future
+	 */
+	public static <T> Future<T> submit(Callable<T> task) {
+		return executor.submit(task);
+	}
+
+	/**
+	 * 执行有返回值的异步方法<br>
+	 * Future代表一个异步执行的操作，通过get()方法可以获得操作的结果，如果异步操作还没有完成，则，get()会使当前线程阻塞
+	 * 
+	 * @param runnable 可运行对象
+	 * @return {@link Future}
+	 * @since 3.0.5
+	 */
+	public static Future<?> submit(Runnable runnable) {
+		return executor.submit(runnable);
+	}
+}

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

@@ -26,6 +26,7 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 
 /**
@@ -455,10 +456,18 @@ public class HouseController implements HouseAPI {
             wrapperHN2.eq(HouseNumber::getHouseStatus, 2);
             List<HouseNumber> list = houseNumberService.list(wrapperHN2);
 
-            if (houseNumberList.size() - houseNumberStates.size() - list.size() > 0) {
+//          将房态和脏房合一起
+            HashSet<String> houseNumberIdList = new HashSet<>(houseNumberStates);
+            for (HouseNumber houseNumber : list) {
+                Integer houseNumberId = houseNumber.getId();
+                houseNumberIdList.add(houseNumberId+"");
+            }
+
+            if (houseNumberList.size() - houseNumberIdList.size() > 0) {
                 houseAppletPageVo.setHouseStatus("1");
 
-                houseAppletPageVo.setSurplusCount(houseNumberList.size() - houseNumberStates.size() - list.size());
+//                houseAppletPageVo.setSurplusCount(houseNumberList.size() - houseNumberStates.size() - list.size());
+                houseAppletPageVo.setSurplusCount(houseNumberList.size() - houseNumberIdList.size());
 
             } else {
                 houseAppletPageVo.setHouseStatus("2");

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

@@ -173,14 +173,30 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (HouseStateVo houseStateVo : pageVo1) {
             Integer houseNumberId = houseStateVo.getHouseNumberId();
             if (map.containsKey(houseNumberId)) {
-                String reserveLiveTime = houseStateVo.getReserveLiveTime();
+                String reserveLiveTime = "";
+
+                if (ObjectUtils.isNotEmpty(houseStateVo.getReserveLiveTime())) {
+                    reserveLiveTime = houseStateVo.getReserveLiveTime();
+                }else {
+                    reserveLiveTime = houseStateVo.getStartTime();
+                }
 
                 HouseStateVo houseStateVo1 = map.get(houseNumberId);
-                String reserveLiveTime1 = houseStateVo1.getReserveLiveTime();
+
+                String reserveLiveTime1 = "";
+
+                if (ObjectUtils.isNotEmpty(houseStateVo1.getReserveLiveTime())) {
+                    reserveLiveTime1 = houseStateVo1.getReserveLiveTime();
+                }else {
+                    reserveLiveTime1 =  houseStateVo1.getStartTime();
+                }
 
                 LocalDateTime parse = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
+
                 LocalDateTime parse1 = LocalDateTime.parse(reserveLiveTime1, dateTimeFormatter1);
 
+
+
                 if (parse1.isAfter(parse)) {
                     map.put(houseNumberId, houseStateVo);
                 }
@@ -1173,10 +1189,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("无该订单");
         }
         Date liveTime = houseOrder.getLiveTime();
+
+//        判断当前时间到预离店时间是否有房间
+        Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = sdf.format(liveTime);
+        String format1 = sdf.format(date);
         //      判断该房间在该订单的时间内是否有使用
-        List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, format, houseOrder.getReserveLeaveTime());
+        List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, format1, houseOrder.getReserveLeaveTime());
 
         if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
             return CommonResult.fail("此时间段内，该房间已被使用");
@@ -1297,83 +1317,91 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         LambdaQueryWrapper<HouseLock> wrapperHl = new LambdaQueryWrapper<>();
         wrapperHl.eq(HouseLock::getHouseNumberId, houseNumberId);
         HouseLock houseLock = houseLockService.getOne(wrapperHl);
-        String equipmentState = houseLock.getEquipmentType();
+
+        if (ObjectUtils.isNotEmpty(houseLock)) {
+
+
+            String equipmentState = houseLock.getEquipmentType();
 
 //            入住人id
-        String liveUsersId = houseOrder.getLiveUsersId();
-        Users users = usersService.getById(liveUsersId);
+            String liveUsersId = houseOrder.getLiveUsersId();
+            Users users = usersService.getById(liveUsersId);
 
 
 //            判断是什么类型的开锁方式
-        String lockStatus = unlocking.getLockStatus();
+            String lockStatus = unlocking.getLockStatus();
+            if (ObjectUtils.isNotEmpty(unlocking)) {
+
+
 //          添加锁的操作记录
 
-        OperatingRecord operatingRecord = new OperatingRecord();
+                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");
-        operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-        operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
+                operatingRecord.setHouseNumberId(houseNumber.getId());
+                operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+                operatingRecord.setOperatorName(byId.getName());
+                DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+                operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
+                operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
 
-        if ("1".equals(lockStatus)) {
-            PasswordDto pr = new PasswordDto();
-            pr.setLuid(houseLock.getEquipmentType());
+                if ("1".equals(lockStatus)) {
+                    PasswordDto pr = new PasswordDto();
+                    pr.setLuid(houseLock.getEquipmentType());
 //            开始时间
-            pr.setStartTime(String.valueOf(liveTime.getTime()));
+                    pr.setStartTime(String.valueOf(liveTime.getTime()));
 //            结束时间
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
-            Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
-            pr.setEndTime(String.valueOf(leaveTime.getTime()));
-            pr.setHouseNumberId(houseNumberId);
-            pr.setOrderNumber(orderNumber);
-            Unlocking unlocking1 = passwordIssController.addPassword(pr);
-            unlockingService.save(unlocking1);
-
-            String passWord = unlocking1.getPassWord();
-
-            ArrayList<String> strings = new ArrayList<>();
-            strings.add(users.getCardNumber());
-            weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + houseNumber.getRoomNumber() + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
-            operatingRecord.setType("添加密码钥匙");
-
-        } else if ("2".equals(lockStatus)) {
-            CardInfoDto cid = new CardInfoDto();
-            cid.setCard(users.getIdCardInformation());
-            cid.setLuid(equipmentState);
-            cid.setCardType(1);
-            cid.setStartTime(String.valueOf(liveTime.getTime()));
-            //            结束时间
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
-            Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
-
-            cid.setEndTime(String.valueOf(leaveTime.getTime()));
-            cid.setHouseNumberId(houseNumberId);
-            cid.setOrderNumber(houseOrder.getOrderNumber());
-            Unlocking unlocking1 = passwordIssController.addCardInfo(cid);
-            unlockingService.save(unlocking1);
-            operatingRecord.setType("添加卡片钥匙");
-        } else if ("3".equals(lockStatus)) {
-            FingerprintDataDto fd = new FingerprintDataDto();
-            fd.setLuid(equipmentState);
-            fd.setHouseNumberId(houseNumberId);
-            fd.setOrderNumber(houseOrder.getOrderNumber());
-            fd.setStartTime(String.valueOf(liveTime.getTime()));
-            //            结束时间
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
-            Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
-
-            fd.setEndTime(String.valueOf(leaveTime.getTime()));
-
-            fd.setFingerprintData(users.getFingerprint());
-            Unlocking unlocking1 = passwordIssController.addFingerprintData(fd);
-            unlockingService.save(unlocking1);
-            operatingRecord.setType("添加指纹钥匙");
-        }
-
-        operatingRecordService.save(operatingRecord);
+                    String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+                    Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+                    pr.setEndTime(String.valueOf(leaveTime.getTime()));
+                    pr.setHouseNumberId(houseNumberId);
+                    pr.setOrderNumber(orderNumber);
+                    Unlocking unlocking1 = passwordIssController.addPassword(pr);
+                    unlockingService.save(unlocking1);
+
+                    String passWord = unlocking1.getPassWord();
+
+                    ArrayList<String> strings = new ArrayList<>();
+                    strings.add(users.getCardNumber());
+                    weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + houseNumber.getRoomNumber() + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
+                    operatingRecord.setType("添加密码钥匙");
+
+                } else if ("2".equals(lockStatus)) {
+                    CardInfoDto cid = new CardInfoDto();
+                    cid.setCard(users.getIdCardInformation());
+                    cid.setLuid(equipmentState);
+                    cid.setCardType(1);
+                    cid.setStartTime(String.valueOf(liveTime.getTime()));
+                    //            结束时间
+                    String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+                    Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+
+                    cid.setEndTime(String.valueOf(leaveTime.getTime()));
+                    cid.setHouseNumberId(houseNumberId);
+                    cid.setOrderNumber(houseOrder.getOrderNumber());
+                    Unlocking unlocking1 = passwordIssController.addCardInfo(cid);
+                    unlockingService.save(unlocking1);
+                    operatingRecord.setType("添加卡片钥匙");
+                } else if ("3".equals(lockStatus)) {
+                    FingerprintDataDto fd = new FingerprintDataDto();
+                    fd.setLuid(equipmentState);
+                    fd.setHouseNumberId(houseNumberId);
+                    fd.setOrderNumber(houseOrder.getOrderNumber());
+                    fd.setStartTime(String.valueOf(liveTime.getTime()));
+                    //            结束时间
+                    String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+                    Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+
+                    fd.setEndTime(String.valueOf(leaveTime.getTime()));
+
+                    fd.setFingerprintData(users.getFingerprint());
+                    Unlocking unlocking1 = passwordIssController.addFingerprintData(fd);
+                    unlockingService.save(unlocking1);
+                    operatingRecord.setType("添加指纹钥匙");
+                }
 
+                operatingRecordService.save(operatingRecord);
+            }
+        }
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
@@ -1721,10 +1749,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
-            return CommonResult.ok(msg);
+            return CommonResult.fail(msg);
         }
     }
-
+//    Boolean aBoolean=true;
     @Override
     public CommonResult cleanRoom(CleanRoomDto cleanRoomDto) {
         int adminId = cleanRoomDto.getAdminId();
@@ -1748,8 +1776,12 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
         String msg = "";
+
+//        MyGlobalThreadPool.execute(()->{
+          Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+//        });
+
         if (!aBoolean) {
             msg = "关电失败";
         }
@@ -1758,7 +1790,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
-            return CommonResult.ok(msg);
+            return CommonResult.fail(msg);
         }
 
     }
@@ -1773,7 +1805,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 //      判断该用户是否拥有权限
         String houseTypeManagement = permissionSetting.getHouseStatusManagement();
-        if (!"0".equals(houseTypeManagement) && !"9".equals(houseTypeManagement)) {
+        if (!"0".equals(houseTypeManagement) && !houseTypeManagement.contains("9")) {
             return CommonResult.fail("此账号暂无该权限");
         }
         List<String> list = dirtyRoomDtos.getHouseNumberIds();
@@ -1802,7 +1834,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
-            return CommonResult.ok(msg);
+            return CommonResult.fail(msg);
         }
     }
 
@@ -1846,7 +1878,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
-            return CommonResult.ok(msg);
+            return CommonResult.fail(msg);
         }
     }
 
@@ -2324,7 +2356,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
-            return CommonResult.ok(msg);
+            return CommonResult.fail(msg);
         }
 
     }
@@ -2351,7 +2383,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {
-            return CommonResult.ok(msg);
+            return CommonResult.fail(msg);
         }
     }
 

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

@@ -1282,10 +1282,12 @@ public class HouseOrderController implements HouseOrderAPI {
             return CommonResult.fail("无该订单");
         }
         Date liveTime = houseOrder.getLiveTime();
+        Date date = new Date();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String format = sdf.format(liveTime);
+        String format1 = sdf.format(date);
         //      判断该房间在该订单的时间内是否有使用
-        List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, format, houseOrder.getReserveLeaveTime());
+        List<HouseNumberState> houseNumberStateList = houseNumberStateService.beBooked(houseNumberId, format1, houseOrder.getReserveLeaveTime());
 
         if (ObjectUtils.isNotEmpty(houseNumberStateList) && houseNumberStateList.size() > 0) {
             return CommonResult.fail("此时间段内，该房间已被使用");
@@ -1416,77 +1418,79 @@ public class HouseOrderController implements HouseOrderAPI {
         String liveUsersId = houseOrder.getLiveUsersId();
         Users users = usersService.getById(liveUsersId);
 
+        if (ObjectUtils.isNotEmpty(unlocking)) {
 
 //            判断是什么类型的开锁方式
-        String lockStatus = unlocking.getLockStatus();
+            String lockStatus = unlocking.getLockStatus();
 
 //             添加锁的操作记录
-        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));
-        operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
+            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));
+            operatingRecord.setContent("姓名:" + houseOrder.getLiveName());
 
-        if ("1".equals(lockStatus)) {
-            PasswordDto pr = new PasswordDto();
-            pr.setLuid(houseLock.getEquipmentType());
+            if ("1".equals(lockStatus)) {
+                PasswordDto pr = new PasswordDto();
+                pr.setLuid(houseLock.getEquipmentType());
 //            开始时间
-            pr.setStartTime(String.valueOf(liveTime.getTime()));
+                pr.setStartTime(String.valueOf(liveTime.getTime()));
 //            结束时间
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+                String reserveLeaveTime = houseOrder.getReserveLeaveTime();
 
-            Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
-            pr.setEndTime(String.valueOf(leaveTime.getTime()));
-            pr.setHouseNumberId(houseNumberId);
-            pr.setOrderNumber(orderNumber);
-            Unlocking unlocking1 = passwordIssController.addPassword(pr);
-            unlockingService.save(unlocking1);
+                Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+                pr.setEndTime(String.valueOf(leaveTime.getTime()));
+                pr.setHouseNumberId(houseNumberId);
+                pr.setOrderNumber(orderNumber);
+                Unlocking unlocking1 = passwordIssController.addPassword(pr);
+                unlockingService.save(unlocking1);
 
-            String passWord = unlocking1.getPassWord();
+                String passWord = unlocking1.getPassWord();
 
-            ArrayList<String> strings = new ArrayList<>();
-            strings.add(users.getCardNumber());
-            weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + houseNumber.getRoomNumber() + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
-            operatingRecord.setType("添加密码钥匙");
-
-        } else if ("2".equals(lockStatus)) {
-            CardInfoDto cid = new CardInfoDto();
-            cid.setCard(users.getIdCardInformation());
-            cid.setLuid(equipment);
-            cid.setCardType(1);
-            cid.setStartTime(String.valueOf(liveTime.getTime()));
-            //            结束时间
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+                ArrayList<String> strings = new ArrayList<>();
+                strings.add(users.getCardNumber());
+                weiXiaoComponent.sendNotice(strings, "公寓办理入住成功", "办理入住成功", "您的房间号为:" + houseNumber.getRoomNumber() + ",密码是:" + passWord + "离店时间为:" + liveTime + ",欢迎您入住张玉玲酒店，我们全体员工很荣幸能为您服务，如有任何需要请致电张玉玲，期待为你服务。祝你生活愉快！", null);
+                operatingRecord.setType("添加密码钥匙");
 
-            Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
-
-            cid.setEndTime(String.valueOf(leaveTime.getTime()));
-            cid.setHouseNumberId(houseNumberId);
-            cid.setOrderNumber(houseOrder.getOrderNumber());
-            Unlocking unlocking1 = passwordIssController.addCardInfo(cid);
-            unlockingService.save(unlocking1);
-            operatingRecord.setType("添加卡片钥匙");
-        } else if ("3".equals(lockStatus)) {
-            FingerprintDataDto fd = new FingerprintDataDto();
-            fd.setLuid(equipment);
-            fd.setHouseNumberId(houseNumberId);
-            fd.setOrderNumber(houseOrder.getOrderNumber());
-            fd.setStartTime(String.valueOf(liveTime.getTime()));
-            //            结束时间
-            String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+            } else if ("2".equals(lockStatus)) {
+                CardInfoDto cid = new CardInfoDto();
+                cid.setCard(users.getIdCardInformation());
+                cid.setLuid(equipment);
+                cid.setCardType(1);
+                cid.setStartTime(String.valueOf(liveTime.getTime()));
+                //            结束时间
+                String reserveLeaveTime = houseOrder.getReserveLeaveTime();
 
-            Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+                Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
 
-            fd.setEndTime(String.valueOf(leaveTime.getTime()));
+                cid.setEndTime(String.valueOf(leaveTime.getTime()));
+                cid.setHouseNumberId(houseNumberId);
+                cid.setOrderNumber(houseOrder.getOrderNumber());
+                Unlocking unlocking1 = passwordIssController.addCardInfo(cid);
+                unlockingService.save(unlocking1);
+                operatingRecord.setType("添加卡片钥匙");
+            } else if ("3".equals(lockStatus)) {
+                FingerprintDataDto fd = new FingerprintDataDto();
+                fd.setLuid(equipment);
+                fd.setHouseNumberId(houseNumberId);
+                fd.setOrderNumber(houseOrder.getOrderNumber());
+                fd.setStartTime(String.valueOf(liveTime.getTime()));
+                //            结束时间
+                String reserveLeaveTime = houseOrder.getReserveLeaveTime();
+
+                Date leaveTime = Date.from(LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant());
+
+                fd.setEndTime(String.valueOf(leaveTime.getTime()));
 
-            fd.setFingerprintData(users.getFingerprint());
-            Unlocking unlocking1 = passwordIssController.addFingerprintData(fd);
-            unlockingService.save(unlocking1);
-            operatingRecord.setType("添加指纹钥匙");
+                fd.setFingerprintData(users.getFingerprint());
+                Unlocking unlocking1 = passwordIssController.addFingerprintData(fd);
+                unlockingService.save(unlocking1);
+                operatingRecord.setType("添加指纹钥匙");
+            }
+            operatingRecordService.save(operatingRecord);
         }
-        operatingRecordService.save(operatingRecord);
         if (msg.equals("")) {
             return CommonResult.ok();
         } else {