Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

# Conflicts:
#	src/main/java/com/template/model/mqtt/PushCallback.java

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

@@ -57,4 +57,8 @@ public interface HouseLockControllerAPI {
     @ApiOperation(value = "NFC操作", notes = "NFC操作", httpMethod = "GET")
     CommonResult nfc(@RequestParam Integer houseLockId,@RequestParam Integer nfcFunction);
 
+    @GetMapping("/deleteLock")
+    @ApiOperation(value = "删除门锁", notes = "删除门锁", httpMethod = "GET")
+    CommonResult deleteLock(@RequestParam String id,@RequestParam String luid);
+
 }

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{
 
@@ -104,9 +103,9 @@ public class SubscribeSample{
                         UnlockingRecord unlockingRecord = new UnlockingRecord();
                         unlockingRecord.setType("消息类型");
                         String data = s.getString("data");
-                        System.out.println("data = " + data);
+//                        System.out.println("data = " + data);
                         JSONObject jsonObject = JSONObject.parseObject(data);
-                        System.out.println("jsonObject = " + jsonObject);
+//                        System.out.println("jsonObject = " + jsonObject);
 //						结果
                         String result = jsonObject.getString("result");
 //						时间

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

@@ -533,6 +533,12 @@ public class HouseLockController implements HouseLockControllerAPI {
         return CommonResult.ok();
     }
 
+    @Override
+    public CommonResult deleteLock(String id, String luid) {
+        passwordIssController.deleteLockUser(luid,id);
+        return CommonResult.ok();
+    }
+
 
 }
 

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/controller/LoginController.java

@@ -819,6 +819,41 @@ public class LoginController implements LoginControllerAPI {
             menuBarVos.add(menuBarVo7);
         }
 
+//        黑名单管理
+        String blacklistManagement = one.getBlacklistManagement();
+        if (ObjectUtils.isNotEmpty(blacklistManagement)) {
+
+            MenuBarVo menuBarVo14 = new MenuBarVo();
+            menuBarVo14.setName("黑名单管理");
+            ArrayList<FunctionPointVo> vos14 = new ArrayList<>();
+            if (contains(blacklistManagement, "0")) {
+                FunctionPointVo functionPointVo1 = new FunctionPointVo();
+                functionPointVo1.setFunctionPoint("移除");
+                functionPointVo1.setStatus(1);
+                vos14.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = new FunctionPointVo();
+                functionPointVo2.setFunctionPoint("查看界面");
+                functionPointVo2.setStatus(1);
+                vos14.add(functionPointVo2);
+
+
+            } else {
+                FunctionPointVo functionPointVo1 = ifContains(blacklistManagement, "1");
+                functionPointVo1.setFunctionPoint("移除");
+                vos14.add(functionPointVo1);
+
+                FunctionPointVo functionPointVo2 = ifContains(blacklistManagement, "2");
+                functionPointVo2.setFunctionPoint("查看界面");
+                vos14.add(functionPointVo2);
+
+
+            }
+            menuBarVo14.setFunctionPoints(vos14);
+            menuBarVos.add(menuBarVo14);
+        }
+
+
 //        门锁管理
         String doorLockManagement = one.getDoorLockManagement();
         if (ObjectUtils.isNotEmpty(doorLockManagement)) {

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

@@ -48,6 +48,9 @@ public class UpdateMenuPermissionSettingDto {
     @ApiModelProperty(value = "报表管理 0.全部 1.查询，2.导出")
     private String reportManagement;
 
+    @ApiModelProperty(value = "黑名单管理 0.全部 1.移出，2.查看")
+    private String blacklistManagement;
+
     @ApiModelProperty(value = "门锁管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入，7.批量重置密码，8.重置密码，9.添加总卡，10.禁用门锁，11.钥匙管理，12.消息列表，13.远程开锁，14.解绑设备")
     private String doorLockManagement;
 

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

@@ -43,20 +43,24 @@ public class PushCallback implements MqttCallback {
         if(client != null) {
             while (true) {
                 try {
-                    log.info("==============》》》[MQTT] 连接断开，5S之后尝试重连...");
-                    Thread.sleep(500000000);
+                    Thread.sleep(30000);
+                    log.info("==============》》》[MQTT] 连接断开，30S之后尝试重连...");
 //                    MqttPushClient mqttPushClient = new MqttPushClient();
 //                    mqttPushClient.connect(mqttConfiguration);
                     if(MqttPushClient.getClient().isConnected()){
-                        log.info("=============>>重连成功");
+                        log.info("=============>>已连接");
                         break;
-                    }
+                    }else {
 //                    break;
-                    //重连
-                    client.reconnect();
+                        //重连
+                        client.reconnect();
+                        System.out.println("重连成功");
+                        break;
+                    }
 //                    订阅
 //                    client.subscribe();
                 } catch (Exception e) {
+//                    e.printStackTrace();
                     log.error("=============>>>[MQTT] 连接断开，重连失败！<<=============");
                     continue;
                 }

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

@@ -62,6 +62,9 @@ public class PermissionSetting implements Serializable {
     @ApiModelProperty(value = "报表管理 0.全部 1.查询，2.导出")
     private String reportManagement;
 
+    @ApiModelProperty(value = "黑名单管理 0.全部 1.移出，2.查看")
+    private String blacklistManagement;
+
     @ApiModelProperty(value = "门锁管理 0.全部 1.添加，2.编辑，3.删除，4.查询，5.导出，6.导入，7.批量重置密码，8.重置密码，9.添加总卡，10.禁用门锁，11.钥匙管理，12.消息列表，13.远程开锁，14.解绑设备")
     private String doorLockManagement;