更新修改角色权限接口

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

@@ -103,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/PasswordIssController.java

@@ -482,7 +482,7 @@ public class PasswordIssController {
         String jsonContent = JSONObject.toJSONString(map);
         try {
             JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.DeleteLockUser.getUrl());
-            System.out.println("jsonObject = " + jsonObject);
+//            System.out.println("jsonObject = " + jsonObject);
 //            return jsonObject;
         } catch (Exception e) {
             e.printStackTrace();
@@ -512,7 +512,7 @@ public class PasswordIssController {
         /*解析数据 start*/
         JSONObject jsonObject = JSON.parseObject(result);
 
-        System.out.println("jsonObject = " + jsonObject);
+//        System.out.println("jsonObject = " + jsonObject);
 
 
         return jsonObject;

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;