From 4456205f13a9c664f5607773c367bda75b7b1553 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 6 Mar 2026 11:16:44 +0900 Subject: [PATCH] =?UTF-8?q?260306=5F01=5FENH:=20DTO=20=EC=95=84=ED=82=A4?= =?UTF-8?q?=ED=85=8D=EC=B2=98=20=EC=A1=B0=EC=A0=95=20=EB=B0=8F=20ListHeade?= =?UTF-8?q?r=20RU=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/common/consts/ContactConstant.java | 2 +- .../server/common/enums/ChannelType.java | 2 +- .../server/common/enums/ListHeaderGrade.java | 31 ++++++ .../server/common/enums/ListHeaderType.java | 35 ++++++ .../server/common/enums/ProjectStatus.java | 2 +- .../server/common/enums/ResultCodeType.java | 2 +- .../server/common/enums/SurveyType.java | 2 +- .../server/common/enums/SystemEventType.java | 2 + .../intranet/IntranetExtensionApiClient.java | 2 +- .../common/util/ExcelUploadResultUtil.java | 2 +- .../server/controller/AuthController.java | 4 +- .../controller/ListHeaderController.java | 41 +++++++ .../server/controller/ProjectController.java | 12 +- .../controller/ResultCodeController.java | 2 +- .../server/controller/RoleController.java | 2 +- .../server/controller/UserController.java | 6 +- .../dto/{ => auth}/LoginRequestDto.java | 2 +- .../dto/{ => auth}/LoginResponseDto.java | 2 +- .../dto/{ => common}/DataVerificationDto.java | 2 +- .../{ => excel}/ExcelUploadResponseDto.java | 2 +- .../server/dto/list/ListHeaderDto.java | 96 ++++++++++++++++ .../ProjectCreateRequestDto.java | 2 +- .../dto/{ => project}/ProjectInfoDto.java | 2 +- .../ProjectMainTemplateUpdateRequestDto.java | 2 +- .../ProjectOwnerResponseDto.java | 2 +- .../ProjectSearchRequestDto.java | 2 +- .../ProjectUpdateRequestDto.java | 2 +- .../dto/{ => project}/ResultCodeDto.java | 2 +- .../server/dto/{ => user}/RoleInfoDto.java | 2 +- .../server/dto/{ => user}/UserInfoDto.java | 2 +- .../entity/TListCallHistEntity.java | 105 ++++++++++++++++++ .../persistence/entity/TListEntityId.java | 4 +- .../persistence/entity/TListHeaderEntity.java | 71 +++++++++++- .../entity/TListHeaderEntityId.java | 11 +- .../persistence/entity/TListItemEntityId.java | 4 +- .../entity/TListItemUploadEntityId.java | 4 +- .../entity/TPrjctAssignEntityId.java | 4 +- .../persistence/entity/TPrjctEntity.java | 4 +- .../entity/TPrjctMainTmplatEntity.java | 2 +- .../entity/TPrjctMainTmplatEntityId.java | 4 +- .../persistence/entity/TResultCodeEntity.java | 2 +- .../entity/TResultCodeEntityId.java | 4 +- .../entity/TRoleFuncMapEntityId.java | 1 + .../persistence/entity/TUserEntity.java | 2 +- .../repository/ListHeaderRepository.java | 23 ++++ .../repository/ListItemRepository.java | 11 ++ .../repository/ListRepository.java | 12 ++ .../repository/ProjectAssignRepository.java | 5 +- .../ProjectMainTemplateRepository.java | 5 +- .../repository/ProjectRepository.java | 1 + .../repository/ResultCodeRepository.java | 4 +- .../repository/RoleRepository.java | 4 +- .../repository/SystemEventLogRepository.java | 4 +- .../repository/UserRepository.java | 7 +- .../contact/server/service/AuthService.java | 4 +- .../server/service/ListHeaderService.java | 98 ++++++++++++++++ .../server/service/ListItemService.java | 18 +++ .../contact/server/service/ListService.java | 15 +++ .../server/service/ProjectService.java | 22 ++-- .../server/service/ResultCodeService.java | 2 +- .../contact/server/service/RoleService.java | 2 +- .../server/service/SystemEventLogService.java | 23 +++- .../contact/server/service/UserService.java | 8 +- src/main/resources/application-dev.yml | 2 +- src/main/resources/application-local.yml | 2 +- src/main/resources/application-prod.yml | 2 +- src/main/resources/application.yml | 7 ++ 67 files changed, 679 insertions(+), 95 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java create mode 100644 src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java create mode 100644 src/main/java/com/kri/contact/server/controller/ListHeaderController.java rename src/main/java/com/kri/contact/server/dto/{ => auth}/LoginRequestDto.java (88%) rename src/main/java/com/kri/contact/server/dto/{ => auth}/LoginResponseDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => common}/DataVerificationDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => excel}/ExcelUploadResponseDto.java (95%) create mode 100644 src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectCreateRequestDto.java (94%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectInfoDto.java (98%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectMainTemplateUpdateRequestDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectOwnerResponseDto.java (91%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectSearchRequestDto.java (94%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ProjectUpdateRequestDto.java (93%) rename src/main/java/com/kri/contact/server/dto/{ => project}/ResultCodeDto.java (96%) rename src/main/java/com/kri/contact/server/dto/{ => user}/RoleInfoDto.java (97%) rename src/main/java/com/kri/contact/server/dto/{ => user}/UserInfoDto.java (98%) create mode 100644 src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java create mode 100644 src/main/java/com/kri/contact/server/service/ListHeaderService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListItemService.java create mode 100644 src/main/java/com/kri/contact/server/service/ListService.java diff --git a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java index cf65a66..e3e4687 100644 --- a/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java +++ b/src/main/java/com/kri/contact/server/common/consts/ContactConstant.java @@ -1,7 +1,7 @@ package com.kri.contact.server.common.consts; public final class ContactConstant { - + public static final int INSERT_CHUNK_SIZE = 1_000; public static final String DEFAULT_COMPANY_NAME = "KRI"; public static final String DEFAULT_USER_TEAM = "S101"; diff --git a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java index 567e6a1..60a2f70 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ChannelType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ChannelType.java @@ -25,7 +25,7 @@ public enum ChannelType implements CodeEnum { return null; } for (ChannelType s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java new file mode 100644 index 0000000..0d3b7eb --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderGrade.java @@ -0,0 +1,31 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListHeaderGrade implements CodeEnum { + + IMMUTABLE((short) 0), // 불변 헤더 (옵션 변경 불가) + RESERVED((short) 1), // Default 헤더 (옵션 변경 가능) + COMMON((short) 10); // 일반 헤더 (옵션 변경 가능) + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderGrade fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderGrade s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderGrade code: " + code); + } +} diff --git a/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java new file mode 100644 index 0000000..9df6253 --- /dev/null +++ b/src/main/java/com/kri/contact/server/common/enums/ListHeaderType.java @@ -0,0 +1,35 @@ +package com.kri.contact.server.common.enums; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import com.kri.common.enums.CodeEnum; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum ListHeaderType implements CodeEnum { + + SID((short) 11), //11 : SID + IS_USE((short) 12), //12 : 사용여부 + MEMO((short) 19), //19 : 메모 + TEL_NUM((short) 21), //21 : 전화번호 + EMAIL((short) 31), //31 : 이메일 + FILE((short) 81), //81 : 파일업로드 + TEXT((short) 91); //91 : 텍스트 + + private final Short code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static ListHeaderType fromCode(Short code) { + if (code == null) { + return null; + } + for (ListHeaderType s : values()) { + if (s.code.equals(code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown ListHeaderType code: " + code); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java index 75af61d..8ecbde9 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java +++ b/src/main/java/com/kri/contact/server/common/enums/ProjectStatus.java @@ -21,7 +21,7 @@ public enum ProjectStatus implements CodeEnum { return null; } for (ProjectStatus s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java index 4f0e10a..8208841 100644 --- a/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java +++ b/src/main/java/com/kri/contact/server/common/enums/ResultCodeType.java @@ -22,7 +22,7 @@ public enum ResultCodeType implements CodeEnum { return null; } for (ResultCodeType s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java index e5480e5..eb50514 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SurveyType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SurveyType.java @@ -22,7 +22,7 @@ public enum SurveyType implements CodeEnum { return null; } for (SurveyType s : values()) { - if (s.code == code) { + if (s.code.equals(code)) { return s; } } diff --git a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java index 76ceb21..c8373bf 100644 --- a/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/contact/server/common/enums/SystemEventType.java @@ -28,6 +28,8 @@ public enum SystemEventType implements CodeEnum { UPDATE_ROLE((short) 412), // 권한 수정 DELETE_ROLE((short) 413), // 권한 삭제 + UPSERT_LIST_HEADER((short) 1011), + DUMMY((short) 9999); private final Short code; diff --git a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java index 98481c4..dacd806 100644 --- a/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java +++ b/src/main/java/com/kri/contact/server/common/external/intranet/IntranetExtensionApiClient.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.common.http.ExternalApiClient; import com.kri.common.http.ExternalApiResponse; -import com.kri.contact.server.dto.LoginRequestDto; +import com.kri.contact.server.dto.auth.LoginRequestDto; import java.util.Collections; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java b/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java index 694e72b..6590692 100644 --- a/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java +++ b/src/main/java/com/kri/contact/server/common/util/ExcelUploadResultUtil.java @@ -1,7 +1,7 @@ package com.kri.contact.server.common.util; import com.kri.common.excel.ExcelMapper; -import com.kri.contact.server.dto.ExcelUploadResponseDto; +import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; import java.io.ByteArrayOutputStream; import java.util.Base64; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/controller/AuthController.java b/src/main/java/com/kri/contact/server/controller/AuthController.java index b347b85..c579fda 100644 --- a/src/main/java/com/kri/contact/server/controller/AuthController.java +++ b/src/main/java/com/kri/contact/server/controller/AuthController.java @@ -2,8 +2,8 @@ package com.kri.contact.server.controller; import com.kri.common.datetime.DateTimeUtil; import com.kri.common.webmvc.RequestUserContext; -import com.kri.contact.server.dto.LoginRequestDto; -import com.kri.contact.server.dto.LoginResponseDto; +import com.kri.contact.server.dto.auth.LoginRequestDto; +import com.kri.contact.server.dto.auth.LoginResponseDto; import com.kri.contact.server.service.AuthService; import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/kri/contact/server/controller/ListHeaderController.java b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java new file mode 100644 index 0000000..f1d3016 --- /dev/null +++ b/src/main/java/com/kri/contact/server/controller/ListHeaderController.java @@ -0,0 +1,41 @@ +package com.kri.contact.server.controller; + +import com.kri.common.webmvc.RequestUserContext; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.service.ListHeaderService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/list-header") +@RequiredArgsConstructor +@Tag(name = "ListHeader", description = "리스트 헤더 API") +public class ListHeaderController { + + ListHeaderService listHeaderService; + + @Operation(summary = "리스트 헤더 조회") + @GetMapping("/{prjctIdx}") + public List getListHeader (@PathVariable Long prjctIdx) { + return listHeaderService.getHeader(prjctIdx); + } + + @Operation(summary = "리스트 헤더 수정") + @PatchMapping("/{prjctIdx}") + public void updateListHeader ( + @PathVariable Long prjctIdx, + @Valid @RequestBody List headerList, + RequestUserContext ctx + ) { + listHeaderService.upsertHeader(prjctIdx, headerList, ctx.getUserId()); + } +} diff --git a/src/main/java/com/kri/contact/server/controller/ProjectController.java b/src/main/java/com/kri/contact/server/controller/ProjectController.java index 84fe7ff..0393608 100644 --- a/src/main/java/com/kri/contact/server/controller/ProjectController.java +++ b/src/main/java/com/kri/contact/server/controller/ProjectController.java @@ -4,12 +4,12 @@ import com.kri.common.datetime.DateTimeUtil; import com.kri.common.webmvc.RequestUserContext; import com.kri.common.webmvc.page.PageResponseDto; import com.kri.contact.server.common.enums.ChannelType; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectInfoDto; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; -import com.kri.contact.server.dto.ProjectOwnerResponseDto; -import com.kri.contact.server.dto.ProjectSearchRequestDto; -import com.kri.contact.server.dto.ProjectUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectOwnerResponseDto; +import com.kri.contact.server.dto.project.ProjectSearchRequestDto; +import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; import com.kri.contact.server.service.FileService; import com.kri.contact.server.service.ProjectService; import com.kri.contact.server.service.SystemEventLogService; diff --git a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java index f957bae..80517ef 100644 --- a/src/main/java/com/kri/contact/server/controller/ResultCodeController.java +++ b/src/main/java/com/kri/contact/server/controller/ResultCodeController.java @@ -1,7 +1,7 @@ package com.kri.contact.server.controller; import com.kri.contact.server.common.enums.ResultCodeType; -import com.kri.contact.server.dto.ResultCodeDto; +import com.kri.contact.server.dto.project.ResultCodeDto; import com.kri.contact.server.service.ResultCodeService; import com.kri.contact.server.service.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/kri/contact/server/controller/RoleController.java b/src/main/java/com/kri/contact/server/controller/RoleController.java index fedb1ee..a230c50 100644 --- a/src/main/java/com/kri/contact/server/controller/RoleController.java +++ b/src/main/java/com/kri/contact/server/controller/RoleController.java @@ -1,7 +1,7 @@ package com.kri.contact.server.controller; import com.kri.common.webmvc.RequestUserContext; -import com.kri.contact.server.dto.RoleInfoDto; +import com.kri.contact.server.dto.user.RoleInfoDto; import com.kri.contact.server.service.RoleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/kri/contact/server/controller/UserController.java b/src/main/java/com/kri/contact/server/controller/UserController.java index 5a12036..b2a203c 100644 --- a/src/main/java/com/kri/contact/server/controller/UserController.java +++ b/src/main/java/com/kri/contact/server/controller/UserController.java @@ -3,9 +3,9 @@ package com.kri.contact.server.controller; import com.kri.common.datetime.DateTimeUtil; import com.kri.common.webmvc.RequestUserContext; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.DataVerificationDto; -import com.kri.contact.server.dto.ExcelUploadResponseDto; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.common.DataVerificationDto; +import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.systemlog.UploadUserContentDto; import com.kri.contact.server.service.SystemEventLogService; import com.kri.contact.server.service.UserService; diff --git a/src/main/java/com/kri/contact/server/dto/LoginRequestDto.java b/src/main/java/com/kri/contact/server/dto/auth/LoginRequestDto.java similarity index 88% rename from src/main/java/com/kri/contact/server/dto/LoginRequestDto.java rename to src/main/java/com/kri/contact/server/dto/auth/LoginRequestDto.java index b36a193..45e386e 100644 --- a/src/main/java/com/kri/contact/server/dto/LoginRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/auth/LoginRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.auth; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java b/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/LoginResponseDto.java rename to src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java index 1b6977b..ce14bbe 100644 --- a/src/main/java/com/kri/contact/server/dto/LoginResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/auth/LoginResponseDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.auth; import com.kri.common.auth.dto.JwtUserClaimsDto; diff --git a/src/main/java/com/kri/contact/server/dto/DataVerificationDto.java b/src/main/java/com/kri/contact/server/dto/common/DataVerificationDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/DataVerificationDto.java rename to src/main/java/com/kri/contact/server/dto/common/DataVerificationDto.java index 4518dd8..9fdb2e9 100644 --- a/src/main/java/com/kri/contact/server/dto/DataVerificationDto.java +++ b/src/main/java/com/kri/contact/server/dto/common/DataVerificationDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.common; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/dto/ExcelUploadResponseDto.java b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java similarity index 95% rename from src/main/java/com/kri/contact/server/dto/ExcelUploadResponseDto.java rename to src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java index dcf5cb8..b8be008 100644 --- a/src/main/java/com/kri/contact/server/dto/ExcelUploadResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/excel/ExcelUploadResponseDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.excel; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; diff --git a/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java new file mode 100644 index 0000000..d754b9c --- /dev/null +++ b/src/main/java/com/kri/contact/server/dto/list/ListHeaderDto.java @@ -0,0 +1,96 @@ +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 jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull.List; +import java.util.Objects; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "리스트 헤더") +public class ListHeaderDto { + + @NotNull + @Schema(description = "프로젝트 기본키") + private Long prjctIdx; + + @NotNull + @Schema(description = "리스트 헤더 기본키") + private Integer listHderId; + + @NotNull + @Schema(description = "리스트 헤더 순서") + private Short listHderOrder; + + @NotNull + @Schema(description = "헤더 등급") + private ListHeaderGrade listHderGrad; + + @NotNull + @Schema(description = "헤더 명") + private String listHderNm; + + @NotNull + @Schema(description = "헤더 타입") + private ListHeaderType listHderTy; + + @Schema(description = "|로 이어 붙은 필터 값") + private String filterValue; + + @NotNull + @Schema(description = "필터 사용 여부") + private Boolean useFilter = false; + + @NotNull + @Schema(description = "리스트 노출 여부") + private Boolean useColView = false; + + @NotNull + @Schema(description = "면접원 노출 여부") + private Boolean useIntrvwerView = false; + + @NotNull + @Schema(description = "면접원 수정가능 여부") + private Boolean useIntrvwerEdit = false; + + public static ListHeaderDto fromEntity(TListHeaderEntity entity) { + return ListHeaderDto.builder() + .prjctIdx(entity.getPrjctIdx()) + .listHderId(entity.getListHderId()) + .listHderOrder(entity.getListHderOrder()) + .listHderGrad(ListHeaderGrade.fromCode(entity.getListHderGrad())) + .listHderNm(entity.getListHderNm()) + .listHderTy(ListHeaderType.fromCode(entity.getListHderTy())) + .filterValue(entity.getFilterValue()) + .useFilter(entity.getUseFilter()) + .useColView(entity.getUseColView()) + .useIntrvwerView(entity.getUseIntrvwerView()) + .useIntrvwerEdit(entity.getUseIntrvwerEdit()) + .build(); + } + + public boolean isEqualHard(ListHeaderDto dto) { + return Objects.equals(listHderId, dto.listHderId) && + Objects.equals(listHderOrder, dto.listHderOrder) && + Objects.equals(listHderGrad, dto.listHderGrad) && + Objects.equals(listHderNm, dto.listHderNm) && + Objects.equals(listHderTy, dto.listHderTy); + } + + public boolean isEqualSimple(ListHeaderDto dto) { + return Objects.equals(listHderId, dto.listHderId) && + Objects.equals(listHderGrad, dto.listHderGrad) && + Objects.equals(listHderNm, dto.listHderNm); + } +} diff --git a/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectCreateRequestDto.java similarity index 94% rename from src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectCreateRequestDto.java index 6367c04..b393130 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectCreateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectCreateRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java similarity index 98% rename from src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java index ac81cdb..0126233 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.fasterxml.jackson.annotation.JsonProperty; import com.kri.contact.server.common.enums.ProjectStatus; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectMainTemplateUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectMainTemplateUpdateRequestDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/ProjectMainTemplateUpdateRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectMainTemplateUpdateRequestDto.java index e5d20e8..410f727 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectMainTemplateUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectMainTemplateUpdateRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.kri.contact.server.common.enums.ChannelType; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectOwnerResponseDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectOwnerResponseDto.java similarity index 91% rename from src/main/java/com/kri/contact/server/dto/ProjectOwnerResponseDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectOwnerResponseDto.java index fb60327..3674290 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectOwnerResponseDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectOwnerResponseDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectSearchRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java similarity index 94% rename from src/main/java/com/kri/contact/server/dto/ProjectSearchRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java index 7dc0c05..b40bbff 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectSearchRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectSearchRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.kri.common.webmvc.page.PageRequestDto; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java b/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java similarity index 93% rename from src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java rename to src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java index db36844..4abe747 100644 --- a/src/main/java/com/kri/contact/server/dto/ProjectUpdateRequestDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ProjectUpdateRequestDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java similarity index 96% rename from src/main/java/com/kri/contact/server/dto/ResultCodeDto.java rename to src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java index a8df039..ba1a3b4 100644 --- a/src/main/java/com/kri/contact/server/dto/ResultCodeDto.java +++ b/src/main/java/com/kri/contact/server/dto/project/ResultCodeDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.project; import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.persistence.entity.TResultCodeEntity; diff --git a/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java b/src/main/java/com/kri/contact/server/dto/user/RoleInfoDto.java similarity index 97% rename from src/main/java/com/kri/contact/server/dto/RoleInfoDto.java rename to src/main/java/com/kri/contact/server/dto/user/RoleInfoDto.java index e6bb11c..ce2fad9 100644 --- a/src/main/java/com/kri/contact/server/dto/RoleInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/user/RoleInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.user; import com.fasterxml.jackson.annotation.JsonProperty; import com.kri.contact.server.persistence.entity.TRoleEntity; diff --git a/src/main/java/com/kri/contact/server/dto/UserInfoDto.java b/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java similarity index 98% rename from src/main/java/com/kri/contact/server/dto/UserInfoDto.java rename to src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java index bc15541..457231c 100644 --- a/src/main/java/com/kri/contact/server/dto/UserInfoDto.java +++ b/src/main/java/com/kri/contact/server/dto/user/UserInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.contact.server.dto; +package com.kri.contact.server.dto.user; import com.fasterxml.jackson.annotation.JsonProperty; import com.kri.common.datetime.DateTimeUtil; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java new file mode 100644 index 0000000..b0e6d43 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListCallHistEntity.java @@ -0,0 +1,105 @@ +package com.kri.contact.server.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.Instant; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Table(name = "t_list_call_hist") +public class TListCallHistEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "list_tel_hist_idx", nullable = false) + private Long id; + + @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + private Long prjctIdx; + + @NotNull + @Column(name = "sid", nullable = false) + private Integer sid; + + @NotNull + @Column(name = "list_hder_id", nullable = false) + private Integer listHderId; + + @Size(max = 64) + @NotNull + @Column(name = "dest_num", nullable = false, length = 64) + private String destNum; + + @Size(max = 64) + @NotNull + @Column(name = "agent_num", nullable = false, length = 64) + private String agentNum; + + @Size(max = 64) + @NotNull + @Column(name = "ani_num", nullable = false, length = 64) + private String aniNum; + + @Size(max = 64) + @NotNull + @Column(name = "agent_session_id", nullable = false, length = 64) + private String agentSessionId; + + @Size(max = 64) + @NotNull + @Column(name = "dest_session_id", nullable = false, length = 64) + private String destSessionId; + + @Size(max = 64) + @NotNull + @Column(name = "call_ty", nullable = false, length = 64) + private String callTy; + + @NotNull + @Column(name = "start_dt", nullable = false) + private Instant startDt; + + @NotNull + @Column(name = "total_time", nullable = false) + private Integer totalTime; + + @NotNull + @Column(name = "talk_time", nullable = false) + private Integer talkTime; + + @NotNull + @Column(name = "media_server_id", nullable = false) + private Integer mediaServerId; + + @Size(max = 64) + @NotNull + @Column(name = "media_server_name", nullable = false, length = 64) + private String mediaServerName; + + @Size(max = 256) + @NotNull + @Column(name = "record_file_name", nullable = false, length = 256) + private String recordFileName; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private Instant regDt; + + +} \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java index 6487129..7fad52e 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListEntityId.java @@ -15,7 +15,9 @@ import org.hibernate.Hibernate; public class TListEntityId implements Serializable { private static final long serialVersionUID = 7012247084434778447L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java index feddb9f..7fdf345 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntity.java @@ -1,25 +1,37 @@ package com.kri.contact.server.persistence.entity; +import com.kri.contact.server.dto.list.ListHeaderDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; +import jakarta.persistence.Lob; import jakarta.persistence.Table; 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; import org.hibernate.annotations.ColumnDefault; +@Builder @Getter @Setter @Entity +@NoArgsConstructor +@AllArgsConstructor @Table(name = "t_list_header") public class TListHeaderEntity { @EmbeddedId private TListHeaderEntityId id; + @NotNull + @Column(name = "list_hder_order", nullable = false) + private Short listHderOrder; + @NotNull @Column(name = "list_hder_grad", nullable = false) private Short listHderGrad; @@ -33,21 +45,29 @@ public class TListHeaderEntity { @Column(name = "list_hder_ty", nullable = false) private Short listHderTy; + @Lob + @Column(name = "filter_value", columnDefinition = "TEXT") + private String filterValue; // |로 이어 붙은 값들 + @NotNull + @ColumnDefault("0") @Column(name = "use_filter", nullable = false) - private Boolean useFilter = false; + private Boolean useFilter; @NotNull - @Column(name = "use_view", nullable = false) - private Boolean useView = false; + @ColumnDefault("0") + @Column(name = "use_col_view", nullable = false) + private Boolean useColView; @NotNull + @ColumnDefault("0") @Column(name = "use_intrvwer_view", nullable = false) - private Boolean useIntrvwerView = false; + private Boolean useIntrvwerView; @NotNull + @ColumnDefault("0") @Column(name = "use_intrvwer_edit", nullable = false) - private Boolean useIntrvwerEdit = false; + private Boolean useIntrvwerEdit; @Size(max = 32) @NotNull @@ -73,4 +93,45 @@ public class TListHeaderEntity { public Integer getListHderId() { return id.getListHderId(); } + + public static TListHeaderEntity copyFromDefault( + TListHeaderEntity src, + Long prjctIdx, + String regUser, + LocalDateTime regDt + ) { + return TListHeaderEntity.builder() + .id(TListHeaderEntityId.create(prjctIdx, src.getListHderId())) + .listHderOrder(src.getListHderOrder()) + .listHderGrad(src.getListHderGrad()) + .listHderNm(src.getListHderNm()) + .listHderTy(src.getListHderTy()) + .filterValue(src.getFilterValue()) + .useFilter(src.getUseFilter()) + .useColView(src.getUseColView()) + .useIntrvwerView(src.getUseIntrvwerView()) + .useIntrvwerEdit(src.getUseIntrvwerEdit()) + .regUser(regUser) + .regDt(regDt) + .build(); + } + + public static TListHeaderEntity fromDto(ListHeaderDto dto, String regUser, LocalDateTime regDt) { + return TListHeaderEntity.builder() + .id(TListHeaderEntityId.create(dto.getPrjctIdx(), dto.getListHderId())) + .listHderOrder(dto.getListHderOrder()) + .listHderGrad(dto.getListHderGrad().getCode()) + .listHderNm(dto.getListHderNm()) + .listHderTy(dto.getListHderTy().getCode()) + .filterValue(dto.getFilterValue()) + .useFilter(dto.getUseFilter()) + .useColView(dto.getUseColView()) + .useIntrvwerView(dto.getUseIntrvwerView()) + .useIntrvwerEdit(dto.getUseIntrvwerEdit()) + .regUser(regUser) + .regDt(regDt) + .modUser(regUser) + .modDt(regDt) + .build(); + } } \ No newline at end of file diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java index 8ca264b..1f0dbc6 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListHeaderEntityId.java @@ -15,13 +15,22 @@ import org.hibernate.Hibernate; public class TListHeaderEntityId implements Serializable { private static final long serialVersionUID = -1296812261527497087L; - @Column(name = "prjct_idx", insertable = false, updatable = false, columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull @Column(name = "list_hder_id", nullable = false) private Integer listHderId; + public static TListHeaderEntityId create(Long prjctIdx, Integer listHderId) { + TListHeaderEntityId id = new TListHeaderEntityId(); + id.setPrjctIdx(prjctIdx); + id.setListHderId(listHderId); + return id; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java index 3a4e5fe..8f3e3d0 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemEntityId.java @@ -15,7 +15,9 @@ import org.hibernate.Hibernate; public class TListItemEntityId implements Serializable { private static final long serialVersionUID = -3478285652359764540L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java index e13f51b..4998995 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TListItemUploadEntityId.java @@ -15,7 +15,9 @@ import org.hibernate.Hibernate; public class TListItemUploadEntityId implements Serializable { private static final long serialVersionUID = -8073832649114843758L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java index 74154a6..b505a2c 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctAssignEntityId.java @@ -22,7 +22,9 @@ import org.hibernate.Hibernate; public class TPrjctAssignEntityId implements Serializable { private static final long serialVersionUID = -263674621497298216L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @Size(max = 32) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java index e837373..0d278a4 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctEntity.java @@ -3,8 +3,8 @@ package com.kri.contact.server.persistence.entity; import com.kri.common.datetime.DateTimeUtil; import com.kri.contact.server.common.enums.ProjectStatus; import com.kri.contact.server.common.enums.SurveyType; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectInfoDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java index 2b3fa88..b104803 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntity.java @@ -1,6 +1,6 @@ package com.kri.contact.server.persistence.entity; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java index a8118cb..b12af57 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TPrjctMainTmplatEntityId.java @@ -2,6 +2,7 @@ package com.kri.contact.server.persistence.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotNull; import java.io.Serializable; import java.util.Objects; import lombok.AllArgsConstructor; @@ -21,7 +22,8 @@ public class TPrjctMainTmplatEntityId implements Serializable { private static final long serialVersionUID = -263674621497298216L; - @Column(name = "prjct_idx", nullable = false, columnDefinition = "INT UNSIGNED") + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @Column(name = "chnnl_ty", nullable = false) diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java index 69742b7..ca25a52 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntity.java @@ -1,7 +1,7 @@ package com.kri.contact.server.persistence.entity; import com.kri.contact.server.common.enums.ResultCodeType; -import com.kri.contact.server.dto.ResultCodeDto; +import com.kri.contact.server.dto.project.ResultCodeDto; import jakarta.persistence.Column; import jakarta.persistence.EmbeddedId; import jakarta.persistence.Entity; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java index f4f4df0..e9dbedf 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TResultCodeEntityId.java @@ -24,7 +24,9 @@ import org.hibernate.Hibernate; public class TResultCodeEntityId implements Serializable { private static final long serialVersionUID = -1984612223940078355L; - @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") + + @NotNull + @Column(name = "prjct_idx", nullable = false, columnDefinition = "int UNSIGNED not null") private Long prjctIdx; @NotNull diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java index 326724d..b147e24 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TRoleFuncMapEntityId.java @@ -15,6 +15,7 @@ import org.hibernate.Hibernate; public class TRoleFuncMapEntityId implements Serializable { private static final long serialVersionUID = 5430666726716009453L; + @NotNull @Column(name = "role_cd", nullable = false) private Integer roleCd; diff --git a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java index d97483b..2984dfc 100644 --- a/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java +++ b/src/main/java/com/kri/contact/server/persistence/entity/TUserEntity.java @@ -1,7 +1,7 @@ package com.kri.contact.server.persistence.entity; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.user.UserInfoDto; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java new file mode 100644 index 0000000..4598ea1 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListHeaderRepository.java @@ -0,0 +1,23 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.entity.TListHeaderEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListHeaderRepository extends JpaRepository { + + List findAllByIdPrjctIdx(Long prjctIdx); + + List findAllByIdPrjctIdxAndListHderGradNot(Long prjctIdx, Short listHderGrad); + + default List findDefaultHeader(){ + return findAllByIdPrjctIdxAndListHderGradNot(0L, ListHeaderGrade.COMMON.getCode()); + } + + long deleteAllByIdPrjctIdx(Long prjctIdx); + + long deleteAllByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); + +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java new file mode 100644 index 0000000..3637bf5 --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListItemRepository.java @@ -0,0 +1,11 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListItemEntity; +import com.kri.contact.server.persistence.entity.TListItemEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ListItemRepository extends JpaRepository { + + long deleteAllByIdPrjctIdxAndIdListHderIdNotIn(Long prjctIdx, List listHderId); +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java new file mode 100644 index 0000000..f2408cb --- /dev/null +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListRepository.java @@ -0,0 +1,12 @@ +package com.kri.contact.server.persistence.repository; + +import com.kri.contact.server.persistence.entity.TListEntity; +import com.kri.contact.server.persistence.entity.TListEntityId; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface ListRepository extends JpaRepository, + JpaSpecificationExecutor { + +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java index a6f201a..7ce46d9 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectAssignRepository.java @@ -4,13 +4,10 @@ import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; import com.kri.contact.server.persistence.entity.TPrjctAssignEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; -public interface ProjectAssignRepository extends - JpaRepository, - JpaSpecificationExecutor { +public interface ProjectAssignRepository extends JpaRepository { @Query(""" select a.id.userId diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java index bc2c52b..1c7eb5d 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectMainTemplateRepository.java @@ -4,11 +4,8 @@ import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntityId; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface ProjectMainTemplateRepository extends - JpaRepository, - JpaSpecificationExecutor { +public interface ProjectMainTemplateRepository extends JpaRepository { Optional findByIdPrjctIdxAndIdChnnlTy(Long prjctIdx, Short chnnlTy); diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java index 7a17ea5..fdeff1c 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ProjectRepository.java @@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +//JpaSpecificationExecutor Specification spec, Pageable pageable 사용시 필요 public interface ProjectRepository extends JpaRepository, JpaSpecificationExecutor { diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java index 192d9cf..23a35bf 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ResultCodeRepository.java @@ -6,11 +6,9 @@ import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.entity.TResultCodeEntityId; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; -public interface ResultCodeRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface ResultCodeRepository extends JpaRepository { @Query(""" select r diff --git a/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java index 2e4ef7b..7af6a85 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/RoleRepository.java @@ -3,10 +3,8 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TRoleEntity; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface RoleRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface RoleRepository extends JpaRepository { List findByRoleCdGreaterThanEqual(Integer roleCd); } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java index 6e3a587..54c5363 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/SystemEventLogRepository.java @@ -2,9 +2,7 @@ package com.kri.contact.server.persistence.repository; import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface SystemEventLogRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface SystemEventLogRepository extends JpaRepository { } diff --git a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java index 11ab8ba..5fa6aa6 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/UserRepository.java @@ -5,12 +5,10 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; -public interface UserRepository extends JpaRepository, - JpaSpecificationExecutor { +public interface UserRepository extends JpaRepository { Optional findByUserIdAndUserPwAndDelFalse(String userId, String userPw); @@ -20,8 +18,7 @@ public interface UserRepository extends JpaRepository, List findByUserRoleGreaterThanEqualAndDelFalse(Integer userRoleCd); - List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, - Integer userRoleCd); + List findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, Integer userRoleCd); @Query(""" select u diff --git a/src/main/java/com/kri/contact/server/service/AuthService.java b/src/main/java/com/kri/contact/server/service/AuthService.java index 7850f66..e4bb852 100644 --- a/src/main/java/com/kri/contact/server/service/AuthService.java +++ b/src/main/java/com/kri/contact/server/service/AuthService.java @@ -4,8 +4,8 @@ import com.kri.common.auth.dto.JwtUserClaimsDto; import com.kri.common.auth.jwt.JwtService; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.external.intranet.SearchLoginInfoResponseDto; -import com.kri.contact.server.dto.LoginRequestDto; -import com.kri.contact.server.dto.LoginResponseDto; +import com.kri.contact.server.dto.auth.LoginRequestDto; +import com.kri.contact.server.dto.auth.LoginResponseDto; import com.kri.contact.server.persistence.entity.TUserEntity; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/kri/contact/server/service/ListHeaderService.java b/src/main/java/com/kri/contact/server/service/ListHeaderService.java new file mode 100644 index 0000000..0f7f1bd --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListHeaderService.java @@ -0,0 +1,98 @@ +package com.kri.contact.server.service; + +import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.web.BusinessException; +import com.kri.contact.server.common.enums.ListHeaderGrade; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.persistence.entity.TListHeaderEntity; +import com.kri.contact.server.persistence.repository.ListHeaderRepository; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.function.Predicate; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ListHeaderService { + + private final ListHeaderRepository listHeaderRepository; + private final ListItemService listItemService; + + @Transactional + public void copyDefaultHeader(Long prjctIdx, String regUser, LocalDateTime regDt) { + + listHeaderRepository.deleteAllByIdPrjctIdx(prjctIdx); + + List defaultHeaderList = listHeaderRepository.findDefaultHeader() + .stream() + .map(src -> TListHeaderEntity.copyFromDefault(src, prjctIdx, regUser, regDt)) + .toList(); + + listHeaderRepository.saveAll(defaultHeaderList); + } + + public List getHeader(Long prjctIdx) { + List headerEntityList = listHeaderRepository.findAllByIdPrjctIdx(prjctIdx); + + return headerEntityList.stream() + .map(ListHeaderDto::fromEntity) + .toList(); + } + + @Transactional + public void upsertHeader(Long prjctIdx, List headerList, String regUser) { + LocalDateTime regDt = DateTimeUtil.nowKstLocalDateTime(); + + //headerList에 ListHeaderGrade.IMMUTABLE, ListHeaderGrade.DEFAULT 헤더가 있는지 확인 + List defaultHeaderList = listHeaderRepository.findDefaultHeader() + .stream().map(ListHeaderDto::fromEntity).toList(); + + List extractDefault = headerList.stream() + .filter(h -> !Objects.equals(h.getListHderGrad(), ListHeaderGrade.COMMON)) + .toList(); + + if(!isEqualHeader(defaultHeaderList, extractDefault, true)){ + throw BusinessException.badRequest("WRONG_DEFAULT","기본 헤더가 잘못 됐습니다."); + } + + //headerList에 없는 헤더는 삭제 + List headerIdList = headerList.stream().map(ListHeaderDto::getListHderId).toList(); + listHeaderRepository.deleteAllByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, headerIdList); + + //없는 정보에 대해서 리스트 아이템 삭제 + listItemService.deleteHderIdNotIn(prjctIdx, headerIdList); + + //ListHeaderGrade.IMMUTABLE 헤더를 제외한 헤더 저장 + List headerEntityList = headerList.stream() + .filter(h -> !Objects.equals(h.getListHderGrad(), ListHeaderGrade.IMMUTABLE)) + .map((ListHeaderDto dto) -> TListHeaderEntity.fromDto(dto, regUser, regDt)) + .toList(); + + listHeaderRepository.saveAll(headerEntityList); + } + + public boolean isEqualHeader(List origin, List target, boolean simpleMode){ + + if(origin.size() != target.size()){ + return false; + } + + Function> predFunc = + simpleMode + ? o -> t -> t.isEqualSimple(o) + : o -> t -> t.isEqualHard(o); + + for(ListHeaderDto o : origin){ + if (target.stream().noneMatch(predFunc.apply(o))) { + return false; + } + } + + return true; + } + +} diff --git a/src/main/java/com/kri/contact/server/service/ListItemService.java b/src/main/java/com/kri/contact/server/service/ListItemService.java new file mode 100644 index 0000000..5803dc6 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListItemService.java @@ -0,0 +1,18 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.persistence.repository.ListItemRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ListItemService { + + private final ListItemRepository listItemRepository; + + public long deleteHderIdNotIn(Long prjctIdx, List listHderId){ + return listItemRepository.deleteAllByIdPrjctIdxAndIdListHderIdNotIn(prjctIdx, listHderId); + } + +} diff --git a/src/main/java/com/kri/contact/server/service/ListService.java b/src/main/java/com/kri/contact/server/service/ListService.java new file mode 100644 index 0000000..1a6b146 --- /dev/null +++ b/src/main/java/com/kri/contact/server/service/ListService.java @@ -0,0 +1,15 @@ +package com.kri.contact.server.service; + +import com.kri.contact.server.persistence.repository.ListRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ListService { + + private final ListRepository listRepository; + private final ListItemService listItemService; + private final ListHeaderService listHeaderService; + +} diff --git a/src/main/java/com/kri/contact/server/service/ProjectService.java b/src/main/java/com/kri/contact/server/service/ProjectService.java index 546591f..860fd1e 100644 --- a/src/main/java/com/kri/contact/server/service/ProjectService.java +++ b/src/main/java/com/kri/contact/server/service/ProjectService.java @@ -5,12 +5,12 @@ import com.kri.common.webmvc.page.PageRequestDto; import com.kri.common.webmvc.page.PageResponseDto; import com.kri.common.webmvc.page.Pageables; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectInfoDto; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; -import com.kri.contact.server.dto.ProjectOwnerResponseDto; -import com.kri.contact.server.dto.ProjectSearchRequestDto; -import com.kri.contact.server.dto.ProjectUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectInfoDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectOwnerResponseDto; +import com.kri.contact.server.dto.project.ProjectSearchRequestDto; +import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; import com.kri.contact.server.persistence.entity.TPrjctEntity; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; import com.kri.contact.server.persistence.query.ProjectSpecs; @@ -39,12 +39,16 @@ public class ProjectService { private static final List STATUS_1 = List.of((short) 1); private final AssignService assignService; private final ResultCodeService resultCodeService; + private final ListHeaderService listHeaderService; private final ProjectRepository projectRepository; private final ProjectMainTemplateRepository projectMainTemplateRepository; @Transactional - public ProjectInfoDto createProject(ProjectCreateRequestDto req, String regUser, - LocalDateTime regDt) { + public ProjectInfoDto createProject( + ProjectCreateRequestDto req, + String regUser, + LocalDateTime regDt + ) { String itrnt = req.getItrntPrjctCd(); try { @@ -54,6 +58,8 @@ public class ProjectService { ProjectInfoDto savedProject = ProjectInfoDto.from(projectRepository.save(entity)); resultCodeService.copyResultCodeFromDefault(savedProject.getPrjctIdx(), regUser, regDt); + listHeaderService.copyDefaultHeader(savedProject.getPrjctIdx(), regUser, regDt); + return savedProject; } catch (DataIntegrityViolationException e) { throw BusinessException.conflict( diff --git a/src/main/java/com/kri/contact/server/service/ResultCodeService.java b/src/main/java/com/kri/contact/server/service/ResultCodeService.java index 883b821..3b02832 100644 --- a/src/main/java/com/kri/contact/server/service/ResultCodeService.java +++ b/src/main/java/com/kri/contact/server/service/ResultCodeService.java @@ -1,7 +1,7 @@ package com.kri.contact.server.service; import com.kri.contact.server.common.enums.ResultCodeType; -import com.kri.contact.server.dto.ResultCodeDto; +import com.kri.contact.server.dto.project.ResultCodeDto; import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.repository.ResultCodeRepository; import java.time.LocalDateTime; diff --git a/src/main/java/com/kri/contact/server/service/RoleService.java b/src/main/java/com/kri/contact/server/service/RoleService.java index 4a47efa..5cacb1b 100644 --- a/src/main/java/com/kri/contact/server/service/RoleService.java +++ b/src/main/java/com/kri/contact/server/service/RoleService.java @@ -1,7 +1,7 @@ package com.kri.contact.server.service; import com.kri.contact.server.common.consts.ContactConstant; -import com.kri.contact.server.dto.RoleInfoDto; +import com.kri.contact.server.dto.user.RoleInfoDto; import com.kri.contact.server.persistence.repository.RoleRepository; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java index 5eeb3f6..138517e 100644 --- a/src/main/java/com/kri/contact/server/service/SystemEventLogService.java +++ b/src/main/java/com/kri/contact/server/service/SystemEventLogService.java @@ -4,10 +4,11 @@ import static com.kri.common.json.JsonUtil.toMap; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.contact.server.common.enums.SystemEventType; -import com.kri.contact.server.dto.ProjectCreateRequestDto; -import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto; -import com.kri.contact.server.dto.ProjectUpdateRequestDto; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.list.ListHeaderDto; +import com.kri.contact.server.dto.project.ProjectCreateRequestDto; +import com.kri.contact.server.dto.project.ProjectMainTemplateUpdateRequestDto; +import com.kri.contact.server.dto.project.ProjectUpdateRequestDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.systemlog.UploadUserContentDto; import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import com.kri.contact.server.persistence.repository.SystemEventLogRepository; @@ -128,6 +129,20 @@ public class SystemEventLogService { ); } + public void writeUpsertListHeader(String regId, LocalDateTime regDt, String clientIp, + Long prjctIdx, List headerList) { + writeSystemLog( + SystemEventType.UPSERT_LIST_HEADER, + "Upsert List Header", + prjctIdx, + regId, + regDt, + clientIp, + "listHeader", + headerList + ); + } + protected void writeSystemLog( SystemEventType eventType, String title, diff --git a/src/main/java/com/kri/contact/server/service/UserService.java b/src/main/java/com/kri/contact/server/service/UserService.java index 48aa6eb..23d1cc2 100644 --- a/src/main/java/com/kri/contact/server/service/UserService.java +++ b/src/main/java/com/kri/contact/server/service/UserService.java @@ -6,10 +6,10 @@ import com.kri.common.web.BusinessException; import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.util.ExcelUploadResultUtil; -import com.kri.contact.server.dto.DataVerificationDto; -import com.kri.contact.server.dto.ExcelUploadResponseDto; -import com.kri.contact.server.dto.RoleInfoDto; -import com.kri.contact.server.dto.UserInfoDto; +import com.kri.contact.server.dto.common.DataVerificationDto; +import com.kri.contact.server.dto.excel.ExcelUploadResponseDto; +import com.kri.contact.server.dto.user.RoleInfoDto; +import com.kri.contact.server.dto.user.UserInfoDto; import com.kri.contact.server.dto.excel.UserUploadDto; import com.kri.contact.server.dto.excel.UserUploadErrorDto; import com.kri.contact.server.persistence.entity.TUserEntity; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index d07301c..bd243c7 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -5,7 +5,7 @@ kri: spring: datasource: #private 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 4322d07..6b187ba 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -6,7 +6,7 @@ kri: spring: datasource: #public 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index d07301c..bd243c7 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -5,7 +5,7 @@ kri: spring: datasource: #private 도메인 - url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true username: kri_contact password: contact#51304 driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5943a6a..6ca635a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -5,6 +5,13 @@ server: spring: application: name: contact-server + jpa: + properties: + hibernate: + jdbc: + batch_size: 1000 + order_inserts: true + order_updates: true profiles: # 아무 설정 없을 때 기본으로 쓸 프로파일