260714_01_ENH: 테스트 서버에서 기동 후 중간 테스트를 위한 커밋

This commit is contained in:
2026-07-14 10:01:05 +09:00
parent 88d65bebe0
commit 50ecd6bf6b
162 changed files with 6790 additions and 907 deletions

View File

@@ -0,0 +1,76 @@
package com.kri.contact.server.dto.cmpn;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.kri.contact.server.persistence.entity.TCmpnEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "회사 정보")
public class CmpnInfoDto {
@Size(max = 32)
@NotBlank
@Schema(description = "회사 id(회사이름)")
private String cmpnId;
@Size(max = 32)
@NotBlank
@Schema(description = "회사 별칭")
private String cmpnAlias;
@Size(max = 16)
@Schema(description = "회사 전화번호")
private String cmpnTel;
@NotNull
@Schema(description = "자사 여부")
private Boolean ownCmpn;
@Schema(description = "메모")
private String memo;
@Size(max = 32)
@Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY)
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private String regUser;
@Schema(description = "등록일시", accessMode = Schema.AccessMode.READ_ONLY)
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private LocalDateTime regDt;
@Size(max = 32)
@Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY)
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private String modUser;
@Schema(description = "수정일시", accessMode = Schema.AccessMode.READ_ONLY)
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
private LocalDateTime modDt;
public static CmpnInfoDto from(TCmpnEntity entity) {
return CmpnInfoDto.builder()
.cmpnId(entity.getCmpnId())
.cmpnAlias(entity.getCmpnAlias())
.cmpnTel(entity.getCmpnTel())
.ownCmpn(entity.getOwnCmpn())
.memo(entity.getMemo())
.regUser(entity.getRegUser())
.regDt(entity.getRegDt())
.modUser(entity.getModUser())
.modDt(entity.getModDt())
.build();
}
}

View File

@@ -0,0 +1,21 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListHeaderTypeAssign;
import com.kri.contact.server.common.validation.ValidListFilterCondition;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@ValidListFilterCondition
@Schema(description = "배정 필터 조건")
public class ListAssignFilterConditionDto extends ListFilterConditionDto {
@NotNull
@Schema(description = "배정 타입")
private ListHeaderTypeAssign assignType;
}

View File

@@ -1,33 +0,0 @@
package com.kri.contact.server.dto.list;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "")
public class ListAssignInfoDto {
@NotNull
@Schema(description = "리스트 id")
private Integer sid;
@NotNull
@Schema(description = "배정될 사용자 id")
private String userId;
public static ListAssignInfoDto from(Integer sid, String userId) {
return ListAssignInfoDto.builder()
.sid(sid)
.userId(userId)
.build();
}
}

View File

@@ -0,0 +1,35 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListAssignType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "리스트 배정 요청 Dto")
public class ListAssignRequestDto {
@Valid
@NotNull
@Schema(description = "배정 타입")
private ListAssignType assignType;
@Valid
@NotNull
@Schema(description = "배정시 예약 이관 여부")
private Boolean transferResve;
@Valid
@Schema(description = "리스트 필터")
private ListFilterDto listFilter;
}

View File

@@ -0,0 +1,30 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListAssignType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "리스트 배정 초기화 요청 Dto")
public class ListAssignResetRequestDto {
@Valid
@NotNull
@Schema(description = "배정 타입")
private ListAssignType assignType;
@Valid
@Schema(description = "리스트 필터")
private ListFilterDto listFilter;
}

View File

@@ -0,0 +1,54 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.persistence.entity.TListCallHistEntity;
import java.time.Instant;
import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class ListCallHistDto {
private Long listCallHistIdx;
private Long prjctIdx;
private Integer sid;
private Integer listHderId;
private String destNum;
private String agentNum;
private String aniNum;
private String agentSessionId;
private String destSessionId;
private String callTy;
private LocalDateTime startDt;
private Integer totalTime;
private Integer talkTime;
private Integer mediaServerId;
private String mediaServerName;
private String recordFileName;
private String regUser;
private LocalDateTime regDt;
public static ListCallHistDto from(TListCallHistEntity entity) {
return ListCallHistDto.builder()
.listCallHistIdx(entity.getId())
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.listHderId(entity.getListHderId())
.destNum(entity.getDestNum())
.agentNum(entity.getAgentNum())
.aniNum(entity.getAniNum())
.agentSessionId(entity.getAgentSessionId())
.destSessionId(entity.getDestSessionId())
.callTy(entity.getCallTy())
.startDt(entity.getStartDt())
.totalTime(entity.getTotalTime())
.talkTime(entity.getTalkTime())
.mediaServerId(entity.getMediaServerId())
.mediaServerName(entity.getMediaServerName())
.recordFileName(entity.getRecordFileName())
.regUser(entity.getRegUser())
.regDt(entity.getRegDt())
.build();
}
}

View File

@@ -0,0 +1,63 @@
package com.kri.contact.server.dto.list;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import java.time.Instant;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class ListCallHistRequestDto {
@NotNull
private Integer listHderId;
@NotBlank
@Size(max = 64)
private String destNum;
@NotBlank
@Size(max = 64)
private String agentNum;
@NotBlank
@Size(max = 64)
private String aniNum;
@NotBlank
@Size(max = 64)
private String agentSessionId;
@NotBlank
@Size(max = 64)
private String destSessionId;
@NotBlank
@Size(max = 64)
private String callTy;
@NotNull
private LocalDateTime startDt;
@NotNull
private Integer totalTime;
@NotNull
private Integer talkTime;
@NotNull
private Integer mediaServerId;
@NotBlank
@Size(max = 64)
private String mediaServerName;
@NotBlank
@Size(max = 256)
private String recordFileName;
}

View File

@@ -16,16 +16,13 @@ import lombok.experimental.SuperBuilder;
@Schema(description = "컨택/방문 면접 결과")
public class ListContactResultDto extends ListResultBaseDto {
@Schema(description = "컨택/방문면접 시도 횟수")
private Integer attemptCount;
@Schema(description = "마지막 컨택/방문면접 자")
@Schema(description = "마지막 컨택/방문면접원")
private String lastUser;
@Schema(description = "할당된 컨택/방문면접자")
@Schema(description = "할당된 컨택/방문면접원")
private String assignUser;
public static ListContactResultDto from(TListEventHistEntity entity) {
public static ListContactResultDto from(TListEventHistEntity entity, Integer attemptCount) {
if (entity == null) {
return null;
}
@@ -33,6 +30,7 @@ public class ListContactResultDto extends ListResultBaseDto {
return ListContactResultDto.builder()
.lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue())
.lastResultDt(entity.getRegDt())
.attemptCount(attemptCount)
.lastUser(entity.getRegUser())
.build();
}

View File

@@ -1,5 +1,6 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListEventHistoryBase;
import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.dto.common.DateRangeDto;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -17,6 +18,7 @@ import lombok.Setter;
@Schema(description = "리스트 + 컨택이력 다운로드 요청 DTO")
public class ListEventHistDownloadRequestDto {
@Valid
@NotNull
@Schema(description = "리스트 필터")
private ListFilterDto listFilter;
@@ -25,6 +27,10 @@ public class ListEventHistDownloadRequestDto {
@Schema(description = "조회할 ResultCodeType 목록")
private List<ResultCodeType> resultCodeTypes;
@NotNull
@Schema(description = "조회 기준")
private ListEventHistoryBase searchBase;
@Valid
@Schema(description = "조회 기간")
private DateRangeDto dateRange;

View File

@@ -0,0 +1,33 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListEventHistorySurveyType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@Schema(description = "설문 결과 입력 Dto")
public class ListEventHistFromSurveyDto {
@NotNull
@Schema(description = "입력 action 코드")
private ListEventHistorySurveyType action;
@NotNull
@Schema(description = "프로젝트 고유 번호")
private Long prjctIdx;
@NotNull
@Schema(description = "리스트 고유 번호")
private Integer sid;
@NotNull
@Schema(description = "메타 데이터")
@Valid
private ListEventHistSurveyMetaDto meta;
}

View File

@@ -0,0 +1,41 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ResultCodeType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@Schema(description = "내부 리스트 이벤트 이력 추가 요청 DTO")
public class ListEventHistInsertRequestDto {
@NotNull
@Schema(description = "프로젝트 고유 번호")
private Long prjctIdx;
@NotNull
@Schema(description = "리스트 고유 번호")
private Integer sid;
@NotNull
@Schema(description = "결과 코드 타입")
private ResultCodeType resultCodeType;
@NotNull
@Schema(description = "결과 코드")
private Integer resultCd;
@Valid
@Schema(description = "메타 데이터")
private ListEventHistInternalMetaDto meta;
@NotNull
@Schema(description = "사용자 메모")
private String memo;
}

View File

@@ -0,0 +1,54 @@
package com.kri.contact.server.dto.list;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class ListEventHistInternalMetaDto {
@Schema(description = "GPS 위도")
private Double latitude;
@Schema(description = "GPS 경도")
private Double longitude;
@Schema(description = "GPS 위치 정확도(미터)")
private Double accuracy;
@Schema(description = "요청 클라이언트 IP 주소")
private String remoteAddr;
@Builder(access = AccessLevel.PRIVATE)
private ListEventHistInternalMetaDto(
Double latitude,
Double longitude,
Double accuracy,
String remoteAddr
) {
this.latitude = latitude;
this.longitude = longitude;
this.accuracy = accuracy;
this.remoteAddr = remoteAddr;
}
public static ListEventHistInternalMetaDto withRemoteAddr(
ListEventHistInternalMetaDto meta,
String remoteAddr
) {
if (meta == null) {
meta = new ListEventHistInternalMetaDto();
}
return ListEventHistInternalMetaDto.builder()
.latitude(meta.getLatitude())
.longitude(meta.getLongitude())
.accuracy(meta.getAccuracy())
.remoteAddr(remoteAddr)
.build();
}
}

View File

@@ -0,0 +1,52 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListEventHistoryExternalEntryType;
import com.kri.contact.server.common.enums.ListEventHistorySurveyType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class ListEventHistSurveyMetaDto {
@NotNull
@Schema(description = "진입 유형")
private ListEventHistoryExternalEntryType entryType;
@NotNull
@Schema(description = "입력 action 코드")
private ListEventHistorySurveyType action;
@Schema(description = "프로젝트 고유 번호")
private String pid;
@Schema(description = "리스트 고유 번호")
private String sid;
@Schema(description = "요청 클라이언트 IP 주소")
private String remoteAddr;
@Schema(description = "요청 URI 경로")
private String uri;
@Schema(description = "쿼리스트링을 포함한 전체 요청 URL")
private String url;
@Schema(description = "요청 User-Agent 헤더")
private String userAgent;
@Schema(description = "요청 Referer 헤더")
private String referer;
@Schema(description = "요청 Origin 헤더")
private String origin;
@Schema(description = "프록시 또는 로드밸런서를 통해 전달된 X-Forwarded-For 헤더")
private String xForwardedFor;
@Schema(description = "프록시 표준 전달 정보인 Forwarded 헤더")
private String forwarded;
}

View File

@@ -0,0 +1,37 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.persistence.entity.TListEventHistEntity;
import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class ListEventHistoryDto {
private Long listEventHistIdx;
private Short eventTy;
private Long prjctIdx;
private Integer sid;
private Integer resultCd;
private String metaData;
private Long listCallHistIdx;
private String memo;
private String regUser;
private LocalDateTime regDt;
public static ListEventHistoryDto from(TListEventHistEntity entity) {
return ListEventHistoryDto.builder()
.listEventHistIdx(entity.getListEventHistIdx())
.eventTy(entity.getEventTy())
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.resultCd(entity.getResultCd())
.metaData(entity.getMetaData())
.listCallHistIdx(entity.getListCallHistIdx())
.memo(entity.getMemo())
.regUser(entity.getRegUser())
.regDt(entity.getRegDt())
.build();
}
}

View File

@@ -0,0 +1,32 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListFilterMatchType;
import com.kri.contact.server.common.enums.ListFilterOperator;
import com.kri.contact.server.common.validation.ValidListFilterCondition;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@ValidListFilterCondition
@Schema(description = "List filter condition")
public class ListFilterConditionDto {
@NotNull
@Schema(description = "Filter operator")
private ListFilterOperator operator;
@NotNull
@Schema(description = "Filter match type")
private ListFilterMatchType matchType;
@Schema(description = "Filter values")
private List<String> values;
}

View File

@@ -1,8 +1,12 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListHeaderTypeAssign;
import com.kri.contact.server.common.enums.ListIsUse;
import com.kri.contact.server.common.enums.ResultCodeType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
import java.util.Set;
import lombok.AllArgsConstructor;
@@ -20,26 +24,47 @@ import lombok.Setter;
public class ListFilterDto {
@NotNull
@Schema(description = "sid 목록")
private Set<Integer> sidSet;
@Schema(description = "SID 목록. 숫자 또는 숫자~숫자 형식")
private Set<String> sidSet;
@NotNull
@Schema(description = "리스트 사용 여부 목록")
private Set<ListIsUse> listUseSet;
@Schema(description = "중요 메모")
private String memo;
@NotNull
@Schema(description = "List use filter conditions")
private List<@Valid ListFilterConditionDto> listUseConditions;
@NotNull
@Schema(description = "그 외 필터 정보")
private Map<Integer, Set<String>> otherItems;
@Schema(description = "배정 사용자 필터. key: ListHeaderTypeAssign 코드")
private Map<ListHeaderTypeAssign, Set<String>> assignUserMap;
@NotNull
@Schema(description = "배정 필터 조건")
private List<@Valid ListAssignFilterConditionDto> assignConditions;
@NotNull
@Schema(description = "List 결과값 필터 key: ResultCodeType code, value: result code list")
private Map<ResultCodeType, Set<Integer>> resultCodeMap;
@NotNull
@Schema(description = "메모 필터 조건")
private List<@Valid ListFilterConditionDto> memoConditions;
@NotNull
@Schema(description = "기타 항목 필터 조건")
private List<@Valid ListOtherItemFilterConditionDto> otherItemConditions;
public static ListFilterDto onlyOneSid(Integer sid) {
return ListFilterDto.builder()
.sidSet(Set.of(sid))
.sidSet(Set.of(String.valueOf(sid)))
.listUseSet(Set.of())
.memo("")
.otherItems(Map.of())
.listUseConditions(List.of())
.assignUserMap(Map.of())
.assignConditions(List.of())
.resultCodeMap(Map.of())
.memoConditions(List.of())
.otherItemConditions(List.of())
.build();
}
}

View File

@@ -5,18 +5,16 @@ import com.kri.contact.server.common.enums.ListHeaderType;
import com.kri.contact.server.persistence.entity.TListHeaderEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.NotNull.List;
import java.time.LocalDateTime;
import java.util.Objects;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.SuperBuilder;
@Getter
@Setter
@Builder
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "리스트 헤더")
@@ -100,9 +98,9 @@ public class ListHeaderDto {
.listHderGrad(ListHeaderGrade.COMMON)
.listHderNm(headerName)
.listHderTy(type)
.useFilter(false)
.useColView(false)
.useIntrvwerView(false)
.useFilter(true)
.useColView(true)
.useIntrvwerView(true)
.useIntrvwerEdit(false)
.build();
}

View File

@@ -0,0 +1,41 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListHeaderGrade;
import com.kri.contact.server.common.enums.ListHeaderType;
import com.kri.contact.server.persistence.entity.TListHeaderEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.SuperBuilder;
@Getter
@Setter
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "리스트 헤더 (필터 목록 포함)")
public class ListHeaderWithFilterContentDto extends ListHeaderDto {
private List<String> filterContents;
public static ListHeaderWithFilterContentDto fromEntity(
TListHeaderEntity entity,
List<String> filterContents
) {
return ListHeaderWithFilterContentDto.builder()
.prjctIdx(entity.getPrjctIdx())
.listHderId(entity.getListHderId())
.listHderOrder(entity.getListHderOrder())
.listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad()))
.listHderNm(entity.getListHderNm())
.listHderTy(ListHeaderType.fromCode(entity.getListHderTy()))
.useFilter(entity.getUseFilter())
.useColView(entity.getUseColView())
.useIntrvwerView(entity.getUseIntrvwerView())
.useIntrvwerEdit(entity.getUseIntrvwerEdit())
.filterContents(filterContents)
.build();
}
}

View File

@@ -0,0 +1,20 @@
package com.kri.contact.server.dto.list;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "기타 항목 필터 조건")
public class ListOtherItemFilterConditionDto extends ListFilterConditionDto {
@NotNull
@Schema(description = "리스트 헤더 ID")
private Integer listHderId;
}

View File

@@ -2,6 +2,7 @@ package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListResetMode;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import lombok.Getter;
import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@ public class ListResetRequestDto {
@Schema(description = "초기화 범위")
private ListResetMode resetMode;
@Valid
@NotNull
@Schema(description = "리스트 필터")
private ListFilterDto listFilter;

View File

@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "결과에 대한 기본 정보")
@Schema(description = "결과 코드 기본 정보")
public class ListResultBaseDto {
@Schema(description = "최종 결과값")
@@ -23,7 +23,10 @@ public class ListResultBaseDto {
@Schema(description = "최종 결과값 일시")
private LocalDateTime lastResultDt;
public static ListResultBaseDto from(TListEventHistEntity entity) {
@Schema(description = "시도 횟수")
private Integer attemptCount;
public static ListResultBaseDto from(TListEventHistEntity entity, Integer attemptCount) {
if (entity == null) {
return null;
}
@@ -31,7 +34,7 @@ public class ListResultBaseDto {
return ListResultBaseDto.builder()
.lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue())
.lastResultDt(entity.getRegDt())
.attemptCount(attemptCount)
.build();
}
}

View File

@@ -1,7 +1,12 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListHeaderTypeAssign;
import com.kri.contact.server.common.enums.ListIsUse;
import com.kri.contact.server.persistence.entity.TListEntity;
import com.kri.contact.server.service.ListSearchService.AssignValues;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Getter;
@@ -24,7 +29,10 @@ public class ListSearchBaseDto {
private Integer sid;
@Schema(description = "사용 여부")
private Short use;
private ListIsUse use;
@Schema(description = "배정 사용자 목록. key: ListHeaderTypeAssign 코드(13=외주사, 14=컨택원, 15=면접원)")
private Map<ListHeaderTypeAssign, String> assignList;
@Schema(description = "메모")
private String memo;
@@ -32,18 +40,37 @@ public class ListSearchBaseDto {
@Schema(description = "리스트 값 정보")
private Map<Integer, String> itemList;
public static ListSearchBaseDto from(TListEntity entity, Map<Integer, String> itemList) {
public static ListSearchBaseDto from(TListEntity entity, Map<Integer, String> itemList, AssignValues assignValues) {
if (entity == null) {
return null;
}
AssignValues values = assignValues == null ? AssignValues.empty() : assignValues;
return ListSearchBaseDto.builder()
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.use(entity.getUse())
.use(ListIsUse.fromCode(entity.getUse()))
.assignList(toAssignList(values))
.memo(entity.getMemo())
.itemList(itemList)
.build();
}
protected static Map<ListHeaderTypeAssign, String> toAssignList(AssignValues values) {
Map<ListHeaderTypeAssign, String> assignList = new LinkedHashMap<>();
putFirst(assignList, ListHeaderTypeAssign.OUTSOURCE, values.outsourceUserIds());
putFirst(assignList, ListHeaderTypeAssign.CONTACT_INTERVIEWER, values.contactInterviewerIds());
putFirst(assignList, ListHeaderTypeAssign.FIELD_INTERVIEWER, values.fieldInterviewerIds());
return assignList;
}
private static void putFirst(
Map<ListHeaderTypeAssign, String> assignList,
ListHeaderTypeAssign type,
List<String> values
) {
if (values != null && !values.isEmpty()) {
assignList.put(type, values.get(0));
}
}
}

View File

@@ -2,6 +2,7 @@ package com.kri.contact.server.dto.list;
import com.kri.common.feature.web.page.PageRequestDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.List;
import java.util.Map;
@@ -19,6 +20,7 @@ import lombok.Setter;
@Schema(description = "리스트 검색 조건")
public class ListSearchRequestDto {
@Valid
@NotNull
@Schema(description = "리스트 필터")
private ListFilterDto listFilter;

View File

@@ -1,6 +1,8 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListIsUse;
import com.kri.contact.server.persistence.entity.TListEntity;
import com.kri.contact.server.service.ListSearchService.AssignValues;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.Map;
import lombok.AllArgsConstructor;
@@ -18,28 +20,31 @@ import lombok.experimental.SuperBuilder;
public class ListSearchWithFullResultDto extends ListSearchWithResultDto {
@Schema(description = "메일 발송 결과")
private ListResultBaseDto mailSendResult;
private ListSendResultDto mailSendResult;
@Schema(description = "문자 발송 결과")
private ListResultBaseDto smsSendResult;
private ListSendResultDto smsSendResult;
public static ListSearchWithFullResultDto from(
TListEntity entity,
Map<Integer, String> itemList,
AssignValues assignValues,
ListContactResultDto contactResult,
ListContactResultDto interviewResult,
ListResultBaseDto surveyResult,
ListResultBaseDto mailSendResult,
ListResultBaseDto smsSendResult
ListSendResultDto mailSendResult,
ListSendResultDto smsSendResult
) {
if (entity == null) {
return null;
}
AssignValues values = assignValues == null ? AssignValues.empty() : assignValues;
return ListSearchWithFullResultDto.builder()
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.use(entity.getUse())
.use(ListIsUse.fromCode(entity.getUse()))
.assignList(toAssignList(values))
.memo(entity.getMemo())
.itemList(itemList)
.contactResult(contactResult)

View File

@@ -1,6 +1,8 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListIsUse;
import com.kri.contact.server.persistence.entity.TListEntity;
import com.kri.contact.server.service.ListSearchService.AssignValues;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.Map;
import lombok.AllArgsConstructor;
@@ -28,6 +30,7 @@ public class ListSearchWithResultDto extends ListSearchBaseDto {
public static ListSearchWithResultDto from(
TListEntity entity,
Map<Integer, String> itemList,
AssignValues assignValues,
ListContactResultDto contactResult,
ListContactResultDto interviewResult,
ListResultBaseDto surveyResult
@@ -36,10 +39,12 @@ public class ListSearchWithResultDto extends ListSearchBaseDto {
return null;
}
AssignValues values = assignValues == null ? AssignValues.empty() : assignValues;
return ListSearchWithResultDto.builder()
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.use(entity.getUse())
.use(ListIsUse.fromCode(entity.getUse()))
.assignList(toAssignList(values))
.memo(entity.getMemo())
.itemList(itemList)
.contactResult(contactResult)

View File

@@ -0,0 +1,36 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.persistence.entity.TListEventHistEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import lombok.experimental.SuperBuilder;
@Getter
@Setter
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@Schema(description = "발송 결과")
public class ListSendResultDto extends ListResultBaseDto {
@Schema(description = "마지막 컨택/방문면접원")
private String lastResultLabel;
/* Todo Noti hub로 부터 받아서 생성하는 static 메소드 필요
public static ListSendResultDto from(TListEventHistEntity entity, String resultLabel, Integer attemptCount) {
if (entity == null) {
return null;
}
return ListSendResultDto.builder()
.lastResultCd(entity.getResultCd() == null ? null : entity.getResultCd().shortValue())
.lastResultDt(entity.getRegDt())
.attemptCount(attemptCount)
.lastResultLabel(resultLabel)
.build();
}
*/
}

View File

@@ -0,0 +1,33 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.persistence.entity.TListUpdateHistEntity;
import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class ListUpdateHistoryDto {
private Long listUpdateHistIdx;
private Long prjctIdx;
private Integer sid;
private Integer listHderId;
private String beforeVal;
private String afterVal;
private String regUser;
private LocalDateTime regDt;
public static ListUpdateHistoryDto from(TListUpdateHistEntity entity) {
return ListUpdateHistoryDto.builder()
.listUpdateHistIdx(entity.getListUpdateHistIdx())
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.listHderId(entity.getListHderId())
.beforeVal(entity.getBeforeVal())
.afterVal(entity.getAfterVal())
.regUser(entity.getRegUser())
.regDt(entity.getRegDt())
.build();
}
}

View File

@@ -1,6 +1,8 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ResultCodeType;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotNull;
import java.util.Map;
import lombok.Getter;
@@ -13,10 +15,13 @@ import lombok.Setter;
@Schema(description = "리스트 정보 수정 요청 DTO")
public class ListUpdateRequestDto {
@NotNull
@Schema(description = "리스트 정보 수정내용 sid를 제외한 모든 내용, listHderId by listItemValue")
private Map<Integer, String> updateContents;
@Schema(description = "리스트 결과 코드 수정내용")
private Map<ResultCodeType, Integer> updateResultCodes;
@Valid
@NotNull
@Schema(description = "리스트 필터")
private ListFilterDto listFilter;

View File

@@ -0,0 +1,17 @@
package com.kri.contact.server.dto.list;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
@Schema(description = "리스트 업로드 파일 정보")
public class ListUploadFileInfoDto {
@Schema(description = "파일명")
private String fileName;
@Schema(description = "파일 바이트")
private byte[] bytes;
}

View File

@@ -0,0 +1,47 @@
package com.kri.contact.server.dto.list;
import com.kri.contact.server.common.enums.ListUploadMode;
import com.kri.contact.server.persistence.entity.TListUploadLogEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
@Schema(description = "리스트 업로드 이력")
public class ListUploadHistoryDto {
@Schema(description = "리스트 업로드 로그 ID")
private String listUploadLogId;
@Schema(description = "업로드 차수")
private Integer wave;
@Schema(description = "업로드 파일명")
private String fileName;
@Schema(description = "업로드 리스트 수")
private Integer listCount;
@Schema(description = "업로드 모드")
private ListUploadMode uploadMode;
@Schema(description = "등록 사용자")
private String regUser;
@Schema(description = "등록 일시")
private LocalDateTime regDt;
public static ListUploadHistoryDto fromEntity(TListUploadLogEntity entity) {
return ListUploadHistoryDto.builder()
.listUploadLogId(entity.getListUploadLogId())
.wave(entity.getWave())
.fileName(entity.getFileNm())
.listCount(entity.getListCnt())
.uploadMode(ListUploadMode.fromCode(entity.getMode()))
.regUser(entity.getRegUser())
.regDt(entity.getRegDt())
.build();
}
}

View File

@@ -0,0 +1,19 @@
package com.kri.contact.server.dto.message;
import java.util.ArrayList;
import java.util.List;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class MessageBulkSendResponseDto {
private String bulkSendKey;
private int targetCount;
private int requestCount;
private int acceptCount;
private int failCount;
@Builder.Default
private List<MessageFailedChunkDto> failedChunks = new ArrayList<>();
}

View File

@@ -0,0 +1,15 @@
package com.kri.contact.server.dto.message;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class MessageFailedChunkDto {
private int chunkIndex;
private int from;
private int to;
private int targetCount;
private String errorMessage;
}

View File

@@ -0,0 +1,35 @@
package com.kri.contact.server.dto.message;
import com.kri.contact.server.dto.list.ListFilterDto;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@Schema(description = "Message bulk send request")
public class MessageSendBulkRequestDto {
@NotNull
private Long tmplatIdx;
@NotNull
private Boolean resve;
private LocalDateTime sendDt;
@Valid
private ListFilterDto listFilter;
@NotEmpty
private List<Integer> destHeaderIds;
private Integer destNameHeaderId;
}

View File

@@ -0,0 +1,33 @@
package com.kri.contact.server.dto.message;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
import java.util.List;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@Schema(description = "Message single send request")
public class MessageSendSingleRequestDto {
@NotNull
private Long tmplatIdx;
@NotNull
private Boolean resve;
private LocalDateTime sendDt;
@NotNull
private Integer sid;
@NotEmpty
private List<Integer> destHeaderIds;
private Integer destNameHeaderId;
}

View File

@@ -0,0 +1,24 @@
package com.kri.contact.server.dto.progress;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
@Schema(description = "날짜별 진행 현황")
public class ProgressDateResponseDto {
private String contactDate;
private String startTime;
private String endTime;
private long totalCount;
@Builder.Default
private Map<Integer, Long> resultCodeCountMap = new LinkedHashMap<>();
}

View File

@@ -0,0 +1,23 @@
package com.kri.contact.server.dto.progress;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@Schema(description = "진행 현황 조회 요청")
public class ProgressSearchRequestDto {
@Schema(description = "사용자 ID")
private String userId;
@Schema(description = "회사 ID")
private String cmpnId;
@Schema(description = "시작일시")
private String startDt;
@Schema(description = "종료일시")
private String endDt;
}

View File

@@ -0,0 +1,20 @@
package com.kri.contact.server.dto.progress;
import io.swagger.v3.oas.annotations.media.Schema;
import java.util.LinkedHashMap;
import java.util.Map;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
@Schema(description = "사용자별 진행 현황")
public class ProgressUserResponseDto {
private String userId;
private long totalCount;
@Builder.Default
private Map<Integer, Long> resultCodeCountMap = new LinkedHashMap<>();
}

View File

@@ -68,6 +68,10 @@ public class ProjectInfoDto {
@Schema(description = "설문 URL")
private String surveyUrl;
@Size(max = 128)
@Schema(description = "외부 설문 대시보드 URL. surveyTy가 99(EXTERNAL)일 때만 사용")
private String surveyDashboardUrl;
@NotNull
@Schema(description = "면접원 확인사항 여부")
private Boolean ff;
@@ -109,6 +113,7 @@ public class ProjectInfoDto {
.surveyTy(SurveyType.fromCode(entity.getSurveyTy()))
.surveyPrjctCd(entity.getSurveyPrjctCd())
.surveyUrl(entity.getSurveyUrl())
.surveyDashboardUrl(entity.getSurveyDashboardUrl())
.ff(entity.getFf())
.useContactSenario(entity.getUseContactSenario())
.contactSenario(entity.getContactSenario())

View File

@@ -15,9 +15,9 @@ public class ProjectUpdateRequestDto {
@Schema(description = "프로젝트 정보")
private ProjectInfoDto projectInfo;
@Schema(description = "프로젝트 수정 되야 할 결과코드")
@Schema(description = "프로젝트 수정 대상 결과 코드")
private List<ResultCodeDto> resultCodeList;
@Schema(description = "배정될 외주 업체 목록")
private List<String> assignUserIdList;
@Schema(description = "프로젝트 배정 회사 목록")
private List<String> assignCmpnIdList;
}

View File

@@ -29,6 +29,8 @@ public class ResultCodeDto {
@Schema(description = "결과 코드 라벨")
private String resultCdLbl;
private Boolean isDefault;
public static ResultCodeDto from(TResultCodeEntity entity) {
return ResultCodeDto.builder()
.resultCdUUID(CommonUtil.uuid32())
@@ -36,6 +38,7 @@ public class ResultCodeDto {
.resultCdTy(entity.getResultCdTy())
.resultCd(entity.getResultCd())
.resultCdLbl(entity.getResultCdLbl())
.isDefault(Boolean.TRUE.equals(entity.getDefaultCode()))
.build();
}
}

View File

@@ -0,0 +1,35 @@
package com.kri.contact.server.dto.reserve;
import com.kri.contact.server.persistence.entity.TListResveEntity;
import java.time.LocalDateTime;
import lombok.Builder;
import lombok.Getter;
@Getter
@Builder
public class ListReserveDto {
private Long listResveIdx;
private Long prjctIdx;
private Integer sid;
private String memo;
private Boolean cnfirm;
private LocalDateTime resveDt;
private String resveUser;
private String regUser;
private LocalDateTime regDt;
public static ListReserveDto from(TListResveEntity entity) {
return ListReserveDto.builder()
.listResveIdx(entity.getListResveIdx())
.prjctIdx(entity.getPrjctIdx())
.sid(entity.getSid())
.memo(entity.getMemo())
.cnfirm(entity.getCnfirm())
.resveDt(entity.getResveDt())
.resveUser(entity.getResveUser())
.regUser(entity.getRegUser())
.regDt(entity.getRegDt())
.build();
}
}

View File

@@ -0,0 +1,26 @@
package com.kri.contact.server.dto.reserve;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import java.time.LocalDateTime;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
public class ListReserveRequestDto {
@NotNull
private Long prjctIdx;
@NotNull
private Integer sid;
@NotBlank
private String userId;
@NotNull
private LocalDateTime resveDt;
}

View File

@@ -0,0 +1,28 @@
package com.kri.contact.server.dto.systemlog;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.springframework.web.multipart.MultipartFile;
@Getter
@Setter
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UploadContentDto {
String fileName;
String fileType;
Long fileSize;
public static UploadContentDto from(MultipartFile file){
return UploadContentDto.builder()
.fileName(file.getOriginalFilename())
.fileType(file.getContentType())
.fileSize(file.getSize())
.build();
}
}

View File

@@ -1,16 +0,0 @@
package com.kri.contact.server.dto.systemlog;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Setter
@Getter
@AllArgsConstructor
public class UploadUserContentDto {
String fileName;
String fileType;
Long fileSize;
}