添加黑名单管理设置

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

@@ -101,7 +101,8 @@ public class PasswordIssController {
             HashMap<String, Object> map = new HashMap<>();
             map.put("categoryId", doorLockConfig.getCategoryId());
             map.put("luid", "047863CA78E0");
-            map.put("id", "12ea7b0761b040e18ab95348287d6bae");
+//            map.put("id", "12ea7b0761b040e18ab95348287d6bae");
+            map.put("id", "66336c9de4fa47b6aeb9e4216937f904");
             String jsonContent = JSONObject.toJSONString(map);
             try {
                 JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.DeleteLockUser.getUrl());

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] 连接断开，30S之后尝试重连...");
                     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;