Merge branch '84-wb' into '71-integrate'

84 wb







See merge request !49

smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/keyclaok/KeycloakUserController.java

@@ -107,7 +107,7 @@ public class KeycloakUserController {
         }
     }
 
-    @SmsbMethodLog(description = "密码重置" ,business = "密码重置")
+    @SmsbMethodLog(description = "密码重置" ,business = "用户：${credential.userLabel}密码重置")
     @PutMapping("/admin/users/{userId}/resetPassword")
     public Response resetPassword(@PathVariable("userId") String userId , @RequestBody CredentialRepresentation credential){
         if(StringUtils.isEmpty(credential.getType()) || !credential.getType().equals(Constant.type)){
@@ -157,10 +157,11 @@ public class KeycloakUserController {
         return keycloakService.queryUserCredentials(userId);
     }
 
-    @SysLogIgnore
+    @SmsbMethodLog(description = "OTP重置" ,business = "用户:${userName}重置OTP")
     @DeleteMapping("/admin/users/{userId}/credentials/{credentialId}")
     public Response removeUserCredentials(@PathVariable("userId")String userId,
-                                          @PathVariable("credentialId")String credentialId){
+                                          @PathVariable("credentialId")String credentialId,
+                                          String userName){
         return keycloakService.removeUserCredentials(userId ,credentialId);
     }
 
@@ -200,7 +201,7 @@ public class KeycloakUserController {
     }
 
     @SmsbMethodLog(description = "账号分组",
-        business = "将账号：${smsbRegrouping.userId}添加到部门：${smsbRegrouping.departmentName}")
+        business = "将账号：${smsbRegrouping.userName}添加到部门：${smsbRegrouping.departmentName}")
     @PutMapping("/admin/users/regrouping")
     public Response regrouping(@RequestHeader String userId,
                                @Valid @RequestBody SmsbRegrouping smsbRegrouping){
@@ -210,10 +211,11 @@ public class KeycloakUserController {
         return departmentService.regrouping(smsbRegrouping);
     }
 
-    @SmsbMethodLog(description = "账号注销", business = "账号：${uId}注销")
+    @SmsbMethodLog(description = "账号注销", business = "账号：${userName}注销")
     @DeleteMapping("/admin/users/{uId}")
     public Response enableSwitch(@RequestHeader String userId,
-                                 @PathVariable("uId") String uId){
+                                 @PathVariable("uId") String uId,
+                                 String userName){
         Response checkResponse = departmentService.checkOperationAuthority(userId, userService.getOneByUserId(uId).getTenant());
         if(!checkResponse.isSuccess()){return checkResponse;}
         if(userService.removeUser(uId)){

smsb-customer-manager-client/src/main/java/com/inspur/customer/object/org/SmsbRegrouping.java

@@ -18,6 +18,8 @@ public class SmsbRegrouping extends OperationAuthority{
     @NotNull(message = "userId不能为空")
     private String userId;
 
+    private String userName;
+
     private Long departmentId;
 
     private String departmentName;