自动退房也需删除锁

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

@@ -16,7 +16,6 @@ import com.template.services.impl.UnlockingRecordServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
-import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
@@ -29,7 +28,7 @@ import java.util.List;
  * @author issuser
  */
 
-@Component
+//@Component
 @Slf4j
 public class SubscribeSample{
 

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

@@ -1487,6 +1487,16 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     houseOrder.setWaterConsume(consumeWater);
 
                 }
+
+                LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+                wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                        .eq(Unlocking::getHouseNumberId, houseNumberId);
+                Unlocking unlocking = unlockingService.getOne(wrapperU);
+                if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                    passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                    unlockingService.removeById(unlocking);
+                }
                 houseOrderService.updateById(houseOrder);
                 return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
             }

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

@@ -1110,6 +1110,15 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrder.setWaterConsume(consumeWater);
 
                 }
+                LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+                wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                        .eq(Unlocking::getHouseNumberId, houseNumberId);
+                Unlocking unlocking = unlockingService.getOne(wrapperU);
+                if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                    passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                    unlockingService.removeById(unlocking);
+                }
 
                 houseOrderService.updateById(houseOrder);
                 return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
@@ -2471,6 +2480,17 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrder.setWaterCost(costWater);
                     houseOrder.setWaterConsume(consumeWater);
                 }
+
+                LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+                wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                        .eq(Unlocking::getHouseNumberId, houseNumberId);
+                Unlocking unlocking = unlockingService.getOne(wrapperU);
+                if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                    passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                    unlockingService.removeById(unlocking);
+                }
+
                 houseOrderService.updateById(houseOrder);
                 return CommonResult.ok("该时间段已超过退房时间，已修改其订单状态");
             }
@@ -3306,7 +3326,6 @@ public class HouseOrderController implements HouseOrderAPI {
 
     }
 
-
     /**
      * 每天12点查询一次到时间没有点退房的订单，并自动退房
      */
@@ -3328,6 +3347,18 @@ public class HouseOrderController implements HouseOrderAPI {
                     houseOrder.setLeaveTime(new Date());
                     String houseNumberId = houseOrder.getHouseNumberId();
                     HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+
+                    String orderNumber = houseOrder.getOrderNumber();
+                    LambdaQueryWrapper<Unlocking> wrapperU = new LambdaQueryWrapper<>();
+                    wrapperU.eq(Unlocking::getOrderNumber, orderNumber)
+                            .eq(Unlocking::getHouseNumberId, houseNumberId);
+                    Unlocking unlocking = unlockingService.getOne(wrapperU);
+                    if (ObjectUtils.isNotEmpty(unlocking)) {
+//                删除房间密码
+                        passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                        unlockingService.removeById(unlocking);
+                    }
+
                     if (ObjectUtils.isNotEmpty(houseNumber)) {
 //             获取水电能耗
                     //      获取水电消费金额和额度
@@ -3509,7 +3540,6 @@ public class HouseOrderController implements HouseOrderAPI {
 
         }
 
-
     }
 
 
@@ -3549,8 +3579,6 @@ public class HouseOrderController implements HouseOrderAPI {
             houseOrderService.updateBatchById(houseOrders);
         }
 
-
-
     }
 
 

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

@@ -43,8 +43,8 @@ public class PushCallback implements MqttCallback {
         if(client != null) {
             while (true) {
                 try {
-                    log.info("==============》》》[MQTT] 连接断开，5S之后尝试重连...");
-                    Thread.sleep(5000);
+                    log.info("==============》》》[MQTT] 连接断开，30S之后尝试重连...");
+                    Thread.sleep(30000);
 //                    MqttPushClient mqttPushClient = new MqttPushClient();
 //                    mqttPushClient.connect(mqttConfiguration);
                     if(MqttPushClient.getClient().isConnected()){