修改自动退房接口

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

@@ -38,12 +38,12 @@ public class MessageDecryptUtil {
             log.info("校验签名成功");
 
             String messageDate_str = AesUtils.decrypt(pushMessage.getData(),appId);
-            log.info("messageDate_str : {}" , messageDate_str);
+//            log.info("messageDate_str : {}" , messageDate_str);
 
 
 //            去掉头和尾的"和所有的\\和单个{多余的"和}多余的"
             messageDate_str = messageDate_str.replaceAll("\t","").substring(1, messageDate_str.length() - 1).replaceAll("\\\\","").replace("\"{","{").replace("}\"","}");
-            System.out.println("messageDate_str = " + messageDate_str);
+//            System.out.println("messageDate_str = " + messageDate_str);
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("protocol",pushMessage.getProtocol());
             jsonObject.put("pv",pushMessage.getPv());

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

@@ -3638,7 +3638,6 @@ public class HouseOrderController implements HouseOrderAPI {
      * 每2个小时查询一次到时间没有点退房的订单，并自动退房
      */
     @Scheduled(cron = "0 0 0/2 * * ? ")
-//    @Scheduled(cron = "0 0/1 * * * ?")
     @Transactional(rollbackFor = Exception.class)//1
     public void getOrder() {
         LambdaQueryWrapper<HouseOrder> wrapperHo = new LambdaQueryWrapper<>();
@@ -3648,8 +3647,7 @@ public class HouseOrderController implements HouseOrderAPI {
 
         List<HouseOrder> list = houseOrderService.list(wrapperHo);
 
-        ArrayList<HouseOrder> houseOrders = new ArrayList<>();
-        ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
+
         if (ObjectUtils.isNotEmpty(list) && list.size() > 0) {
             log.info("开始自动退房");
             for (HouseOrder houseOrder : list) {
@@ -3665,8 +3663,13 @@ public class HouseOrderController implements HouseOrderAPI {
                 Unlocking unlocking = unlockingService.getOne(wrapperU);
                 if (ObjectUtils.isNotEmpty(unlocking)) {
 //                删除房间密码
-                    passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
-                    unlockingService.removeById(unlocking);
+                    try {
+                        passwordIssController.deleteLockUser(unlocking.getLuid(), unlocking.getLockUserId());
+                        unlockingService.removeById(unlocking);
+                    }catch (Exception e){
+                        log.info("房间id是"+houseNumberId+": "+e);
+                    }
+
                 }
 
                 if (ObjectUtils.isNotEmpty(houseNumber)) {
@@ -3683,7 +3686,9 @@ public class HouseOrderController implements HouseOrderAPI {
                         Date liveTime = houseOrder.getLiveTime();
                         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                         String live = sdf.format(liveTime);
-                        String leave = sdf.format(new Date());
+
+                        Date leaveTime = new Date();
+                        String leave = sdf.format(leaveTime);
 //                获取电的消费金额和额度
                         HouseOrderBill houseOrderBill = new HouseOrderBill();
 
@@ -3728,7 +3733,7 @@ public class HouseOrderController implements HouseOrderAPI {
                         houseOrderBill.setHouseOrderId(houseOrder.getId());
                         houseOrderBill.setHouseNumberId(houseNumberId);
                         houseOrderBill.setLiveTime(liveTime);
-                        houseOrderBill.setLeaveTime(new Date());
+                        houseOrderBill.setLeaveTime(leaveTime);
                         houseOrderBillService.save(houseOrderBill);
 
                     }
@@ -3736,20 +3741,14 @@ public class HouseOrderController implements HouseOrderAPI {
 //          将房间设置成脏房
                     houseNumber.setHouseStatus(2);
 
-                    houseOrders.add(houseOrder);
-                    houseNumbers.add(houseNumber);
-                }
-                if (ObjectUtils.isNotEmpty(houseOrders)) {
-                    houseOrderService.updateBatchById(houseOrders);
-                }
-                if (ObjectUtils.isNotEmpty(houseNumbers)) {
-                    houseNumberService.updateBatchById(houseNumbers);
+                    houseOrderService.updateById(houseOrder);
+                    houseNumberService.updateById(houseNumber);
+
                 }
 
             }
         }
 
-
     }
 
 //    @Scheduled(cron = "0 0/1 * * * ?")

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

@@ -89,11 +89,11 @@ public class PushCallback implements MqttCallback {
         // subscribe后得到的消息会执行到这里面
         String Payload = new String(message.getPayload());
  
-        log.info("============》》接收消息主题 : " + topic);
-        log.info("============》》接收消息Qos : " + message.getQos());
-        log.info("============》》接收消息内容 : " + Payload);
-        log.info("============》》接收ID : " + message.getId());
-        log.info("接收数据结束 下面可以执行数据处理操作");
+//        log.info("============》》接收消息主题 : " + topic);
+//        log.info("============》》接收消息Qos : " + message.getQos());
+//        log.info("============》》接收消息内容 : " + Payload);
+//        log.info("============》》接收ID : " + message.getId());
+//        log.info("接收数据结束 下面可以执行数据处理操作");
 
         try {
 
@@ -103,9 +103,9 @@ public class PushCallback implements MqttCallback {
             UnlockingRecordServiceImpl unlockingRecordService = SpringUtil.getBean(UnlockingRecordServiceImpl.class);
             AlarmMessageServiceImpl alarmMessageService = SpringUtil.getBean(AlarmMessageServiceImpl.class);
 
-            System.out.println("topic:" + topic);
-            System.out.println("Qos:" + message.getQos());
-            System.out.println("message content:" + new String(message.getPayload()));
+//            System.out.println("topic:" + topic);
+//            System.out.println("Qos:" + message.getQos());
+//            System.out.println("message content:" + new String(message.getPayload()));
             JSONObject s = MessageDecryptUtil.decryptMessage(message.toString(), "6edfcc178c0f415d8e6628238761976f", "2d00b258183146c0a2b19f55250c4596");
             String protocol = s.getString("protocol");