260408_01_ENH: 리스트 업로드, 조회, 삭제 1차 구현 완료

This commit is contained in:
2026-04-08 17:04:01 +09:00
parent 88e8ef13c1
commit 59e22cecb9
97 changed files with 3038 additions and 217 deletions

View File

@@ -1,13 +1,13 @@
package com.kri.contact.server.service;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.common.excel.ExcelMapper;
import com.kri.common.web.BusinessException;
import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.feature.excel.ExcelMapper;
import com.kri.common.feature.web.BusinessException;
import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient;
import com.kri.contact.server.common.util.ExcelUploadResultUtil;
import com.kri.contact.server.dto.common.DataVerificationDto;
import com.kri.contact.server.dto.excel.ExcelUploadResponseDto;
import com.kri.contact.server.dto.excel.ExcelUploadResultDto;
import com.kri.contact.server.dto.user.RoleInfoDto;
import com.kri.contact.server.dto.user.UserInfoDto;
import com.kri.contact.server.dto.excel.UserUploadDto;
@@ -31,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
public class UserService {
private final IntranetExtensionApiClient intranetExtensionApiClient;
private final AssignService assignService;
private final RoleService roleService;
private final UserRepository userRepository;
@@ -54,19 +55,24 @@ public class UserService {
}
@Transactional
public ExcelUploadResponseDto createUsersFromExcel(MultipartFile file, String regUser,
public ExcelUploadResultDto createUsersFromExcel(MultipartFile file, String regUser,
LocalDateTime regDt, String forceCmpn) {
if (file == null || file.isEmpty()) {
throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다.");
}
String fileName = file.getOriginalFilename();
String errorFileName = fileName != null && fileName.endsWith(".xlsx")
? fileName.substring(0, fileName.length() - 5) + "_error.xlsx"
: fileName + "_error.xlsx";
List<UserUploadDto> rows;
try (Workbook workbook = WorkbookFactory.create(file.getInputStream())) {
// DTO 매핑 (스트리밍 X, 일반 방식)
rows = ExcelMapper.readFromWorkbook(workbook, UserUploadDto.class);
} catch (Exception e) {
throw BusinessException.badRequest("INVALID_EXCEL", "엑셀 파일을 읽는 중 오류가 발생했습니다.")
.with("fileName", file.getOriginalFilename());
.with("fileName", fileName);
}
int totalCount = rows.size();
@@ -114,12 +120,19 @@ public class UserService {
}
}
int failCount = errorList.stream()
.map(UserUploadErrorDto::getRowNumber)
.distinct()
.toList()
.size();
return ExcelUploadResultUtil.buildUploadResult(
totalCount,
successCount,
failCount,
errorList,
UserUploadErrorDto.class,
"user_upload_errors.xlsx"
errorFileName
);
}
@@ -205,6 +218,10 @@ public class UserService {
.with("userId", dto.getUserId())
);
if(entity.getUserRole() != dto.getUserRole()) {
assignService.deleteListAssignWithUser(dto.getUserId());
}
entity.updateFromDto(dto, modUser, modDt);// 기존 엔티티에 적용
}
@@ -307,7 +324,7 @@ public class UserService {
Integer userRole = dto.getUserRole();
if (roleList != null && !roleList.isEmpty()) {
boolean exists = roleList.stream()
.anyMatch(r -> userRole.equals(r.getRoleCd()));
.anyMatch(r -> userRole != null && userRole.equals(r.getRoleCd()));
if (!exists) {
result.add(new DataVerificationDto(