260716_01_ENH: 본 서버에서 기동 후 중간 테스트를 위한 커밋
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.excel;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import com.kri.common.feature.excel.ExcelColumn;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
@@ -8,15 +10,19 @@ import lombok.experimental.SuperBuilder;
|
||||
@SuperBuilder
|
||||
@Getter
|
||||
@Setter
|
||||
@Schema(description = "ExcelErrorDto")
|
||||
public class ExcelErrorDto {
|
||||
|
||||
@ExcelColumn(header = "행 번호", order = 0)
|
||||
@Schema(description = "rowNumber")
|
||||
private int rowNumber;
|
||||
|
||||
@ExcelColumn(header = "필드명", order = 1)
|
||||
@Schema(description = "fieldName")
|
||||
private String fieldName;
|
||||
|
||||
@ExcelColumn(header = "에러 메시지", order = 2)
|
||||
@Schema(description = "errorMessage")
|
||||
private String errorMessage;
|
||||
|
||||
public static ExcelErrorDto of(int rowNumber, String fieldName, String errorMessage) {
|
||||
|
||||
@@ -8,6 +8,7 @@ import lombok.Setter;
|
||||
@Getter
|
||||
@Setter
|
||||
@Builder
|
||||
@Schema(description = "ExcelUploadResultDto")
|
||||
public class ExcelUploadResultDto {
|
||||
|
||||
@Schema(description = "전체 읽은 행 수 (헤더 제외)")
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.excel;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
@@ -7,6 +9,7 @@ import lombok.experimental.SuperBuilder;
|
||||
@SuperBuilder
|
||||
@Getter
|
||||
@Setter
|
||||
@Schema(description = "ListUploadErrorDto")
|
||||
public class ListUploadErrorDto extends ExcelErrorDto {
|
||||
public static ListUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) {
|
||||
return ListUploadErrorDto.builder()
|
||||
|
||||
@@ -13,6 +13,7 @@ import lombok.Setter;
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(description = "UserUploadDto")
|
||||
public class UserUploadDto {
|
||||
|
||||
@ExcelColumn(header = "사용자 ID", order = 0, width = 11)
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.excel;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.experimental.SuperBuilder;
|
||||
@@ -7,6 +9,7 @@ import lombok.experimental.SuperBuilder;
|
||||
@SuperBuilder
|
||||
@Getter
|
||||
@Setter
|
||||
@Schema(description = "UserUploadErrorDto")
|
||||
public class UserUploadErrorDto extends ExcelErrorDto {
|
||||
|
||||
public static UserUploadErrorDto of(int rowNumber, String fieldName, String errorMessage) {
|
||||
|
||||
@@ -1,32 +1,54 @@
|
||||
package com.kri.contact.server.dto.list;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import com.kri.contact.server.persistence.entity.TListCallHistEntity;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "ListCallHistDto")
|
||||
public class ListCallHistDto {
|
||||
|
||||
@Schema(description = "listCallHistIdx")
|
||||
private Long listCallHistIdx;
|
||||
@Schema(description = "prjctIdx")
|
||||
private Long prjctIdx;
|
||||
@Schema(description = "sid")
|
||||
private Integer sid;
|
||||
@Schema(description = "listHderId")
|
||||
private Integer listHderId;
|
||||
@Schema(description = "destNum")
|
||||
private String destNum;
|
||||
@Schema(description = "agentNum")
|
||||
private String agentNum;
|
||||
@Schema(description = "aniNum")
|
||||
private String aniNum;
|
||||
@Schema(description = "agentSessionId")
|
||||
private String agentSessionId;
|
||||
@Schema(description = "destSessionId")
|
||||
private String destSessionId;
|
||||
@Schema(description = "callTy")
|
||||
private String callTy;
|
||||
@Schema(description = "startDt")
|
||||
private LocalDateTime startDt;
|
||||
@Schema(description = "endDt")
|
||||
private LocalDateTime endDt;
|
||||
@Schema(description = "totalTime")
|
||||
private Integer totalTime;
|
||||
@Schema(description = "talkTime")
|
||||
private Integer talkTime;
|
||||
@Schema(description = "mediaServerId")
|
||||
private Integer mediaServerId;
|
||||
@Schema(description = "mediaServerName")
|
||||
private String mediaServerName;
|
||||
@Schema(description = "recordFileName")
|
||||
private String recordFileName;
|
||||
@Schema(description = "regUser")
|
||||
private String regUser;
|
||||
@Schema(description = "regDt")
|
||||
private LocalDateTime regDt;
|
||||
|
||||
public static ListCallHistDto from(TListCallHistEntity entity) {
|
||||
@@ -42,6 +64,7 @@ public class ListCallHistDto {
|
||||
.destSessionId(entity.getDestSessionId())
|
||||
.callTy(entity.getCallTy())
|
||||
.startDt(entity.getStartDt())
|
||||
.endDt(entity.getEndDt())
|
||||
.totalTime(entity.getTotalTime())
|
||||
.talkTime(entity.getTalkTime())
|
||||
.mediaServerId(entity.getMediaServerId())
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.list;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Size;
|
||||
@@ -12,52 +14,65 @@ import lombok.Setter;
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "ListCallHistRequestDto")
|
||||
public class ListCallHistRequestDto {
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "listHderId")
|
||||
private Integer listHderId;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "destNum")
|
||||
private String destNum;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "agentNum")
|
||||
private String agentNum;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "aniNum")
|
||||
private String aniNum;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "agentSessionId")
|
||||
private String agentSessionId;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "destSessionId")
|
||||
private String destSessionId;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "callTy")
|
||||
private String callTy;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "startDt")
|
||||
private LocalDateTime startDt;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "totalTime")
|
||||
private Integer totalTime;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "talkTime")
|
||||
private Integer talkTime;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "mediaServerId")
|
||||
private Integer mediaServerId;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 64)
|
||||
@Schema(description = "mediaServerName")
|
||||
private String mediaServerName;
|
||||
|
||||
@NotBlank
|
||||
@Size(max = 256)
|
||||
@Schema(description = "recordFileName")
|
||||
private String recordFileName;
|
||||
}
|
||||
|
||||
@@ -31,6 +31,9 @@ public class ListEventHistInsertRequestDto {
|
||||
@Schema(description = "결과 코드")
|
||||
private Integer resultCd;
|
||||
|
||||
@Schema(description = "전화 이력 id")
|
||||
private Long listCallHistIdx;
|
||||
|
||||
@Valid
|
||||
@Schema(description = "메타 데이터")
|
||||
private ListEventHistInternalMetaDto meta;
|
||||
|
||||
@@ -10,6 +10,7 @@ import lombok.Setter;
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "ListEventHistInternalMetaDto")
|
||||
public class ListEventHistInternalMetaDto {
|
||||
|
||||
@Schema(description = "GPS 위도")
|
||||
|
||||
@@ -11,6 +11,7 @@ import lombok.Setter;
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "ListEventHistSurveyMetaDto")
|
||||
public class ListEventHistSurveyMetaDto {
|
||||
@NotNull
|
||||
@Schema(description = "진입 유형")
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.list;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import com.kri.contact.server.persistence.entity.TListEventHistEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Builder;
|
||||
@@ -7,17 +9,28 @@ import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "ListEventHistoryDto")
|
||||
public class ListEventHistoryDto {
|
||||
|
||||
@Schema(description = "listEventHistIdx")
|
||||
private Long listEventHistIdx;
|
||||
@Schema(description = "eventTy")
|
||||
private Short eventTy;
|
||||
@Schema(description = "prjctIdx")
|
||||
private Long prjctIdx;
|
||||
@Schema(description = "sid")
|
||||
private Integer sid;
|
||||
@Schema(description = "resultCd")
|
||||
private Integer resultCd;
|
||||
@Schema(description = "metaData")
|
||||
private String metaData;
|
||||
@Schema(description = "listCallHistIdx")
|
||||
private Long listCallHistIdx;
|
||||
@Schema(description = "memo")
|
||||
private String memo;
|
||||
@Schema(description = "regUser")
|
||||
private String regUser;
|
||||
@Schema(description = "regDt")
|
||||
private LocalDateTime regDt;
|
||||
|
||||
public static ListEventHistoryDto from(TListEventHistEntity entity) {
|
||||
|
||||
@@ -18,6 +18,7 @@ import lombok.experimental.SuperBuilder;
|
||||
@AllArgsConstructor
|
||||
@Schema(description = "리스트 헤더 (필터 목록 포함)")
|
||||
public class ListHeaderWithFilterContentDto extends ListHeaderDto {
|
||||
@Schema(description = "filterContents")
|
||||
private List<String> filterContents;
|
||||
|
||||
public static ListHeaderWithFilterContentDto fromEntity(
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.list;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import com.kri.contact.server.persistence.entity.TListUpdateHistEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Builder;
|
||||
@@ -7,15 +9,24 @@ import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "ListUpdateHistoryDto")
|
||||
public class ListUpdateHistoryDto {
|
||||
|
||||
@Schema(description = "listUpdateHistIdx")
|
||||
private Long listUpdateHistIdx;
|
||||
@Schema(description = "prjctIdx")
|
||||
private Long prjctIdx;
|
||||
@Schema(description = "sid")
|
||||
private Integer sid;
|
||||
@Schema(description = "listHderId")
|
||||
private Integer listHderId;
|
||||
@Schema(description = "beforeVal")
|
||||
private String beforeVal;
|
||||
@Schema(description = "afterVal")
|
||||
private String afterVal;
|
||||
@Schema(description = "regUser")
|
||||
private String regUser;
|
||||
@Schema(description = "regDt")
|
||||
private LocalDateTime regDt;
|
||||
|
||||
public static ListUpdateHistoryDto from(TListUpdateHistEntity entity) {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.message;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.Builder;
|
||||
@@ -7,13 +9,20 @@ import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "MessageBulkSendResponseDto")
|
||||
public class MessageBulkSendResponseDto {
|
||||
|
||||
@Schema(description = "bulkSendKey")
|
||||
private String bulkSendKey;
|
||||
@Schema(description = "targetCount")
|
||||
private int targetCount;
|
||||
@Schema(description = "requestCount")
|
||||
private int requestCount;
|
||||
@Schema(description = "acceptCount")
|
||||
private int acceptCount;
|
||||
@Schema(description = "failCount")
|
||||
private int failCount;
|
||||
@Builder.Default
|
||||
@Schema(description = "failedChunks")
|
||||
private List<MessageFailedChunkDto> failedChunks = new ArrayList<>();
|
||||
}
|
||||
|
||||
@@ -1,15 +1,23 @@
|
||||
package com.kri.contact.server.dto.message;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "MessageFailedChunkDto")
|
||||
public class MessageFailedChunkDto {
|
||||
|
||||
@Schema(description = "chunkIndex")
|
||||
private int chunkIndex;
|
||||
@Schema(description = "from")
|
||||
private int from;
|
||||
@Schema(description = "to")
|
||||
private int to;
|
||||
@Schema(description = "targetCount")
|
||||
private int targetCount;
|
||||
@Schema(description = "errorMessage")
|
||||
private String errorMessage;
|
||||
}
|
||||
|
||||
@@ -18,18 +18,27 @@ import lombok.Setter;
|
||||
public class MessageSendBulkRequestDto {
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "템플릿 고유 번호", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Long tmplatIdx;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "예약 발송 여부", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private Boolean resve;
|
||||
|
||||
@Schema(description = "예약 발송 일시")
|
||||
private LocalDateTime sendDt;
|
||||
|
||||
@Valid
|
||||
@Schema(description = "리스트 필터")
|
||||
private ListFilterDto listFilter;
|
||||
|
||||
@NotEmpty
|
||||
@Schema(description = "수신처로 사용할 리스트 헤더 ID 목록", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||
private List<Integer> destHeaderIds;
|
||||
|
||||
@Schema(description = "수신자 이름으로 사용할 리스트 헤더 ID")
|
||||
private Integer destNameHeaderId;
|
||||
|
||||
@Schema(description = "수신처 중복 제거 여부", defaultValue = "false")
|
||||
private Boolean dedupe = false;
|
||||
}
|
||||
|
||||
@@ -16,18 +16,24 @@ import lombok.Setter;
|
||||
public class MessageSendSingleRequestDto {
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "tmplatIdx")
|
||||
private Long tmplatIdx;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "resve")
|
||||
private Boolean resve;
|
||||
|
||||
@Schema(description = "sendDt")
|
||||
private LocalDateTime sendDt;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "sid")
|
||||
private Integer sid;
|
||||
|
||||
@NotEmpty
|
||||
@Schema(description = "destHeaderIds")
|
||||
private List<Integer> destHeaderIds;
|
||||
|
||||
@Schema(description = "destNameHeaderId")
|
||||
private Integer destNameHeaderId;
|
||||
}
|
||||
|
||||
@@ -11,14 +11,19 @@ import lombok.Getter;
|
||||
@Schema(description = "날짜별 진행 현황")
|
||||
public class ProgressDateResponseDto {
|
||||
|
||||
@Schema(description = "contactDate")
|
||||
private String contactDate;
|
||||
|
||||
@Schema(description = "startTime")
|
||||
private String startTime;
|
||||
|
||||
@Schema(description = "endTime")
|
||||
private String endTime;
|
||||
|
||||
@Schema(description = "totalCount")
|
||||
private long totalCount;
|
||||
|
||||
@Builder.Default
|
||||
@Schema(description = "resultCodeCountMap")
|
||||
private Map<Integer, Long> resultCodeCountMap = new LinkedHashMap<>();
|
||||
}
|
||||
|
||||
@@ -11,10 +11,13 @@ import lombok.Getter;
|
||||
@Schema(description = "사용자별 진행 현황")
|
||||
public class ProgressUserResponseDto {
|
||||
|
||||
@Schema(description = "userId")
|
||||
private String userId;
|
||||
|
||||
@Schema(description = "totalCount")
|
||||
private long totalCount;
|
||||
|
||||
@Builder.Default
|
||||
@Schema(description = "resultCodeCountMap")
|
||||
private Map<Integer, Long> resultCodeCountMap = new LinkedHashMap<>();
|
||||
}
|
||||
|
||||
@@ -29,6 +29,7 @@ public class ResultCodeDto {
|
||||
@Schema(description = "결과 코드 라벨")
|
||||
private String resultCdLbl;
|
||||
|
||||
@Schema(description = "isDefault")
|
||||
private Boolean isDefault;
|
||||
|
||||
public static ResultCodeDto from(TResultCodeEntity entity) {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.reserve;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import com.kri.contact.server.persistence.entity.TListResveEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Builder;
|
||||
@@ -7,16 +9,26 @@ import lombok.Getter;
|
||||
|
||||
@Getter
|
||||
@Builder
|
||||
@Schema(description = "ListReserveDto")
|
||||
public class ListReserveDto {
|
||||
|
||||
@Schema(description = "listResveIdx")
|
||||
private Long listResveIdx;
|
||||
@Schema(description = "prjctIdx")
|
||||
private Long prjctIdx;
|
||||
@Schema(description = "sid")
|
||||
private Integer sid;
|
||||
@Schema(description = "memo")
|
||||
private String memo;
|
||||
@Schema(description = "cnfirm")
|
||||
private Boolean cnfirm;
|
||||
@Schema(description = "resveDt")
|
||||
private LocalDateTime resveDt;
|
||||
@Schema(description = "resveUser")
|
||||
private String resveUser;
|
||||
@Schema(description = "regUser")
|
||||
private String regUser;
|
||||
@Schema(description = "regDt")
|
||||
private LocalDateTime regDt;
|
||||
|
||||
public static ListReserveDto from(TListResveEntity entity) {
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.reserve;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -10,17 +12,22 @@ import lombok.Setter;
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@Schema(description = "ListReserveRequestDto")
|
||||
public class ListReserveRequestDto {
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "prjctIdx")
|
||||
private Long prjctIdx;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "sid")
|
||||
private Integer sid;
|
||||
|
||||
@NotBlank
|
||||
@Schema(description = "userId")
|
||||
private String userId;
|
||||
|
||||
@NotNull
|
||||
@Schema(description = "resveDt")
|
||||
private LocalDateTime resveDt;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
package com.kri.contact.server.dto.systemlog;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
@@ -12,6 +14,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
@Builder
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
@Schema(description = "UploadContentDto")
|
||||
public class UploadContentDto {
|
||||
String fileName;
|
||||
String fileType;
|
||||
|
||||
Reference in New Issue
Block a user