From ddb0ce83978d5febb4d04f2070d897f45dfb5cdb Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 2 Jun 2026 09:42:31 +0900 Subject: [PATCH 1/5] =?UTF-8?q?Message=20code=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/template/entity/MessageCode.java | 6 +++++ .../template/service/MessageSendService.java | 25 ++++++++----------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java b/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java index f1ed410..083bb8e 100644 --- a/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java +++ b/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java @@ -29,6 +29,12 @@ public enum MessageCode { // 관리자 영역 APP_REGISTER_APPROVED("앱 등록 승인", "FM_APIM009", Channels.EMAIL), APP_REGISTER_REJECTED("앱 등록 거절", "FM_APIM010", Channels.EMAIL), + + + // API상태 모니터링 + API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.KAKAO_ALIMTALK), + // 유량제어 토큰 획득 실패 + INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.KAKAO_ALIMTALK), // 미 사용, 미 분류 diff --git a/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java b/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java index f16bdb4..d6c70a1 100644 --- a/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java +++ b/src/main/java/com/eactive/apim/portal/template/service/MessageSendService.java @@ -111,20 +111,17 @@ public class MessageSendService { logger.debug(emailRequest.toString()); } - //메신저는 사용하지 않아서 주석 처리함. -// if (template.getEnableMessenger().equalsIgnoreCase("Y")) { -// MessageRequest messengerRequest = new MessageRequest(); -// messengerRequest.setMessageCode(MessageRequestEnums.MessageCode.valueOf(template.getMessageCode())); -// messengerRequest.setSubject(subject); -// String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams); -// messengerRequest.setMessage(messengerTemplate); -// messengerRequest.setRequestDate(LocalDateTime.now()); -// messengerRequest.setUsername(user.getUsername()); -// messengerRequest.setMessengerId(user.getMessengerId()); -// messengerRequest.setEaiInterfaceId(); -// messengerRequest.setServiceId(); -// messageRequestRepository.save(messengerRequest); -// } + if (template.getEnableMessenger().equalsIgnoreCase("Y")) { + MessageRequest messengerRequest = new MessageRequest(); + messengerRequest.setMessageCode(MessageCode.valueOf(template.getMessageCode())); + messengerRequest.setSubject(subject); + String messengerTemplate = buildMessage(template.getMessengerTemplate(), messageParams); + messengerRequest.setMessage(messengerTemplate); + messengerRequest.setRequestDate(LocalDateTime.now()); + messengerRequest.setUsername(user.getUsername()); + messengerRequest.setMessengerId(user.getUserId()); + messageRequestRepository.save(messengerRequest); + } } private void updateMessageParams(MessageRecipient user, Map messageParams) { From 264bb8f7295b5198c908a8bb77f6f5eaf962c6df Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 2 Jun 2026 13:31:32 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=EC=A0=9C=EC=A3=BC=EC=9D=80=ED=96=89=20?= =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=20=EB=B0=9C=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/eactive/apim/portal/template/entity/MessageCode.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java b/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java index 083bb8e..bd18da5 100644 --- a/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java +++ b/src/main/java/com/eactive/apim/portal/template/entity/MessageCode.java @@ -32,9 +32,9 @@ public enum MessageCode { // API상태 모니터링 - API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.KAKAO_ALIMTALK), + API_STATUS_CHANGED("API 상태 변화", "FM_APIM011", Channels.MESSENGER), // 유량제어 토큰 획득 실패 - INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.KAKAO_ALIMTALK), + INFLOW_TOKEN_FAILED("유량제어 토큰 획득 실패", "FM_APIM012", Channels.MESSENGER), // 미 사용, 미 분류 @@ -121,6 +121,7 @@ public enum MessageCode { NONE (0b0000), EMAIL (0b0001), KAKAO_ALIMTALK (0b0010), + MESSENGER (0b0100), ; @Getter From 38d100543b20ba00e7ba058041c550c5e1abdeab Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 15:10:45 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=EC=98=88=EC=83=81=EC=99=84=EB=A3=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/eactive/apim/portal/approval/entity/Approval.java | 3 +++ .../apim/portal/approval/statemachine/ApprovalState.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/src/main/java/com/eactive/apim/portal/approval/entity/Approval.java b/src/main/java/com/eactive/apim/portal/approval/entity/Approval.java index 0ddfc7d..de1f444 100644 --- a/src/main/java/com/eactive/apim/portal/approval/entity/Approval.java +++ b/src/main/java/com/eactive/apim/portal/approval/entity/Approval.java @@ -75,4 +75,7 @@ public class Approval implements Serializable, com.eactive.eai.data.Data { @Column(length = 17, name = "end_date") @Convert(converter = LocalDateTimeToStringConverter17.class) private LocalDateTime approvalDate; + + @Column(name = "expect_end_date") + private String expectEndDate; //예상완료일 } diff --git a/src/main/java/com/eactive/apim/portal/approval/statemachine/ApprovalState.java b/src/main/java/com/eactive/apim/portal/approval/statemachine/ApprovalState.java index 8752df7..362cd06 100644 --- a/src/main/java/com/eactive/apim/portal/approval/statemachine/ApprovalState.java +++ b/src/main/java/com/eactive/apim/portal/approval/statemachine/ApprovalState.java @@ -28,4 +28,8 @@ public interface ApprovalState extends Serializable { } String getDescription(); + + default String getCode() { + return toString(); + } } From 92701677906f0da2a32aa738e3cc8838dffff623 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 17:42:24 +0900 Subject: [PATCH 4/5] =?UTF-8?q?QnA=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=8C=93?= =?UTF-8?q?=EA=B8=80=20=EC=9E=91=EC=84=B1=20=EC=97=94=ED=84=B0=ED=8B=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portal/qna/entity/InquiryComment.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java diff --git a/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java b/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java new file mode 100644 index 0000000..8b30da2 --- /dev/null +++ b/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java @@ -0,0 +1,38 @@ +package com.eactive.apim.portal.qna.entity; + +import com.eactive.apim.portal.common.entity.Auditable; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.ToString; +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.io.Serializable; + +@Entity +@Table(name = "PTL_INQUIRY_COMMENT") +@Data +@EqualsAndHashCode(callSuper = true) +@ToString(exclude = "inquiry") +public class InquiryComment extends Auditable implements Serializable { + + @Id + @Column(name = "id", length = 36, nullable = false) + @GenericGenerator(name = "uuid-gen", strategy = "uuid2") + @GeneratedValue(generator = "uuid-gen", strategy = GenerationType.IDENTITY) + private String id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "INQUIRY_ID", nullable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT)) + private Inquiry inquiry; + + @Lob + @Column(name = "COMMENT_DETAIL") + private String commentDetail; + + @Column(name = "SEQ") + private int seq; + + @Column(name = "DEL_YN", length = 1) + private String delYn = "N"; +} From d0c029e954b26263492fb327a95c128f28dd4ec5 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 10:04:57 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Q&A=20=EB=8C=93=EA=B8=80=20=EC=97=94?= =?UTF-8?q?=ED=84=B0=ED=8B=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/eactive/apim/portal/qna/entity/InquiryComment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java b/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java index 8b30da2..c76efe3 100644 --- a/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java +++ b/src/main/java/com/eactive/apim/portal/qna/entity/InquiryComment.java @@ -30,9 +30,9 @@ public class InquiryComment extends Auditable implements Serializable { @Column(name = "COMMENT_DETAIL") private String commentDetail; - @Column(name = "SEQ") - private int seq; - @Column(name = "DEL_YN", length = 1) private String delYn = "N"; + + @Column(name = "ADMIN_YN", length = 1) + private String adminYn = "N"; }