修改菜单栏接口，修改系统用户的钥匙管理，修改小程序登入接口

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

@@ -70,7 +70,7 @@ public class AppletLoginController implements AppletLoginControllerAPI {
             HttpHeaders headers = new HttpHeaders();
             headers.setContentType(MediaType.APPLICATION_JSON);
             HttpEntity<Map<String, String>> request = new HttpEntity<>(tokenParams, headers);
-            //ResponseEntity<String> tokenResponse = client.postForEntity(tokenUrl, tokenParams, String.class);
+            //ResponseEntity<String> tokenResponse = client.postForEntity(tokenUrl, tokenParams, String.class);(需要加头部)
 
             ResponseEntity<String> tokenResponse = client.postForEntity(tokenUrl, request, String.class);
 
@@ -79,12 +79,18 @@ public class AppletLoginController implements AppletLoginControllerAPI {
             });
             String accessToken = (String) jsonMap.get("access_token");
 
+            log.info("access_token参数=======>>>>accessToken: "+accessToken);
+
             // token换取用户信息
             String userInfoUrl = "https://open.wecard.qq.com/connect/oauth/get-user-info";
             Map<String, String> userInfoParam = new HashMap<>();
             userInfoParam.put("access_token", accessToken);
-            ResponseEntity<String> userInfoResponse = client.postForEntity(userInfoUrl, userInfoParam, String.class);
-
+            log.info("请求地址=======>>>>userInfoUrl: "+userInfoUrl);
+            log.info("请求参数=======>>>>userInfoParam: "+userInfoParam);
+//            ResponseEntity<String> userInfoResponse = client.postForEntity(userInfoUrl, userInfoParam, String.class);(需要加头部)
+            HttpEntity<Map<String, String>> request2 = new HttpEntity<>(userInfoParam, headers);
+            ResponseEntity<String> userInfoResponse = client.postForEntity(userInfoUrl, request2, String.class);
+            log.info("请求返回值=======>>>>userInfoUrl: "+userInfoResponse);
             Map<String, Object> userInfoMap = mapper.readValue(userInfoResponse.getBody(), new TypeReference<Map<String, Object>>() {
             });
 //

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

@@ -244,6 +244,16 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo14.setStatus(1);
                 strings.add(functionPointVo14);
 
+                FunctionPointVo functionPointVo15 = new FunctionPointVo();
+                functionPointVo15.setFunctionPoint("开电");
+                functionPointVo15.setStatus(1);
+                strings.add(functionPointVo15);
+
+                FunctionPointVo functionPointVo16 = new FunctionPointVo();
+                functionPointVo16.setFunctionPoint("关电");
+                functionPointVo16.setStatus(1);
+                strings.add(functionPointVo16);
+
             } else {
 
                 FunctionPointVo functionPointVo = ifContains(houseStatusManagement, "1");
@@ -295,6 +305,15 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo14 = ifContains(houseStatusManagement, "14");
                 functionPointVo14.setFunctionPoint("查看界面");
                 strings.add(functionPointVo14);
+
+                FunctionPointVo functionPointVo15 = ifContains(houseStatusManagement, "15");
+                functionPointVo15.setFunctionPoint("开电");
+                strings.add(functionPointVo15);
+
+                FunctionPointVo functionPointVo16 = ifContains(houseStatusManagement, "16");
+                functionPointVo16.setFunctionPoint("关电");
+                strings.add(functionPointVo16);
+
             }
 
             menuBarVo.setFunctionPoints(strings);

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

@@ -82,6 +82,12 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         if (ObjectUtils.isEmpty(admin)) {
             return CommonResult.fail("该管理员不存在");
         }
+
+        Admin byId = adminService.getById(keyPassWordDto.getUsersId());
+        if (ObjectUtils.isEmpty(admin)) {
+            return CommonResult.fail("添加的用户不存在");
+        }
+
         HouseNumber houseNumber = houseNumberService.getById(keyPassWordDto.getHouseNumberId());
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("该房间不存在");
@@ -102,8 +108,8 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
                 return CommonResult.fail("该密码已存在，请更换");
             }
 
-            unlockingAdmin.setName(admin.getName());
-            unlockingAdmin.setPhone(admin.getPhoneNumber());
+            unlockingAdmin.setName(byId.getName());
+            unlockingAdmin.setPhone(byId.getPhoneNumber());
 
 //        添加操作记录
 
@@ -113,7 +119,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + admin.getName());
+            operatingRecord.setContent("姓名:" + byId.getName());
             operatingRecord.setType("添加密码钥匙");
 
 
@@ -148,6 +154,12 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         if (ObjectUtils.isEmpty(admin)) {
             return CommonResult.fail("该管理员不存在");
         }
+
+        Admin byId = adminService.getById(keyCardDto.getUsersId());
+        if (ObjectUtils.isEmpty(admin)) {
+            return CommonResult.fail("添加的用户不存在");
+        }
+
         HouseNumber houseNumber = houseNumberService.getById(keyCardDto.getHouseNumberId());
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("该房间不存在");
@@ -163,8 +175,8 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         try {
           unlockingAdmin = passwordIssController.addCard(keyCardDto);
 
-            unlockingAdmin.setName(admin.getName());
-            unlockingAdmin.setPhone(admin.getPhoneNumber());
+            unlockingAdmin.setName(byId.getName());
+            unlockingAdmin.setPhone(byId.getPhoneNumber());
 
 //        添加操作记录
 
@@ -175,7 +187,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + admin.getName());
+            operatingRecord.setContent("姓名:" + byId.getName());
             operatingRecord.setType("添加卡片钥匙");
 
 
@@ -210,6 +222,12 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         if (ObjectUtils.isEmpty(admin)) {
             return CommonResult.fail("该管理员不存在");
         }
+        Admin byId = adminService.getById(keyFingerprintDto.getUsersId());
+        if (ObjectUtils.isEmpty(admin)) {
+            return CommonResult.fail("添加的用户不存在");
+        }
+
+
         HouseNumber houseNumber = houseNumberService.getById(keyFingerprintDto.getHouseNumberId());
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("该房间不存在");
@@ -225,8 +243,8 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         try {
             unlockingAdmin = passwordIssController.addFingerprintDto(keyFingerprintDto);
 
-            unlockingAdmin.setName(admin.getName());
-            unlockingAdmin.setPhone(admin.getPhoneNumber());
+            unlockingAdmin.setName(byId.getName());
+            unlockingAdmin.setPhone(byId.getPhoneNumber());
 
 //        添加操作记录
 
@@ -236,7 +254,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + admin.getName());
+            operatingRecord.setContent("姓名:" + byId.getName());
             operatingRecord.setType("添加指纹钥匙");