refactor: 修改用户导入代码格式和注释
This commit is contained in:
@@ -38,10 +38,10 @@ import java.util.stream.Collectors;
|
|||||||
public class UserImportListener extends AnalysisEventListener<UserImportDTO> {
|
public class UserImportListener extends AnalysisEventListener<UserImportDTO> {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* excel导入结果实体
|
* Excel 导入结果
|
||||||
*/
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
private ExcelResult excelResult;
|
private final ExcelResult excelResult;
|
||||||
|
|
||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final PasswordEncoder passwordEncoder;
|
private final PasswordEncoder passwordEncoder;
|
||||||
@@ -50,7 +50,7 @@ public class UserImportListener extends AnalysisEventListener<UserImportDTO> {
|
|||||||
|
|
||||||
private final List<Role> roleList;
|
private final List<Role> roleList;
|
||||||
private final List<Dept> deptList;
|
private final List<Dept> deptList;
|
||||||
private final List<DictData> genderDataList;
|
private final List<DictData> genderList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 当前行
|
* 当前行
|
||||||
@@ -71,7 +71,7 @@ public class UserImportListener extends AnalysisEventListener<UserImportDTO> {
|
|||||||
.select(Role::getId, Role::getCode));
|
.select(Role::getId, Role::getCode));
|
||||||
this.deptList = SpringUtil.getBean(DeptService.class)
|
this.deptList = SpringUtil.getBean(DeptService.class)
|
||||||
.list(new LambdaQueryWrapper<Dept>().select(Dept::getId, Dept::getCode));
|
.list(new LambdaQueryWrapper<Dept>().select(Dept::getId, Dept::getCode));
|
||||||
this.genderDataList = SpringUtil.getBean(DictDataService.class)
|
this.genderList = SpringUtil.getBean(DictDataService.class)
|
||||||
.list(new LambdaQueryWrapper<DictData>().eq(DictData::getDictCode, DictCodeEnum.GENDER.getValue()));
|
.list(new LambdaQueryWrapper<DictData>().eq(DictData::getDictCode, DictCodeEnum.GENDER.getValue()));
|
||||||
this.excelResult = new ExcelResult();
|
this.excelResult = new ExcelResult();
|
||||||
}
|
}
|
||||||
@@ -133,7 +133,6 @@ public class UserImportListener extends AnalysisEventListener<UserImportDTO> {
|
|||||||
String deptCode = userImportDTO.getDeptCode();
|
String deptCode = userImportDTO.getDeptCode();
|
||||||
entity.setDeptId(getDeptId(deptCode));
|
entity.setDeptId(getDeptId(deptCode));
|
||||||
|
|
||||||
|
|
||||||
boolean saveResult = userService.save(entity);
|
boolean saveResult = userService.save(entity);
|
||||||
if (saveResult) {
|
if (saveResult) {
|
||||||
excelResult.setValidCount(excelResult.getValidCount() + 1);
|
excelResult.setValidCount(excelResult.getValidCount() + 1);
|
||||||
@@ -200,8 +199,12 @@ public class UserImportListener extends AnalysisEventListener<UserImportDTO> {
|
|||||||
*/
|
*/
|
||||||
private Integer getGenderValue(String genderLabel) {
|
private Integer getGenderValue(String genderLabel) {
|
||||||
if (StrUtil.isNotBlank(genderLabel)) {
|
if (StrUtil.isNotBlank(genderLabel)) {
|
||||||
return this.genderDataList.stream().filter(r -> r.getLabel().equals(genderLabel))
|
return this.genderList.stream()
|
||||||
.findFirst().map(DictData::getValue).map(Convert::toInt).orElse(null);
|
.filter(r -> r.getLabel().equals(genderLabel))
|
||||||
|
.findFirst()
|
||||||
|
.map(DictData::getValue)
|
||||||
|
.map(Convert::toInt)
|
||||||
|
.orElse(null);
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user