From 372a1364b2251ece2adc3508ad06cbd35da5b5e7 Mon Sep 17 00:00:00 2001 From: teddy Date: Tue, 16 Dec 2025 14:12:29 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=ED=83=9C=EA=B0=92=20enum=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD,=20spotlessApply=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/common/enums/StatusType.java | 4 +- .../common/utils/CommonStringUtils.java | 2 +- .../kamcoback/common/utils/FIleChecker.java | 4 +- .../mapsheet/MapSheetMngApiController.java | 2 +- .../cd/kamcoback/members/dto/MembersDto.java | 11 +++-- .../mapsheet/MapSheetMngRepositoryImpl.java | 41 +++++++++++-------- .../members/MembersRepositoryImpl.java | 3 +- 7 files changed, 40 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/common/enums/StatusType.java b/src/main/java/com/kamco/cd/kamcoback/common/enums/StatusType.java index 029e85ae..6d83bac7 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/enums/StatusType.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/enums/StatusType.java @@ -7,9 +7,9 @@ import lombok.Getter; @Getter @AllArgsConstructor public enum StatusType implements EnumType { - ACTIVE("활성"), + ACTIVE("사용"), INACTIVE("미사용"), - PENDING("보류"); + PENDING("계정등록"); private final String desc; diff --git a/src/main/java/com/kamco/cd/kamcoback/common/utils/CommonStringUtils.java b/src/main/java/com/kamco/cd/kamcoback/common/utils/CommonStringUtils.java index ee94b72c..c891325f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/utils/CommonStringUtils.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/utils/CommonStringUtils.java @@ -14,7 +14,7 @@ public class CommonStringUtils { */ public static boolean isValidPassword(String password) { String passwordPattern = - "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?]).{8,20}$"; + "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?=]).{8,20}$"; return Pattern.matches(passwordPattern, password); } diff --git a/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java b/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java index f7e76691..f6d53588 100644 --- a/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java +++ b/src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java @@ -253,8 +253,8 @@ public class FIleChecker { List fileList = new ArrayList<>(); SimpleDateFormat dttmFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - //int fileTotCnt = 0; - //long fileTotSize = 0; + // int fileTotCnt = 0; + // long fileTotSize = 0; try (Stream stream = Files.walk(startPath, maxDepth)) { diff --git a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java index 1f1c4413..9869992f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java @@ -43,7 +43,7 @@ public class MapSheetMngApiController { public ApiResponseDto> findMapSheetMngList( @RequestBody MapSheetMngDto.MngSearchReq searchReq) { - System.out.println("kkkkkkkkkkkkkkkkkkkkkkkkk"); + System.out.println("kkkkkkkkkkkkkkkkkkkkkkkkk"); return ApiResponseDto.ok(mapSheetMngService.findMapSheetMngList(searchReq)); } 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 557be142..55494625 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 @@ -46,7 +46,8 @@ public class MembersDto { ZonedDateTime createdDttm, ZonedDateTime firstLoginDttm, ZonedDateTime lastLoginDttm, - ZonedDateTime statusChgDttm) { + ZonedDateTime statusChgDttm, + Boolean pwdResetYn) { this.id = id; this.uuid = uuid; this.userRole = userRole; @@ -54,7 +55,7 @@ public class MembersDto { this.name = name; this.employeeNo = employeeNo; this.status = status; - this.statusName = getStatusName(status); + this.statusName = getStatusName(status, pwdResetYn); this.createdDttm = createdDttm; this.firstLoginDttm = firstLoginDttm; this.lastLoginDttm = lastLoginDttm; @@ -66,8 +67,12 @@ public class MembersDto { return type.getText(); } - private String getStatusName(String status) { + private String getStatusName(String status, Boolean pwdResetYn) { StatusType type = Enums.fromId(StatusType.class, status); + pwdResetYn = pwdResetYn != null && pwdResetYn; + if (type.equals(StatusType.PENDING) && pwdResetYn) { + type = StatusType.ACTIVE; + } return type.getText(); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java index e8bde29a..305e466b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java @@ -54,12 +54,13 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport NumberExpression totalCount = mapSheetMngHstEntity.count().as("syncTotCnt"); - NumberExpression doneCount = new CaseBuilder() - .when(mapSheetMngHstEntity.dataState.eq("DONE")) - .then(1L) - .otherwise(0L) - .sum() - .as("syncStateDoneCnt"); + NumberExpression doneCount = + new CaseBuilder() + .when(mapSheetMngHstEntity.dataState.eq("DONE")) + .then(1L) + .otherwise(0L) + .sum() + .as("syncStateDoneCnt"); List foundContent = queryFactory @@ -87,22 +88,28 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport .otherwise(0L) .sum(), new CaseBuilder() - .when(mapSheetMngHstEntity.syncState.eq("NOFILE") - .or( mapSheetMngHstEntity.syncState.eq("NOTPAIR"))) + .when( + mapSheetMngHstEntity + .syncState + .eq("NOFILE") + .or(mapSheetMngHstEntity.syncState.eq("NOTPAIR"))) .then(1L) .otherwise(0L) .sum(), new CaseBuilder() - .when(mapSheetMngHstEntity.syncState.eq("DUPLICATE")) - .then(1L) - .otherwise(0L) - .sum(), + .when(mapSheetMngHstEntity.syncState.eq("DUPLICATE")) + .then(1L) + .otherwise(0L) + .sum(), new CaseBuilder() - .when(mapSheetMngHstEntity.syncState.eq("TYPEERROR") - .or( mapSheetMngHstEntity.syncState.eq("SIZEERROR"))) - .then(1L) - .otherwise(0L) - .sum(), + .when( + mapSheetMngHstEntity + .syncState + .eq("TYPEERROR") + .or(mapSheetMngHstEntity.syncState.eq("SIZEERROR"))) + .then(1L) + .otherwise(0L) + .sum(), mapSheetMngEntity.createdDttm, mapSheetMngHstEntity.syncEndDttm.max())) .from(mapSheetMngEntity) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java index a57d9204..0cf06001 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java @@ -125,7 +125,8 @@ public class MembersRepositoryImpl implements MembersRepositoryCustom { memberEntity.createdDttm, memberEntity.firstLoginDttm, memberEntity.lastLoginDttm, - memberEntity.statusChgDttm)) + memberEntity.statusChgDttm, + memberEntity.pwdResetYn)) .from(memberEntity) .where(builder) .offset(pageable.getOffset())