MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

상태값 enum 변경, spotlessApply 적용

Browse Source
This commit is contained in:
teddy
2025-12-16 14:12:29 +09:00
parent 103242d292
commit 372a1364b2
7 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/kamco/cd/kamcoback/common/enums/StatusType.java
View File

@@ -7,9 +7,9 @@ import lombok.Getter;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum StatusType implements EnumType { public enum StatusType implements EnumType {
ACTIVE("활성"), ACTIVE("사용"),
INACTIVE("미사용"), INACTIVE("미사용"),
PENDING("보류"); PENDING("계정등록");
private final String desc; private final String desc;

2
src/main/java/com/kamco/cd/kamcoback/common/utils/CommonStringUtils.java
View File

@@ -14,7 +14,7 @@ public class CommonStringUtils {
*/ */
public static boolean isValidPassword(String password) { public static boolean isValidPassword(String password) {
String passwordPattern = String passwordPattern =
"^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?]).{8,20}$"; "^(?=.*[A-Za-z])(?=.*\\d)(?=.*[!@#$%^&*()_+\\-\\[\\]{};':\"\\\\|,.<>/?=]).{8,20}$";
return Pattern.matches(passwordPattern, password); return Pattern.matches(passwordPattern, password);
} }

4
src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java
View File

@@ -253,8 +253,8 @@ public class FIleChecker {
List<Basic> fileList = new ArrayList<>(); List<Basic> fileList = new ArrayList<>();
SimpleDateFormat dttmFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat dttmFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//int fileTotCnt = 0; // int fileTotCnt = 0;
//long fileTotSize = 0; // long fileTotSize = 0;
try (Stream<Path> stream = Files.walk(startPath, maxDepth)) { try (Stream<Path> stream = Files.walk(startPath, maxDepth)) {

2
src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java
View File

@@ -43,7 +43,7 @@ public class MapSheetMngApiController {
public ApiResponseDto<Page<MapSheetMngDto.MngDto>> findMapSheetMngList( public ApiResponseDto<Page<MapSheetMngDto.MngDto>> findMapSheetMngList(
@RequestBody MapSheetMngDto.MngSearchReq searchReq) { @RequestBody MapSheetMngDto.MngSearchReq searchReq) {
System.out.println("kkkkkkkkkkkkkkkkkkkkkkkkk"); System.out.println("kkkkkkkkkkkkkkkkkkkkkkkkk");
return ApiResponseDto.ok(mapSheetMngService.findMapSheetMngList(searchReq)); return ApiResponseDto.ok(mapSheetMngService.findMapSheetMngList(searchReq));
} }

11
src/main/java/com/kamco/cd/kamcoback/members/dto/MembersDto.java
View File

@@ -46,7 +46,8 @@ public class MembersDto {
ZonedDateTime createdDttm, ZonedDateTime createdDttm,
ZonedDateTime firstLoginDttm, ZonedDateTime firstLoginDttm,
ZonedDateTime lastLoginDttm, ZonedDateTime lastLoginDttm,
ZonedDateTime statusChgDttm) { ZonedDateTime statusChgDttm,
Boolean pwdResetYn) {
this.id = id; this.id = id;
this.uuid = uuid; this.uuid = uuid;
this.userRole = userRole; this.userRole = userRole;
@@ -54,7 +55,7 @@ public class MembersDto {
this.name = name; this.name = name;
this.employeeNo = employeeNo; this.employeeNo = employeeNo;
this.status = status; this.status = status;
this.statusName = getStatusName(status); this.statusName = getStatusName(status, pwdResetYn);
this.createdDttm = createdDttm; this.createdDttm = createdDttm;
this.firstLoginDttm = firstLoginDttm; this.firstLoginDttm = firstLoginDttm;
this.lastLoginDttm = lastLoginDttm; this.lastLoginDttm = lastLoginDttm;
@@ -66,8 +67,12 @@ public class MembersDto {
return type.getText(); return type.getText();
} }
private String getStatusName(String status) { private String getStatusName(String status, Boolean pwdResetYn) {
StatusType type = Enums.fromId(StatusType.class, status); StatusType type = Enums.fromId(StatusType.class, status);
pwdResetYn = pwdResetYn != null && pwdResetYn;
if (type.equals(StatusType.PENDING) && pwdResetYn) {
type = StatusType.ACTIVE;
}
return type.getText(); return type.getText();
} }
} }

41
src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java
View File

@@ -54,12 +54,13 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
NumberExpression<Long> totalCount = mapSheetMngHstEntity.count().as("syncTotCnt"); NumberExpression<Long> totalCount = mapSheetMngHstEntity.count().as("syncTotCnt");
NumberExpression<Long> doneCount = new CaseBuilder() NumberExpression<Long> doneCount =
.when(mapSheetMngHstEntity.dataState.eq("DONE")) new CaseBuilder()
.then(1L) .when(mapSheetMngHstEntity.dataState.eq("DONE"))
.otherwise(0L) .then(1L)
.sum() .otherwise(0L)
.as("syncStateDoneCnt"); .sum()
.as("syncStateDoneCnt");
List<MapSheetMngDto.MngDto> foundContent = List<MapSheetMngDto.MngDto> foundContent =
queryFactory queryFactory
@@ -87,22 +88,28 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.eq("NOFILE") .when(
.or( mapSheetMngHstEntity.syncState.eq("NOTPAIR"))) mapSheetMngHstEntity
.syncState
.eq("NOFILE")
.or(mapSheetMngHstEntity.syncState.eq("NOTPAIR")))
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.eq("DUPLICATE")) .when(mapSheetMngHstEntity.syncState.eq("DUPLICATE"))
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.eq("TYPEERROR") .when(
.or( mapSheetMngHstEntity.syncState.eq("SIZEERROR"))) mapSheetMngHstEntity
.then(1L) .syncState
.otherwise(0L) .eq("TYPEERROR")
.sum(), .or(mapSheetMngHstEntity.syncState.eq("SIZEERROR")))
.then(1L)
.otherwise(0L)
.sum(),
mapSheetMngEntity.createdDttm, mapSheetMngEntity.createdDttm,
mapSheetMngHstEntity.syncEndDttm.max())) mapSheetMngHstEntity.syncEndDttm.max()))
.from(mapSheetMngEntity) .from(mapSheetMngEntity)

3
src/main/java/com/kamco/cd/kamcoback/postgres/repository/members/MembersRepositoryImpl.java
View File

@@ -125,7 +125,8 @@ public class MembersRepositoryImpl implements MembersRepositoryCustom {
memberEntity.createdDttm, memberEntity.createdDttm,
memberEntity.firstLoginDttm, memberEntity.firstLoginDttm,
memberEntity.lastLoginDttm, memberEntity.lastLoginDttm,
memberEntity.statusChgDttm)) memberEntity.statusChgDttm,
memberEntity.pwdResetYn))
.from(memberEntity) .from(memberEntity)
.where(builder) .where(builder)
.offset(pageable.getOffset()) .offset(pageable.getOffset())