From 2a6e530dd10758e7ed9d6dd0c32820c323cc9042 Mon Sep 17 00:00:00 2001 From: teddy Date: Fri, 12 Dec 2025 11:50:23 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=83=81=ED=83=9C=EA=B0=92=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/CustomAuthenticationProvider.java | 2 -- .../cd/kamcoback/members/dto/MembersDto.java | 7 +++- .../postgres/core/MapSheetMngCoreService.java | 34 +++++++++---------- .../postgres/core/MembersCoreService.java | 6 +++- 4 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java b/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java index 4ab0401e..757c0a52 100644 --- a/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java +++ b/src/main/java/com/kamco/cd/kamcoback/auth/CustomAuthenticationProvider.java @@ -11,7 +11,6 @@ import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.stereotype.Component; @Component @@ -19,7 +18,6 @@ import org.springframework.stereotype.Component; public class CustomAuthenticationProvider implements AuthenticationProvider { private final MembersRepository membersRepository; - private final UserDetailsService userDetailsService; @Override public Authentication authenticate(Authentication authentication) throws AuthenticationException { diff --git a/src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java b/src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java index f0de1810..de69c6e3 100644 --- a/src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java @@ -153,10 +153,15 @@ public class MembersDto { @Size(max = 255) private String tempPassword; - public UpdateReq(String employeeNo, String name, String tempPassword) { + @Schema(description = "상태", example = "ACTIVE") + @EnumValid(enumClass = StatusType.class, message = "status는 ACTIVE, INACTIVE, DELETED 만 가능합니다.") + private String status; + + public UpdateReq(String employeeNo, String name, String tempPassword, String status) { this.employeeNo = employeeNo; this.name = name; this.tempPassword = tempPassword; + this.status = status; } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java index d258a1aa..98607d44 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java @@ -34,20 +34,20 @@ public class MapSheetMngCoreService { private String activeEnv; public Page findMapSheetErrorList( - MapSheetMngDto.@Valid searchReq searchReq) { + MapSheetMngDto.@Valid searchReq searchReq) { return mapSheetMngRepository.findMapSheetErrorList(searchReq); } public Page findMapSheetMngList( - MapSheetMngDto.@Valid searchReq searchReq) { + MapSheetMngDto.@Valid searchReq searchReq) { return mapSheetMngRepository.findMapSheetMngList(searchReq); } public MapSheetMngDto.DmlReturn uploadFile(MultipartFile file, Long hstUid) { MapSheetMngHstEntity entity = - mapSheetMngRepository - .findMapSheetMngHstInfo(hstUid) - .orElseThrow(() -> new EntityNotFoundException("해당 이력이 존재하지 않습니다.")); + mapSheetMngRepository + .findMapSheetMngHstInfo(hstUid) + .orElseThrow(() -> new EntityNotFoundException("해당 이력이 존재하지 않습니다.")); String localPath = ""; String rootDir = ORIGINAL_IMAGES_PATH + "/" + entity.getMngYyyy(); @@ -92,10 +92,10 @@ public class MapSheetMngCoreService { if (!Objects.isNull(hstUidList) && !hstUidList.isEmpty()) { for (Long hstUid : hstUidList) { Optional entity = - Optional.ofNullable( - mapSheetMngRepository - .findMapSheetMngHstInfo(hstUid) - .orElseThrow(EntityNotFoundException::new)); + Optional.ofNullable( + mapSheetMngRepository + .findMapSheetMngHstInfo(hstUid) + .orElseThrow(EntityNotFoundException::new)); // TODO: local TEST 시 각자 경로 수정하기 // TODO: application.yml 에 active profile : local 로 임시 변경하여 테스트 @@ -127,10 +127,10 @@ public class MapSheetMngCoreService { if (!Objects.isNull(hstUidList) && !hstUidList.isEmpty()) { for (Long hstUid : hstUidList) { Optional entity = - Optional.ofNullable( - mapSheetMngRepository - .findMapSheetMngHstInfo(hstUid) - .orElseThrow(EntityNotFoundException::new)); + Optional.ofNullable( + mapSheetMngRepository + .findMapSheetMngHstInfo(hstUid) + .orElseThrow(EntityNotFoundException::new)); // entity.get().updateUseInference(true); } @@ -151,10 +151,10 @@ public class MapSheetMngCoreService { // 모든 파일명을 Set으로 저장 Set fileNames = - paths - .filter(Files::isRegularFile) - .map(p -> p.getFileName().toString()) - .collect(Collectors.toSet()); + paths + .filter(Files::isRegularFile) + .map(p -> p.getFileName().toString()) + .collect(Collectors.toSet()); // 모든 확장자 파일 존재 여부 확인 for (String ext : extensions) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java index 4ddb2490..b03ce3ed 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MembersCoreService.java @@ -81,10 +81,14 @@ public class MembersCoreService { memberEntity.setTempPassword(updateReq.getTempPassword().trim()); } - if (StringUtils.isNotBlank(memberEntity.getEmployeeNo())) { + if (StringUtils.isNotBlank(updateReq.getEmployeeNo())) { memberEntity.setEmployeeNo(updateReq.getEmployeeNo()); } + if (StringUtils.isNotBlank(updateReq.getStatus())) { + memberEntity.setStatus(updateReq.getStatus()); + } + memberEntity.setUpdtrUid(userUtil.getId()); membersRepository.save(memberEntity);