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