deason 1 year ago
parent
commit
38912b0f38

+ 14 - 9
src/main/java/cn/com/qmth/examcloud/tool/service/batch_update_user/BatchUpdateUserTask.java

@@ -44,27 +44,28 @@ public class BatchUpdateUserTask {
     private void execute(User loginUser, List<UserInfo> userList) {
         Map<String, Long> roleMaps = this.queryRoles(loginUser);
 
+        int total = userList.size();
         boolean hasError = false;
-        for (int i = 0; i < userList.size(); i++) {
+        for (int i = 0; i < total; i++) {
             UserInfo user = userList.get(i);
 
             if (StringUtils.isBlank(user.getLoginName())) {
-                log.warn("共{}条 第{}条 登录名不能为空!", userList.size(), i + 1);
+                log.warn("共{}条 第{}条 登录名不能为空!", total, i + 1);
                 hasError = true;
             }
 
             if (StringUtils.isBlank(user.getUserName())) {
-                log.warn("共{}条 第{}条 姓名不能为空!{}", userList.size(), i + 1, user.getLoginName());
+                log.warn("共{}条 第{}条 姓名不能为空!{}", total, i + 1, user.getLoginName());
                 hasError = true;
             }
 
             if (StringUtils.isBlank(user.getPsw())) {
-                log.warn("共{}条 第{}条 密码不能为空!{}", userList.size(), i + 1, user.getLoginName());
+                log.warn("共{}条 第{}条 密码不能为空!{}", total, i + 1, user.getLoginName());
                 hasError = true;
             }
 
             if (!roleMaps.containsKey(user.getRoleName())) {
-                log.warn("共{}条 第{}条 角色内容有误!{}", userList.size(), i + 1, user.getLoginName());
+                log.warn("共{}条 第{}条 角色内容有误!{}", total, i + 1, user.getLoginName());
                 hasError = true;
             }
 
@@ -77,13 +78,15 @@ public class BatchUpdateUserTask {
             return;
         }
 
-        for (int i = 0; i < userList.size(); i++) {
+        int failCount = 0;
+        for (int i = 0; i < total; i++) {
             UserInfo user = userList.get(i);
             this.createUser(loginUser, user, roleMaps);
 
             UserInfo existUser = this.queryUserByLoginName(loginUser, user.getLoginName());
             if (existUser == null) {
-                log.warn("共{}条 第{}条 用户创建失败!{}", userList.size(), i + 1, user.getLoginName());
+                log.warn("共{}条 第{}条 用户创建失败!{}", total, i + 1, user.getLoginName());
+                failCount++;
                 continue;
             }
 
@@ -91,8 +94,10 @@ public class BatchUpdateUserTask {
             this.updateDataRuleForCourse(loginUser, existUser.getId(), user.getRefCourse());
             this.updateDataRuleForOrg(loginUser, existUser.getId(), user.getRefOrg());
 
-            log.info("共{}条 第{}条 已执行!{}", userList.size(), i + 1, user.getLoginName());
+            log.info("共{}条 第{}条 已执行!{}", total, i + 1, user.getLoginName());
         }
+
+        log.info("共{}条 成功{}条 失败{}条!", total, total - failCount, failCount);
     }
 
     private Map<String, Long> queryRoles(User loginUser) {
@@ -126,7 +131,7 @@ public class BatchUpdateUserTask {
         params.put("loginName", loginName);
 
         String result = HttpHelper.get(url, headers, params);
-        log.info(result);
+        // log.info(result);
 
         List<UserInfo> users = new JsonMapper().toList(result, UserInfo.class);
         if (CollectionUtils.isNotEmpty(users)) {