From 0d7d006f92e6a81a52247ce8bb0ca7d7b16c99db Mon Sep 17 00:00:00 2001 From: eastargh Date: Mon, 1 Jun 2026 17:37:06 +0900 Subject: [PATCH 01/12] =?UTF-8?q?api=20=EC=83=81=ED=83=9C=20=EB=B3=80?= =?UTF-8?q?=ED=99=94=20=EA=B0=90=EC=A7=80=20&=20=EC=9B=B9=ED=9B=85=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/WEB-INF/applicationContext-jpa.xml | 1 + .../data/entity/man/user/UserInfoService.java | 11 ++ .../onl}/djb/apistatus/ApiStatus.java | 2 +- .../onl}/djb/apistatus/ApiStatusEvent.java | 3 +- .../djb/inflow/InflowTokenInsufficient.java | 2 +- .../inflow/InflowTokenInsufficientLog.java | 2 +- .../inflow/InflowTokenInsufficientLogId.java | 2 +- .../entity/onl/djb/webhook/WebhookReq.java | 33 ++++ .../entity/onl/djb/webhook/WebhookReqApi.java | 19 +++ .../onl/djb/webhook/WebhookReqApiId.java | 25 ++++ .../onl/djb/webhook/WebhookReqEvent.java | 19 +++ .../onl/djb/webhook/WebhookReqEventId.java | 25 ++++ .../onl}/djb/webhook/WebhookSendLog.java | 2 +- .../ext/djb/apistatus/ApiStatusService.java | 69 --------- .../djb/apistatus/ApiStatusRepository.java | 20 ++- .../ext/djb/apistatus/ApiStatusService.java | 141 ++++++++++++++++++ .../eai/rms/ext/djb/async/AsyncConfig.java | 25 ---- .../rms/ext/djb/async/AsyncEventListener.java | 40 ----- .../ext/djb/event/ApiStatusChangedEvent.java | 18 --- .../InflowTokenInsufficientEvent.java | 4 +- .../ext/djb/inflow/InflowTokenRepository.java | 5 +- .../ext/djb/inflow/InflowTokenService.java | 13 +- .../rms/ext/djb/job/ApiStatusMonitorJob.java | 4 +- .../ext/djb/job/InflowTokenMonitorJob.java | 2 +- .../djb/swing/service/SwingSendManager.java | 17 --- .../eai/rms/ext/djb/util/UmsManager.java | 71 +++++++++ .../controller/WebhookSendController.java | 14 +- .../djb/webhook/dto/WebhookSendRequest.java | 3 +- .../repository/WebhookReqRepository.java | 11 ++ .../repository/WebhookSendLogRepository.java | 2 +- .../webhook/service/WebhookSendManager.java | 17 --- .../djb/webhook/service/WebhookService.java | 74 +++++++-- .../service/ums/UmsDispatchService.java | 86 +++++------ 33 files changed, 505 insertions(+), 277 deletions(-) rename src/main/java/com/eactive/eai/rms/data/{ext => entity/onl}/djb/apistatus/ApiStatus.java (95%) rename src/main/java/com/eactive/eai/rms/data/{ext => entity/onl}/djb/apistatus/ApiStatusEvent.java (54%) rename src/main/java/com/eactive/eai/rms/data/{ext => entity/onl}/djb/inflow/InflowTokenInsufficient.java (66%) rename src/main/java/com/eactive/eai/rms/data/{ext => entity/onl}/djb/inflow/InflowTokenInsufficientLog.java (95%) rename src/main/java/com/eactive/eai/rms/data/{ext => entity/onl}/djb/inflow/InflowTokenInsufficientLogId.java (90%) create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApi.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApiId.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEvent.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEventId.java rename src/main/java/com/eactive/eai/rms/data/{ext => entity/onl}/djb/webhook/WebhookSendLog.java (97%) delete mode 100644 src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusService.java rename src/main/java/com/eactive/eai/rms/{data => }/ext/djb/apistatus/ApiStatusRepository.java (80%) create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java delete mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncConfig.java delete mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncEventListener.java delete mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/event/ApiStatusChangedEvent.java rename src/main/java/com/eactive/eai/rms/ext/djb/{event => inflow}/InflowTokenInsufficientEvent.java (80%) rename src/main/java/com/eactive/eai/rms/{data => }/ext/djb/inflow/InflowTokenRepository.java (73%) rename src/main/java/com/eactive/eai/rms/{data => }/ext/djb/inflow/InflowTokenService.java (67%) delete mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/swing/service/SwingSendManager.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookReqRepository.java delete mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendManager.java diff --git a/WebContent/WEB-INF/applicationContext-jpa.xml b/WebContent/WEB-INF/applicationContext-jpa.xml index b1da502..95e9929 100644 --- a/WebContent/WEB-INF/applicationContext-jpa.xml +++ b/WebContent/WEB-INF/applicationContext-jpa.xml @@ -69,6 +69,7 @@ + findAllByRoleId(String roleId) { + QUserInfo qUserInfo = QUserInfo.userInfo; + QUserRole qUserRole = QUserRole.userRole; + + return getJPAQueryFactory() + .selectFrom(qUserInfo) + .join(qUserRole).on(qUserInfo.userid.eq(qUserRole.id.userId)) + .where(qUserRole.id.roleId.eq(roleId)) + .fetch(); + } + public Page findByUsername(Pageable pageable, String username) { QUserInfo qUserInfo = QUserInfo.userInfo; BooleanExpression predicate = qUserInfo.isNotNull(); diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatus.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/apistatus/ApiStatus.java similarity index 95% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatus.java rename to src/main/java/com/eactive/eai/rms/data/entity/onl/djb/apistatus/ApiStatus.java index c7f1e17..8c46dd5 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatus.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/apistatus/ApiStatus.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.data.ext.djb.apistatus; +package com.eactive.eai.rms.data.entity.onl.djb.apistatus; import java.time.LocalDateTime; diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusEvent.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/apistatus/ApiStatusEvent.java similarity index 54% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusEvent.java rename to src/main/java/com/eactive/eai/rms/data/entity/onl/djb/apistatus/ApiStatusEvent.java index 5f2049e..aba632a 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusEvent.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/apistatus/ApiStatusEvent.java @@ -1,7 +1,8 @@ -package com.eactive.eai.rms.data.ext.djb.apistatus; +package com.eactive.eai.rms.data.entity.onl.djb.apistatus; public interface ApiStatusEvent { String getEaisvcname(); String getEaisvcdesc(); + String getPrevStatusCode(); String getEvent(); } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficient.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficient.java similarity index 66% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficient.java rename to src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficient.java index c3c6ffc..64108f8 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficient.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficient.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.data.ext.djb.inflow; +package com.eactive.eai.rms.data.entity.onl.djb.inflow; public interface InflowTokenInsufficient { String getEaisvcname(); diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficientLog.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficientLog.java similarity index 95% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficientLog.java rename to src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficientLog.java index ae0ba77..e3cd9eb 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficientLog.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficientLog.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.data.ext.djb.inflow; +package com.eactive.eai.rms.data.entity.onl.djb.inflow; import java.io.Serializable; diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficientLogId.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficientLogId.java similarity index 90% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficientLogId.java rename to src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficientLogId.java index 0a2bae6..1568a34 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenInsufficientLogId.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/inflow/InflowTokenInsufficientLogId.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.data.ext.djb.inflow; +package com.eactive.eai.rms.data.entity.onl.djb.inflow; import java.io.Serializable; import javax.persistence.Column; diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java new file mode 100644 index 0000000..02aa430 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReq.java @@ -0,0 +1,33 @@ +package com.eactive.eai.rms.data.entity.onl.djb.webhook; + +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name = "PTL_WEBHOOK_REQ") +@Getter +@NoArgsConstructor +public class WebhookReq { + + @Id + @Column(name = "ID", length = 36, nullable = false) + private String id; + + @Column(name = "ORG_ID", length = 100) + @Comment("법인 ID") + private String orgId; + + @Column(name = "TARGET_URL", length = 500, nullable = false) + @Comment("웹훅 수신 URL") + private String targetUrl; + + @Column(name = "SECRET", length = 200) + @Comment("HMAC 서명용 Secret Key") + private String secret; +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApi.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApi.java new file mode 100644 index 0000000..df94810 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApi.java @@ -0,0 +1,19 @@ +package com.eactive.eai.rms.data.entity.onl.djb.webhook; + +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +@Entity +@Table(name = "PTL_WEBHOOK_REQ_API") +@Getter +@NoArgsConstructor +public class WebhookReqApi implements Serializable { + + @EmbeddedId + private WebhookReqApiId id; +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApiId.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApiId.java new file mode 100644 index 0000000..784ea4a --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqApiId.java @@ -0,0 +1,25 @@ +package com.eactive.eai.rms.data.entity.onl.djb.webhook; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Embeddable; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Embeddable +public class WebhookReqApiId implements Serializable { + + @Column(name = "WEBHOOK_REQ_ID", nullable = false, length = 36) + @Comment("웹훅 요청 ID") + private String webhookReqId; + + @Column(name = "API_ID", nullable = false, length = 100) + @Comment("API ID") + private String apiId; +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEvent.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEvent.java new file mode 100644 index 0000000..5cc9b4b --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEvent.java @@ -0,0 +1,19 @@ +package com.eactive.eai.rms.data.entity.onl.djb.webhook; + +import lombok.Getter; +import lombok.NoArgsConstructor; + +import javax.persistence.EmbeddedId; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +@Entity +@Table(name = "PTL_WEBHOOK_REQ_EVENT") +@Getter +@NoArgsConstructor +public class WebhookReqEvent implements Serializable { + + @EmbeddedId + private WebhookReqEventId id; +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEventId.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEventId.java new file mode 100644 index 0000000..1af090e --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookReqEventId.java @@ -0,0 +1,25 @@ +package com.eactive.eai.rms.data.entity.onl.djb.webhook; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.Comment; + +import javax.persistence.Column; +import javax.persistence.Embeddable; +import java.io.Serializable; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@Embeddable +public class WebhookReqEventId implements Serializable { + + @Column(name = "WEBHOOK_REQ_ID", nullable = false, length = 36) + @Comment("웹훅 요청 ID") + private String webhookReqId; + + @Column(name = "EVENT_TYPE", nullable = false, length = 50) + @Comment("이벤트 유형 (CONTROL_START, ERROR_START 등)") + private String eventType; +} diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/webhook/WebhookSendLog.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java similarity index 97% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/webhook/WebhookSendLog.java rename to src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java index f2bcdf2..a1fa55d 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/webhook/WebhookSendLog.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.data.ext.djb.webhook; +package com.eactive.eai.rms.data.entity.onl.djb.webhook; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusService.java deleted file mode 100644 index ac35442..0000000 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusService.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.eactive.eai.rms.data.ext.djb.apistatus; - -import java.util.HashMap; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.eactive.eai.rms.ext.djb.event.ApiStatusChangedEvent; - -@Service -@Transactional -public class ApiStatusService { - - private static final Logger log = LoggerFactory.getLogger(ApiStatusService.class); - - @Autowired - private ApiStatusRepository apiStatusRepository; - - @Autowired - private ApplicationEventPublisher eventPublisher; - - - - public void updateApiStatus(HashMap param) { - - List list = apiStatusRepository.findApiStatusEvents( - Integer.parseInt(param.get("errorRate")), - Integer.parseInt(param.get("errorRangeMinute")), - Integer.parseInt(param.get("delayRangeMinute")), - Integer.parseInt(param.get("delayAvgRespTime")) - ); - - for (ApiStatusEvent event : list) { - String newStatusCode = resolveStatusCode(event.getEvent()); - if (newStatusCode == null) continue; - - ApiStatus apiStatus = apiStatusRepository.findById(event.getEaisvcname()).orElse(new ApiStatus()); - - apiStatus.setEaisvcname(event.getEaisvcname()); - apiStatus.setStatusCode(newStatusCode); - - apiStatusRepository.save(apiStatus); // PK 있으면 UPDATE, 없으면 INSERT - log.debug("API 상태 변경: {}-{} {} → {}", event.getEaisvcname(), event.getEaisvcdesc(), event.getEvent(), newStatusCode); - - eventPublisher.publishEvent(ApiStatusChangedEvent.from(event)); // 트랜잭션 커밋 후 리스너 실행 - log.debug("이벤트 전파"); - } - } - - - private String resolveStatusCode(String event) { - switch (event) { - case "CONTROL_START": return "C"; //점검 - case "CONTROL_END": return "N"; //정상 - case "ERROR_START": return "E"; //장애 - case "ERROR_END": return "N"; //정상 - case "DELAY_START": return "D"; //지연 - case "DELAY_END": return "N"; //정상 - default: - log.warn("알 수 없는 이벤트: {}", event); - return null; - } - } -} diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java similarity index 80% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusRepository.java rename to src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java index f716bb0..ec80426 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/apistatus/ApiStatusRepository.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java @@ -1,10 +1,12 @@ -package com.eactive.eai.rms.data.ext.djb.apistatus; +package com.eactive.eai.rms.ext.djb.apistatus; import java.util.List; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; +import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; public interface ApiStatusRepository extends BaseRepository { @@ -22,9 +24,11 @@ public interface ApiStatusRepository extends BaseRepository { @Query(nativeQuery = true, value = " SELECT EAISVCNAME" + " , (SELECT EAISVCDESC FROM TSEAIHE01 WHERE A.EAISVCNAME = EAISVCNAME) AS EAISVCDESC" + + " , PREV_STATUS_CODE " + " , EVENT" + " FROM (" + " SELECT EAISVCNAME" + + " , STATUS_CODE AS PREV_STATUS_CODE " + " , CASE WHEN STATUS_CODE != 'C' AND CTRL_YN = 'Y' THEN 'CONTROL_START'" + " WHEN STATUS_CODE = 'C' AND CTRL_YN = 'N' THEN 'CONTROL_END'" + " WHEN STATUS_CODE IN ('N','D') AND ERR_YN = 'Y' THEN 'ERROR_START'" @@ -34,14 +38,14 @@ public interface ApiStatusRepository extends BaseRepository { + " ELSE 'STAY' END AS EVENT" + " FROM (" + " SELECT A.EAISVCNAME" - + " , NVL(B.STATUS_CODE, '1') AS STATUS_CODE" - + " , NVL((SELECT 'Y' FROM TSEAITI01" - + " WHERE (TO_CHAR(SYSDATE,'HH24MI') BETWEEN SUBSTR(EAICTRLDSTICCTNT,16,4) AND SUBSTR(EAICTRLDSTICCTNT,21,4)" - + " OR SUBSTR(EAICTRLDSTICCTNT,16,9) = '0000|0000')" - + " AND A.EAISVCNAME = EAICTRLNAME),'N') AS CTRL_YN" + + " , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE" + + " , NVL(( SELECT 'Y' FROM EMSAPP.PTL_NOTICE_API X " + + " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID " + + " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " + + " AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN " + " , (SELECT CASE WHEN TOTAL = 0 THEN 'X'" - + " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'" - + " ELSE 'N' END" + + " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'" + + " ELSE 'N' END" + " FROM (SELECT SUM(SUCCESS_CNT + TIMEOUT_CNT + SYSTEM_ERR_CNT + BIZ_ERR_CNT) AS TOTAL" + " , SUM(SUCCESS_CNT) AS SUCCESS" + " FROM API_STATS_MINUTE" diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java new file mode 100644 index 0000000..08e6bce --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java @@ -0,0 +1,141 @@ +package com.eactive.eai.rms.ext.djb.apistatus; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; +import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; +import com.eactive.eai.rms.ext.djb.util.UmsManager; +import com.eactive.ext.djb.apistatus.DjbIncidentDetectionService; + + +@Service +@Transactional +public class ApiStatusService { + + private static final Logger log = LoggerFactory.getLogger(ApiStatusService.class); + + @Autowired + private ApiStatusRepository apiStatusRepository; + + @Autowired + private UmsManager ums; + + @Autowired + private DjbIncidentDetectionService djbService; + + + public void updateApiStatus(HashMap param) { + + List list = apiStatusRepository.findApiStatusEvents( + Integer.parseInt(param.get("errorRate")), + Integer.parseInt(param.get("errorRangeMinute")), + Integer.parseInt(param.get("delayRangeMinute")), + Integer.parseInt(param.get("delayAvgRespTime")) + ); + + HashMap> eventMap = new HashMap<>(); + + + for (ApiStatusEvent event : list) { + String newStatusCode = resolveStatusCode(event.getEvent()); + if (newStatusCode == null) continue; + + ApiStatus apiStatus = apiStatusRepository.findById(event.getEaisvcname()).orElse(new ApiStatus()); + + apiStatus.setEaisvcname(event.getEaisvcname()); + apiStatus.setStatusCode(newStatusCode); + + apiStatusRepository.save(apiStatus); // PK 있으면 UPDATE, 없으면 INSERT + log.debug("API 상태 변경: {}-{} {} → {}", event.getEaisvcname(), event.getEaisvcdesc(), event.getEvent(), newStatusCode); + + + //이벤트별로 api분리 저장 + List apis = (List)eventMap.get(event.getEvent()); + if (apis == null) { + apis = new ArrayList(); + apis.add(event.getEaisvcname()); + eventMap.put(event.getEvent(), apis); + } else { + apis.add(event.getEaisvcname()); + } + } + + + //이벤트별로 ums, webhook을 발송한다 + for (Map.Entry> entry : eventMap.entrySet()) { + String event = entry.getKey(); + List apiIds = entry.getValue(); + + String message = getSwingChatMessage(event, apiIds); + ums.sendMessenger("api-monitor", MessageCode.API_STATUS_CHANGED, message); + + //제휴사 webhook 발송 + ums.sendWebhook(event, apiIds); + + //개발자포탈 API상태모니터링 화면을 위한 처리 + djbService.detect(event, apiIds); + + +// if (event.endsWith("_END")) { +// djbService.recovered(event, apiIds); +// } else { +// djbService.detect(event, apiIds); +// } + } + } + + + private String resolveStatusCode(String event) { + switch (event) { + case "CONTROL_START": return "C"; //점검 + case "CONTROL_END": return "N"; //정상 + case "ERROR_START": return "E"; //장애 + case "ERROR_END": return "N"; //정상 + case "DELAY_START": return "D"; //지연 + case "DELAY_END": return "N"; //정상 + default: + log.warn("알 수 없는 이벤트: {}", event); + return null; + } + } + + + private String getSwingChatMessage(String event, List apiIds) { + String message = ""; + switch (event) { + case "CONTROL_START": + message = "API 서비스 점검이 시작되었습니다"; //점검 + break; + case "CONTROL_END": + message = "API 서비스 점검이 완료되었습니다"; //정상 + break; + case "ERROR_START": + message = "API 서비스 장애가 발생하였습니다"; //장애 + break; + case "ERROR_END": + message = "API 서비스 장애가 복구되었습니다"; //정상 + break; + case "DELAY_START": + message = "API 서비스 지연이 발생하였습니다"; //지연 + break; + case "DELAY_END": + message = "API 서비스 지연이 복구되었습니다"; //정상 + break; + default: + message = ""; + } + + return message + "\n- " + String.join(",", apiIds); + } +} + diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncConfig.java b/src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncConfig.java deleted file mode 100644 index b62f619..0000000 --- a/src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncConfig.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.eactive.eai.rms.ext.djb.async; - -import java.util.concurrent.Executor; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.scheduling.annotation.EnableAsync; -import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; - -@Configuration -@EnableAsync -public class AsyncConfig { - - @Bean("asyncExecutor") - public Executor asyncExecutor() { - ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); - executor.setCorePoolSize(2); - executor.setMaxPoolSize(5); - executor.setQueueCapacity(20); - executor.setThreadNamePrefix("async-"); - executor.initialize(); - return executor; - } - -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncEventListener.java b/src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncEventListener.java deleted file mode 100644 index 63c5089..0000000 --- a/src/main/java/com/eactive/eai/rms/ext/djb/async/AsyncEventListener.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.eactive.eai.rms.ext.djb.async; - -import org.springframework.context.event.EventListener; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Component; -import org.springframework.transaction.event.TransactionPhase; -import org.springframework.transaction.event.TransactionalEventListener; - -import com.eactive.eai.rms.ext.djb.event.ApiStatusChangedEvent; -import com.eactive.eai.rms.ext.djb.event.InflowTokenInsufficientEvent; -import com.eactive.eai.rms.ext.djb.swing.service.SwingSendManager; -import com.eactive.eai.rms.ext.djb.webhook.service.WebhookSendManager; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Component -@RequiredArgsConstructor -public class AsyncEventListener { - - private final WebhookSendManager webhookSendManager; - - private final SwingSendManager swingSendManager; - - @Async("asyncExecutor") - @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) - public void onApiStatusChanged(ApiStatusChangedEvent event) { - log.debug("API 상태 변경 이벤트 수신: {} {}", event.getEaisvcname(), event.getEvent()); - webhookSendManager.send(event.getEaisvcname(), event.getEvent()); - swingSendManager.send(null, 0, 0); - } - - @Async("asyncExecutor") - @EventListener // 트랜잭션 write 없이 read만 하므로 TransactionalEventListener 불필요 - public void onInflowTokenFail(InflowTokenInsufficientEvent event) { - log.debug("유량제어 토큰획득 실패 이벤트 수신: {} {}건", event.getEaisvcname(), event.getCnt()); - swingSendManager.send(event.getEaisvcname(), event.getCnt(), event.getRangeMinute()); - } -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/event/ApiStatusChangedEvent.java b/src/main/java/com/eactive/eai/rms/ext/djb/event/ApiStatusChangedEvent.java deleted file mode 100644 index 6f6dc95..0000000 --- a/src/main/java/com/eactive/eai/rms/ext/djb/event/ApiStatusChangedEvent.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.eactive.eai.rms.ext.djb.event; - -import com.eactive.eai.rms.data.ext.djb.apistatus.ApiStatusEvent; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public class ApiStatusChangedEvent { - private final String eaisvcname; - private final String eaisvcdesc; - private final String event; - - public static ApiStatusChangedEvent from(ApiStatusEvent source) { - return new ApiStatusChangedEvent(source.getEaisvcname(), source.getEaisvcdesc(), source.getEvent()); - } -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/event/InflowTokenInsufficientEvent.java b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java similarity index 80% rename from src/main/java/com/eactive/eai/rms/ext/djb/event/InflowTokenInsufficientEvent.java rename to src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java index b4b010e..dadcd80 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/event/InflowTokenInsufficientEvent.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java @@ -1,6 +1,6 @@ -package com.eactive.eai.rms.ext.djb.event; +package com.eactive.eai.rms.ext.djb.inflow; -import com.eactive.eai.rms.data.ext.djb.inflow.InflowTokenInsufficient; +import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenRepository.java similarity index 73% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenRepository.java rename to src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenRepository.java index 8dadc25..d98c99c 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenRepository.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenRepository.java @@ -1,9 +1,12 @@ -package com.eactive.eai.rms.data.ext.djb.inflow; +package com.eactive.eai.rms.ext.djb.inflow; import java.util.List; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; +import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficientLog; +import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficientLogId; public interface InflowTokenRepository extends BaseRepository { diff --git a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenService.java b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java similarity index 67% rename from src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenService.java rename to src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java index e4e91fa..fa7a12c 100644 --- a/src/main/java/com/eactive/eai/rms/data/ext/djb/inflow/InflowTokenService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java @@ -1,4 +1,4 @@ -package com.eactive.eai.rms.data.ext.djb.inflow; +package com.eactive.eai.rms.ext.djb.inflow; import java.util.List; @@ -9,7 +9,9 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.eactive.eai.rms.ext.djb.event.InflowTokenInsufficientEvent; +import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; +import com.eactive.eai.rms.ext.djb.util.UmsManager; @Service @@ -22,16 +24,15 @@ public class InflowTokenService { private InflowTokenRepository inflowTokenRepository; @Autowired - private ApplicationEventPublisher eventPublisher; + private UmsManager ums; public void checkRecentFails(long rangeMinute) { List rows = inflowTokenRepository.countTokenInsufficient(rangeMinute); for (InflowTokenInsufficient info : rows) { log.debug("유량제어 토큰 획득 실패: {}-{} 최근 {}분 동안 {}건", info.getEaisvcname(), info.getEaisvcdesc(), rangeMinute, info.getCnt()); - - //내부직원 알림 발송 - eventPublisher.publishEvent(InflowTokenInsufficientEvent.from(info, rangeMinute)); + String message = "유량제어 토큰 획득 실패하였습니다 \n" + info.getEaisvcname(); + ums.sendMessenger("api-monitor", MessageCode.INFLOW_TOKEN_FAILED, message); } } } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatusMonitorJob.java b/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatusMonitorJob.java index dbd3b66..6d0dd5c 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatusMonitorJob.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatusMonitorJob.java @@ -17,7 +17,7 @@ import com.eactive.eai.rms.common.context.MonitoringContext; import com.eactive.eai.rms.common.datasource.DataSourceContextHolder; import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; import com.eactive.eai.rms.common.util.CommonUtil; -import com.eactive.eai.rms.data.ext.djb.apistatus.ApiStatusService; +import com.eactive.eai.rms.ext.djb.apistatus.ApiStatusService; import com.eactive.eai.rms.onl.common.util.DateUtil; /** @@ -88,11 +88,11 @@ public class ApiStatusMonitorJob implements Job { monitoringContext = (MonitoringContext) appContext.getBean("monitoringContext"); ApiStatusService apiStatusUpdateService = appContext.getBean(ApiStatusService.class); - DataSourceContextHolder.setDataSourceType( DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW)); try { apiStatusUpdateService.updateApiStatus(param); + } catch (Exception e) { log.error("ApiStatusUpdateJob execution failed", e); throw new JobExecutionException(e); diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/job/InflowTokenMonitorJob.java b/src/main/java/com/eactive/eai/rms/ext/djb/job/InflowTokenMonitorJob.java index f9dc9b7..bcb1a5f 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/job/InflowTokenMonitorJob.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/job/InflowTokenMonitorJob.java @@ -18,7 +18,7 @@ import com.eactive.eai.rms.common.context.MonitoringContext; import com.eactive.eai.rms.common.datasource.DataSourceContextHolder; import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; import com.eactive.eai.rms.common.util.CommonUtil; -import com.eactive.eai.rms.data.ext.djb.inflow.InflowTokenService; +import com.eactive.eai.rms.ext.djb.inflow.InflowTokenService; import com.eactive.eai.rms.onl.common.util.DateUtil; /** diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/swing/service/SwingSendManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/swing/service/SwingSendManager.java deleted file mode 100644 index 34f61a2..0000000 --- a/src/main/java/com/eactive/eai/rms/ext/djb/swing/service/SwingSendManager.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.eactive.eai.rms.ext.djb.swing.service; - -import org.springframework.stereotype.Service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Service -@RequiredArgsConstructor -public class SwingSendManager { - - public void send(String eaisvcname, long cnt, long rangeMinute) { - log.info("[Swing] 발송 준비: {} 최근 {}분 {}건", eaisvcname, rangeMinute, cnt); - // TODO: 알림 발송 로직 - } -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java new file mode 100644 index 0000000..ac1479d --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java @@ -0,0 +1,71 @@ +package com.eactive.eai.rms.ext.djb.util; + +import java.security.SecureRandom; +import java.util.HashMap; +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.apim.portal.template.service.MessageHandlerService; +import com.eactive.apim.portal.template.service.MessageRecipient; +import com.eactive.apim.portal.user.entity.UserInfo; +import com.eactive.eai.rms.data.entity.man.user.UserInfoService; +import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendRequest; +import com.eactive.eai.rms.ext.djb.webhook.service.WebhookService; + +import lombok.RequiredArgsConstructor; + +@Component +@RequiredArgsConstructor +public class UmsManager { + + private static final Logger log = LoggerFactory.getLogger(UmsManager.class); + + private final MessageHandlerService messageHandlerService; + private final UserInfoService userInfoService; + private final WebhookService webhookService; + + /** + * 내부직원 메신저(Swing chat) 발송 + * @param roleId + * @param messageCode + * @param message + * @return + */ + public void sendMessenger(String roleId, MessageCode messageCode, String message) { + + List users = userInfoService.findAllByRoleId(roleId); + if (users.isEmpty()) { + log.warn("sendMessenger: no users found for role '{}'", roleId); + return; + } + + for (UserInfo user : users) { + MessageRecipient recipient = MessageRecipient.builder() + .userId(user.getUserid()) + .username(user.getUsername()) + .build(); + + HashMap params = new HashMap<>(); + params.put("message", message); + + messageHandlerService.publishEvent(messageCode, recipient, params); + } + } + + /** + * event를 구둑중인 제휴사에게 웹훅 발송 + * @param event + * @param apiIds + */ + public void sendWebhook(String event, List apiIds) { + + List list = webhookService.findSendList(event, apiIds); + for (WebhookSendRequest req : list) { + webhookService.send(req); + } + } +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java index 3f2a1a0..f338fbe 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/controller/WebhookSendController.java @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.eactive.eai.rms.data.ext.djb.webhook.WebhookSendLog; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.WebhookSendLog; import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendRequest; import com.eactive.eai.rms.ext.djb.webhook.service.WebhookReceiveService; import com.eactive.eai.rms.ext.djb.webhook.service.WebhookService; @@ -38,16 +38,12 @@ public class WebhookSendController { public ResponseEntity> sendWebhook( @RequestBody WebhookSendRequest request) { - WebhookSendLog result = webhookService.send( - request.getTargetUrl(), - request.getEventType(), - request.getData() - ); + webhookService.send(request); Map response = new HashMap<>(); - response.put("logId", result.getId()); - response.put("success", result.getSuccess()); - response.put("statusCode", result.getStatusCode()); +// response.put("logId", result.getId()); +// response.put("success", result.getSuccess()); +// response.put("statusCode", result.getStatusCode()); return ResponseEntity.ok(response); } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java index 6250bc0..264338e 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/dto/WebhookSendRequest.java @@ -6,8 +6,9 @@ import lombok.Setter; @Getter @Setter public class WebhookSendRequest { - + private String orgId; private String targetUrl; private String eventType; + private String secret; private Object data; } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookReqRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookReqRepository.java new file mode 100644 index 0000000..7abc722 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookReqRepository.java @@ -0,0 +1,11 @@ +package com.eactive.eai.rms.ext.djb.webhook.repository; + +import com.eactive.eai.rms.data.EMSDataSource; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.WebhookReq; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +@EMSDataSource +public interface WebhookReqRepository extends JpaRepository { +} diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java index 08141d6..2233a9c 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/repository/WebhookSendLogRepository.java @@ -10,7 +10,7 @@ import org.springframework.data.repository.query.Param; import org.springframework.stereotype.Repository; import com.eactive.eai.rms.data.EMSDataSource; -import com.eactive.eai.rms.data.ext.djb.webhook.WebhookSendLog; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.WebhookSendLog; @Repository @EMSDataSource diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendManager.java deleted file mode 100644 index d2f5f59..0000000 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookSendManager.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.eactive.eai.rms.ext.djb.webhook.service; - -import org.springframework.stereotype.Service; - -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; - -@Slf4j - @Service - @RequiredArgsConstructor - public class WebhookSendManager { - - public void send(String eaisvcname, String eventType) { - log.info("[Webhook] 발송 준비: {} {}", eaisvcname, eventType); - // TODO: PTL_WEBHOOK_REQ 조인 조회 후 WebhookService.send() 호출 - } - } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java index a7f1f5d..afde0bf 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java @@ -2,12 +2,16 @@ package com.eactive.eai.rms.ext.djb.webhook.service; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; @@ -18,10 +22,16 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; -import com.eactive.eai.rms.data.ext.djb.webhook.WebhookSendLog; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReq; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReqApi; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReqEvent; +import com.eactive.eai.rms.data.entity.onl.djb.webhook.WebhookSendLog; import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookPayload; +import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendRequest; import com.eactive.eai.rms.ext.djb.webhook.repository.WebhookSendLogRepository; import com.fasterxml.jackson.databind.ObjectMapper; +import com.querydsl.core.Tuple; +import com.querydsl.jpa.impl.JPAQueryFactory; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -35,17 +45,58 @@ public class WebhookService { private final ObjectMapper objectMapper; private final RestTemplate restTemplate; - - private String secretKey = "HW8JtFpkPmQqsVmr0Rb81P4qDypaNIVbGf3ZNMMPfyerhOHshoKABLaMBo1HA4BldTxhw1NjYmVnoPu9IIV7cyRXjecL3b2UctyR7DnVaJausltZLLr8Qm4Bzs4wRmgf"; + @PersistenceContext(unitName = "entityManagerFactoryForEMS") + private EntityManager entityManager; private static final String HMAC_ALGORITHM = "HmacSHA256"; private static final int MAX_RETRY = 3; + + + @SuppressWarnings("unchecked") + public List findSendList(String event, List apiIds) { + QWebhookReq req = QWebhookReq.webhookReq; + QWebhookReqEvent evt = QWebhookReqEvent.webhookReqEvent; + QWebhookReqApi api = QWebhookReqApi.webhookReqApi; + + List tuples = new JPAQueryFactory(entityManager) + .select(req.orgId, req.targetUrl, req.secret, api.id.apiId) + .from(req) + .join(evt).on(req.id.eq(evt.id.webhookReqId)) + .join(api).on(req.id.eq(api.id.webhookReqId)) + .where(evt.id.eventType.eq(event) + .and(api.id.apiId.in(apiIds))) + .fetch(); + + // orgId + targetUrl + secret 기준으로 그룹핑, apiId를 data(List)로 집계 + Map resultMap = new LinkedHashMap<>(); + for (Tuple t : tuples) { + String key = t.get(req.orgId) + "|" + t.get(req.targetUrl); + resultMap.computeIfAbsent(key, k -> { + WebhookSendRequest wr = new WebhookSendRequest(); + wr.setOrgId(t.get(req.orgId)); + wr.setTargetUrl(t.get(req.targetUrl)); + wr.setSecret(t.get(req.secret)); + wr.setEventType(event); + wr.setData(new ArrayList()); + return wr; + }); + ((List) resultMap.get(key).getData()).add(t.get(api.id.apiId)); + } + + return new ArrayList<>(resultMap.values()); + } /** * 웹훅 발송 메인 메서드 */ @Transactional - public WebhookSendLog send(String targetUrl, String eventType, Object data) { + public void send(WebhookSendRequest req) { + + String targetUrl = req.getTargetUrl(); + String secret = req.getSecret(); + String eventType = req.getEventType(); + Object data = req.getData(); + WebhookSendLog sendLog = new WebhookSendLog(); sendLog.setTargetUrl(targetUrl); sendLog.setEventType(eventType); @@ -57,7 +108,7 @@ public class WebhookService { sendLog.setPayload(payloadJson); // 2. Secret Key로 HMAC-SHA256 서명 생성 - String signature = generateSignature(payloadJson); + String signature = generateSignature(secret, payloadJson); sendLog.setSignature(signature); // 3. HTTP 요청 헤더 구성 @@ -95,12 +146,13 @@ public class WebhookService { eventType, targetUrl, e.getMessage()); } - return sendLogRepository.save(sendLog); + sendLogRepository.save(sendLog); + } /** * 실패 건 재시도 - */ + @Transactional public void retryFailedWebhooks() { List failedLogs = @@ -119,16 +171,16 @@ public class WebhookService { log.error("[Webhook] 재시도 실패 - id: {}", failedLog.getId(), e); } } - } + }*/ /** * HMAC-SHA256 서명 생성 * Java 17 미만은 HexFormat 미지원이므로 직접 변환 */ - private String generateSignature(String payload) throws Exception { + private String generateSignature(String secret, String payload) throws Exception { Mac mac = Mac.getInstance(HMAC_ALGORITHM); SecretKeySpec keySpec = new SecretKeySpec( - secretKey.getBytes(StandardCharsets.UTF_8), HMAC_ALGORITHM); + secret.getBytes(StandardCharsets.UTF_8), HMAC_ALGORITHM); mac.init(keySpec); byte[] hash = mac.doFinal(payload.getBytes(StandardCharsets.UTF_8)); return bytesToHex(hash); diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java index dc952fa..8d3e521 100644 --- a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java @@ -68,14 +68,14 @@ public class UmsDispatchService { log.info("UmsDispatchService initialized - KjbUmsService and KjbEmailSendModule ready via singleton"); } -// private KjbUmsService getUmsService() { -// return KjbUmsService.getInstance(); -// } -// -// private KjbEmailSendModule getEmailModule() { -// return KjbEmailSendModule.getInstance(); -// } -// + private KjbUmsService getUmsService() { + return KjbUmsService.getInstance(); + } + + private KjbEmailSendModule getEmailModule() { + return KjbEmailSendModule.getInstance(); + } + @SuppressWarnings("unchecked") @Transactional(transactionManager = "transactionManagerForEMS") public void processMessages() { @@ -112,7 +112,7 @@ public class UmsDispatchService { log.info("Starting to submit {} messages for processing", messagesToProcess.size()); for (MessageRequest message : messagesToProcess) { - //submitMessageTask(message); + submitMessageTask(message); } } else { log.info("No pending messages found"); @@ -123,40 +123,40 @@ public class UmsDispatchService { } -// private void submitMessageTask(MessageRequest message) { -// int queueSize = executorService.getQueue().size(); -// log.debug("Current queue size before submission: {}", queueSize); -// -// executorService.submit(() -> { -// try { -// transactionTemplate.execute(status -> { -// try { -// // 광주은행에서는 사용하지 않는 메소드 -//// processMessage(message); -// -// if (KjbUmsService.isAllowChannel(message)) { -// getUmsService().send(message); -// } -// -// if (KjbEmailSendModule.isAllowChannel(message)) { -// getEmailModule().sendEmail(message); -// } -// -// return null; -// } catch (Exception e) { -// log.error("Failed to process message: {} - Error: {}", -// message.getId(), e.getMessage(), e); -// updateMessageStatus(message, "FAILED"); -// status.setRollbackOnly(); -// return null; -// } -// }); -// } catch (Exception e) { -// log.error("Transaction execution failed for message: {} - Error: {}", -// message.getId(), e.getMessage(), e); -// } -// }); -// } + private void submitMessageTask(MessageRequest message) { + int queueSize = executorService.getQueue().size(); + log.debug("Current queue size before submission: {}", queueSize); + + executorService.submit(() -> { + try { + transactionTemplate.execute(status -> { + try { + // 광주은행에서는 사용하지 않는 메소드 +// processMessage(message); + + if (KjbUmsService.isAllowChannel(message)) { + getUmsService().send(message); + } + + if (KjbEmailSendModule.isAllowChannel(message)) { + getEmailModule().sendEmail(message); + } + + return null; + } catch (Exception e) { + log.error("Failed to process message: {} - Error: {}", + message.getId(), e.getMessage(), e); + updateMessageStatus(message, "FAILED"); + status.setRollbackOnly(); + return null; + } + }); + } catch (Exception e) { + log.error("Transaction execution failed for message: {} - Error: {}", + message.getId(), e.getMessage(), e); + } + }); + } /** * kbank 방식으로 광주은행에서는 사용하지 않음 From 35e5564252b0c5b0baaf801b2b10cdb89008bcaa Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 2 Jun 2026 09:43:03 +0900 Subject: [PATCH 02/12] =?UTF-8?q?webhook=20=EB=B0=9C=EC=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onl/djb/webhook/WebhookSendLog.java | 3 ++ .../ext/djb/apistatus/ApiStatusService.java | 13 +++----- .../eai/rms/ext/djb/util/UmsManager.java | 33 ++++++++++++++----- .../djb/webhook/service/WebhookService.java | 1 + 4 files changed, 33 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java index a1fa55d..5c82e6e 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/djb/webhook/WebhookSendLog.java @@ -42,6 +42,9 @@ public class WebhookSendLog { @Column(name = "STATUS_CODE") private Integer statusCode; + @Column(name = "ORG_ID") + private String orgId; + @Lob @Column(name = "RESPONSE_BODY") private String responseBody; diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java index 08e6bce..5bb77d0 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java @@ -12,6 +12,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; import com.eactive.eai.rms.ext.djb.util.UmsManager; @@ -70,27 +71,21 @@ public class ApiStatusService { } } - //이벤트별로 ums, webhook을 발송한다 for (Map.Entry> entry : eventMap.entrySet()) { String event = entry.getKey(); List apiIds = entry.getValue(); + Role role = new Role(); + role.setRoleId("api-monitor"); String message = getSwingChatMessage(event, apiIds); - ums.sendMessenger("api-monitor", MessageCode.API_STATUS_CHANGED, message); + ums.sendMessenger(role, MessageCode.API_STATUS_CHANGED, message); //제휴사 webhook 발송 ums.sendWebhook(event, apiIds); //개발자포탈 API상태모니터링 화면을 위한 처리 djbService.detect(event, apiIds); - - -// if (event.endsWith("_END")) { -// djbService.recovered(event, apiIds); -// } else { -// djbService.detect(event, apiIds); -// } } } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java index ac1479d..0bb9d21 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java @@ -12,6 +12,7 @@ import com.eactive.apim.portal.template.entity.MessageCode; import com.eactive.apim.portal.template.service.MessageHandlerService; import com.eactive.apim.portal.template.service.MessageRecipient; import com.eactive.apim.portal.user.entity.UserInfo; +import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendRequest; import com.eactive.eai.rms.ext.djb.webhook.service.WebhookService; @@ -29,17 +30,16 @@ public class UmsManager { private final WebhookService webhookService; /** - * 내부직원 메신저(Swing chat) 발송 - * @param roleId + * role 역할을 가진 내부직원에게 메신저(Swing chat) 발송 + * @param role * @param messageCode * @param message * @return */ - public void sendMessenger(String roleId, MessageCode messageCode, String message) { - - List users = userInfoService.findAllByRoleId(roleId); + public void sendMessenger(Role role, MessageCode messageCode, String message) { + List users = userInfoService.findAllByRoleId(role.getRoleId()); if (users.isEmpty()) { - log.warn("sendMessenger: no users found for role '{}'", roleId); + log.warn("sendMessenger: no users found for role '{}'", role.getRoleId()); return; } @@ -55,14 +55,31 @@ public class UmsManager { messageHandlerService.publishEvent(messageCode, recipient, params); } } + + /** + * 내부직원에게 메신저 발송 + * @param user + * @param messageCode + * @param message + */ + public void sendMessenger(UserInfo user, MessageCode messageCode, String message) { + MessageRecipient recipient = MessageRecipient.builder() + .userId(user.getUserid()) + .username(user.getUsername()) + .build(); + + HashMap params = new HashMap<>(); + params.put("message", message); + + messageHandlerService.publishEvent(messageCode, recipient, params); + } /** - * event를 구둑중인 제휴사에게 웹훅 발송 + * event를 구독중인 제휴사에게 웹훅 발송 * @param event * @param apiIds */ public void sendWebhook(String event, List apiIds) { - List list = webhookService.findSendList(event, apiIds); for (WebhookSendRequest req : list) { webhookService.send(req); diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java index afde0bf..60f5c36 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java @@ -98,6 +98,7 @@ public class WebhookService { Object data = req.getData(); WebhookSendLog sendLog = new WebhookSendLog(); + sendLog.setOrgId(req.getOrgId()); sendLog.setTargetUrl(targetUrl); sendLog.setEventType(eventType); From 68c8e18e8d86f6c1893eab6b1368fc14fa51339b Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 4 Jun 2026 17:38:52 +0900 Subject: [PATCH 03/12] =?UTF-8?q?=EC=8A=A4=EC=9C=99=EC=B1=84=20&=20webhook?= =?UTF-8?q?=20=EB=B0=9C=EC=86=A1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rms/common/context/MonitoringContext.java | 4 + .../ext/djb/apistatus/ApiStatusService.java | 6 +- .../inflow/InflowTokenInsufficientEvent.java | 19 ----- .../ext/djb/inflow/InflowTokenService.java | 3 +- .../eai/rms/ext/djb/util/UmsManager.java | 8 +- .../djb/webhook/service/WebhookService.java | 56 ++++++++----- .../service/ums/UmsDispatchService.java | 84 ++++++++----------- 7 files changed, 82 insertions(+), 98 deletions(-) delete mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java diff --git a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java index 61cf3c1..f274bf3 100644 --- a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java +++ b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java @@ -254,6 +254,10 @@ public interface MonitoringContext { // 이중 로그인 허용여부 public static final String RMS_DUAL_LOGIN_ENABLED = "rms.DUAL_LOGIN_ENABLED"; + + // 웹훅 재전송 설정 + public static final String API_WEBHOOK_RETRY_COUNT = "api.webhook.retry_count"; + public static final String API_WEBHOOK_RETRY_TIME = "api.webhook.retry_time"; diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java index 5bb77d0..885de37 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java @@ -76,12 +76,10 @@ public class ApiStatusService { String event = entry.getKey(); List apiIds = entry.getValue(); - Role role = new Role(); - role.setRoleId("api-monitor"); String message = getSwingChatMessage(event, apiIds); - ums.sendMessenger(role, MessageCode.API_STATUS_CHANGED, message); + ums.sendMessenger("api-monitor", MessageCode.API_STATUS_CHANGED, message); - //제휴사 webhook 발송 + //제휴사 웹훅 발송 ums.sendWebhook(event, apiIds); //개발자포탈 API상태모니터링 화면을 위한 처리 diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java deleted file mode 100644 index dadcd80..0000000 --- a/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenInsufficientEvent.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.eactive.eai.rms.ext.djb.inflow; - -import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public class InflowTokenInsufficientEvent { - private final String eaisvcname; - private final String eaisvcdesc; - private final long cnt; - private final long rangeMinute; - - public static InflowTokenInsufficientEvent from(InflowTokenInsufficient summary, long rangeMinute) { - return new InflowTokenInsufficientEvent(summary.getEaisvcname(), summary.getEaisvcdesc(), summary.getCnt(), rangeMinute); - } -} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java index fa7a12c..4859ee4 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/inflow/InflowTokenService.java @@ -5,11 +5,11 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.eactive.apim.portal.template.entity.MessageCode; +import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.onl.djb.inflow.InflowTokenInsufficient; import com.eactive.eai.rms.ext.djb.util.UmsManager; @@ -32,6 +32,7 @@ public class InflowTokenService { for (InflowTokenInsufficient info : rows) { log.debug("유량제어 토큰 획득 실패: {}-{} 최근 {}분 동안 {}건", info.getEaisvcname(), info.getEaisvcdesc(), rangeMinute, info.getCnt()); String message = "유량제어 토큰 획득 실패하였습니다 \n" + info.getEaisvcname(); + ums.sendMessenger("api-monitor", MessageCode.INFLOW_TOKEN_FAILED, message); } } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java index 0bb9d21..a33ccbf 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java @@ -1,6 +1,5 @@ package com.eactive.eai.rms.ext.djb.util; -import java.security.SecureRandom; import java.util.HashMap; import java.util.List; @@ -36,10 +35,11 @@ public class UmsManager { * @param message * @return */ - public void sendMessenger(Role role, MessageCode messageCode, String message) { - List users = userInfoService.findAllByRoleId(role.getRoleId()); + public void sendMessenger(String roleId, MessageCode messageCode, String message) { + + List users = userInfoService.findAllByRoleId(roleId); if (users.isEmpty()) { - log.warn("sendMessenger: no users found for role '{}'", role.getRoleId()); + log.info("sendMessenger: no users found for role '{}'", roleId); return; } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java index 60f5c36..6a2ffc1 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/service/WebhookService.java @@ -22,6 +22,7 @@ import org.springframework.web.client.HttpClientErrorException; import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.client.RestTemplate; +import com.eactive.eai.rms.common.context.MonitoringContext; import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReq; import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReqApi; import com.eactive.eai.rms.data.entity.onl.djb.webhook.QWebhookReqEvent; @@ -44,12 +45,14 @@ public class WebhookService { private final WebhookSendLogRepository sendLogRepository; private final ObjectMapper objectMapper; private final RestTemplate restTemplate; + private final MonitoringContext monitoringContext; @PersistenceContext(unitName = "entityManagerFactoryForEMS") private EntityManager entityManager; private static final String HMAC_ALGORITHM = "HmacSHA256"; - private static final int MAX_RETRY = 3; + private static final int DEFAULT_RETRY_COUNT = 3; + private static final int DEFAULT_RETRY_TIME = 10000; @SuppressWarnings("unchecked") @@ -119,18 +122,20 @@ public class WebhookService { headers.set("X-Webhook-Event", eventType); headers.set("X-Webhook-Timestamp", String.valueOf(webhookPayload.getTimestamp())); - // 4. 발송 + // 4. 발송 (재시도 포함) + int retryCount = monitoringContext.getIntProperty(MonitoringContext.API_WEBHOOK_RETRY_COUNT, DEFAULT_RETRY_COUNT); + int retryTime = monitoringContext.getIntProperty(MonitoringContext.API_WEBHOOK_RETRY_TIME, DEFAULT_RETRY_TIME); sendLog.setSentAt(LocalDateTime.now()); - HttpEntity request = new HttpEntity<>(payloadJson, headers); - ResponseEntity response = restTemplate.postForEntity(targetUrl, request, String.class); + HttpEntity httpRequest = new HttpEntity<>(payloadJson, headers); + ResponseEntity response = sendWithRetry(targetUrl, httpRequest, sendLog, retryCount, retryTime); // 5. 성공 로그 sendLog.setStatusCode(response.getStatusCode().value()); sendLog.setResponseBody(response.getBody()); sendLog.setSuccess(response.getStatusCode().is2xxSuccessful()); - log.info("[Webhook] 발송 성공 - eventType: {}, url: {}, status: {}", - eventType, targetUrl, response.getStatusCode()); + log.info("[Webhook] 발송 성공 - eventType: {}, url: {}, status: {}, retryCount: {}", + eventType, targetUrl, response.getStatusCode(), sendLog.getRetryCount()); } catch (HttpClientErrorException | HttpServerErrorException e) { sendLog.setStatusCode(e.getStatusCode().value()); @@ -151,28 +156,33 @@ public class WebhookService { } + + /** - * 실패 건 재시도 - - @Transactional - public void retryFailedWebhooks() { - List failedLogs = - sendLogRepository.findFailedLogs(MAX_RETRY); - - for (WebhookSendLog failedLog : failedLogs) { + * 재시도 포함 HTTP 발송 + * - 4xx: 클라이언트 오류이므로 즉시 throw (재시도 불필요) + * - 5xx / 네트워크 오류: 최대 RETRY_COUNT회까지 exponential backoff 재시도 (1s → 2s → 4s) + */ + private ResponseEntity sendWithRetry(String targetUrl, HttpEntity request, WebhookSendLog sendLog, int retryCount, int retryTime) throws Exception { + Exception lastException = null; + for (int attempt = 0; attempt <= retryCount; attempt++) { try { - log.info("[Webhook] 재시도 - id: {}, retry: {}", failedLog.getId(), failedLog.getRetryCount()); - failedLog.setRetryCount(failedLog.getRetryCount() + 1); - sendLogRepository.save(failedLog); - - send(failedLog.getTargetUrl(), failedLog.getEventType(), - objectMapper.readValue(failedLog.getPayload(), Object.class)); - + if (attempt > 0) { + long delayMs = retryTime * (1L << (attempt - 1)); + log.info("[Webhook] 재시도 {}/{} - url: {}, delay: {}ms", attempt, retryCount, targetUrl, delayMs); + Thread.sleep(delayMs); + sendLog.setRetryCount(attempt); + } + return restTemplate.postForEntity(targetUrl, request, String.class); + } catch (HttpClientErrorException e) { + throw e; // 4xx는 재시도 불필요 } catch (Exception e) { - log.error("[Webhook] 재시도 실패 - id: {}", failedLog.getId(), e); + lastException = e; + log.warn("[Webhook] 발송 실패 (attempt {}/{}) - url: {}, error: {}", attempt, retryCount, targetUrl, e.getMessage()); } } - }*/ + throw lastException; + } /** * HMAC-SHA256 서명 생성 diff --git a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java index 8d3e521..d257a68 100644 --- a/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java +++ b/src/main/java/com/eactive/eai/rms/onl/common/service/ums/UmsDispatchService.java @@ -1,19 +1,5 @@ package com.eactive.eai.rms.onl.common.service.ums; -import com.eactive.apim.portal.template.entity.MessageRequest; -import com.eactive.apim.portal.template.repository.MessageRequestRepository; -import com.eactive.ext.kjb.ums.KjbEmailSendModule; -import com.eactive.ext.kjb.ums.KjbUmsService; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.stereotype.Service; -import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.support.TransactionTemplate; - -import javax.persistence.EntityManager; -import javax.persistence.PersistenceContext; import java.time.LocalDateTime; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -21,6 +7,23 @@ import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.TimeUnit; import javax.annotation.PostConstruct; +import javax.persistence.EntityManager; +import javax.persistence.PersistenceContext; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Service; +import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.TransactionTemplate; + +import com.eactive.apim.portal.template.entity.MessageRequest; +import com.eactive.apim.portal.template.repository.MessageRequestRepository; +import com.eactive.ext.djb.ums.DjbMessengerService; +import com.eactive.ext.kjb.ums.KjbEmailSendModule; +import com.eactive.ext.kjb.ums.KjbUmsService; + +import lombok.extern.slf4j.Slf4j; @Slf4j @@ -67,6 +70,10 @@ public class UmsDispatchService { // KjbEmailSendModule.getInstance().setRepository(messageRequestRepository); log.info("UmsDispatchService initialized - KjbUmsService and KjbEmailSendModule ready via singleton"); } + + private DjbMessengerService getMessengerService() { + return DjbMessengerService.getInstance(); + } private KjbUmsService getUmsService() { return KjbUmsService.getInstance(); @@ -131,54 +138,37 @@ public class UmsDispatchService { try { transactionTemplate.execute(status -> { try { - // 광주은행에서는 사용하지 않는 메소드 -// processMessage(message); - + if (DjbMessengerService.isAllowChannel(message)) { + getMessengerService().send(message); + } if (KjbUmsService.isAllowChannel(message)) { getUmsService().send(message); } - if (KjbEmailSendModule.isAllowChannel(message)) { getEmailModule().sendEmail(message); } - + updateMessageStatus(message, "SENT"); return null; } catch (Exception e) { - log.error("Failed to process message: {} - Error: {}", - message.getId(), e.getMessage(), e); - updateMessageStatus(message, "FAILED"); - status.setRollbackOnly(); - return null; + // checked exception을 RuntimeException으로 감싸 전파 → TransactionTemplate이 rollback 후 re-throw + throw new RuntimeException(e); } }); } catch (Exception e) { - log.error("Transaction execution failed for message: {} - Error: {}", - message.getId(), e.getMessage(), e); + log.error("Failed to process message: {} - Error: {}", message.getId(), e.getMessage(), e); + try { + transactionTemplate.execute(s -> { + updateMessageStatus(message, "FAILED"); + return null; + }); + } catch (Exception ex) { + log.error("Failed to update FAIL status for message: {}", message.getId(), ex); + } } }); } - /** - * kbank 방식으로 광주은행에서는 사용하지 않음 - * @param message - * @throws IOException - */ -// @Deprecated -// public void processMessage(MessageRequest message) throws IOException { -// try { -// String standardMessage = messageFactory.createMessage(message); -// log.debug("Processing message ID: {} - Type: {}", message.getId(), message.getMessageType()); -// -// umsSender.sendMessage(standardMessage); -// updateMessageStatus(message, "SENT"); -// log.debug("Successfully processed and sent message ID: {}", message.getId()); -// } catch (Exception e) { -// log.error("Message processing failed for ID: {} - Error: {}", -// message.getId(), e.getMessage(), e); -// updateMessageStatus(message, "FAILED"); -// throw e; -// } -// } + public void updateMessageStatus(MessageRequest message, String status) { message.setRequestStatus(status); From 7857f5b45cfc264bff606679cd8b41c6b79bdd87 Mon Sep 17 00:00:00 2001 From: eastargh Date: Thu, 4 Jun 2026 18:11:31 +0900 Subject: [PATCH 04/12] =?UTF-8?q?=EC=9E=90=EB=8F=99=20Log-off=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/jsp/common/include/script.jsp | 4 + WebContent/jsp/common/screen/main.jsp | 89 ++++++++++++++++++- .../rms/common/context/MonitoringContext.java | 3 + .../eai/rms/common/login/MainController.java | 2 + 4 files changed, 97 insertions(+), 1 deletion(-) diff --git a/WebContent/jsp/common/include/script.jsp b/WebContent/jsp/common/include/script.jsp index 1e96177..d4195f2 100644 --- a/WebContent/jsp/common/include/script.jsp +++ b/WebContent/jsp/common/include/script.jsp @@ -30,6 +30,10 @@ + <%-- --%> diff --git a/WebContent/jsp/common/screen/main.jsp b/WebContent/jsp/common/screen/main.jsp index 0642401..8748ef8 100644 --- a/WebContent/jsp/common/screen/main.jsp +++ b/WebContent/jsp/common/screen/main.jsp @@ -99,6 +99,93 @@ - + + <%-- 자동 로그아웃 경고 모달 --%> + + + + diff --git a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java index f274bf3..e9d6ed9 100644 --- a/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java +++ b/src/main/java/com/eactive/eai/rms/common/context/MonitoringContext.java @@ -255,6 +255,9 @@ public interface MonitoringContext { // 이중 로그인 허용여부 public static final String RMS_DUAL_LOGIN_ENABLED = "rms.DUAL_LOGIN_ENABLED"; + // 자동 로그아웃 타임아웃 (단위: 분, 기본값: 10) + public static final String RMS_AUTO_LOGOUT_TIMEOUT = "rms.auto.logout.timeout"; + // 웹훅 재전송 설정 public static final String API_WEBHOOK_RETRY_COUNT = "api.webhook.retry_count"; public static final String API_WEBHOOK_RETRY_TIME = "api.webhook.retry_time"; diff --git a/src/main/java/com/eactive/eai/rms/common/login/MainController.java b/src/main/java/com/eactive/eai/rms/common/login/MainController.java index 1471ec8..3994a19 100644 --- a/src/main/java/com/eactive/eai/rms/common/login/MainController.java +++ b/src/main/java/com/eactive/eai/rms/common/login/MainController.java @@ -617,6 +617,8 @@ public class MainController implements InterceptorSkipController { menuId = menuId == null ? "" : menuId; model.addAttribute("mainPage", mainPage); model.addAttribute("menuId", menuId); + model.addAttribute("autoLogoutTimeout", + monitoringContext.getIntProperty(MonitoringContext.RMS_AUTO_LOGOUT_TIMEOUT, 10)); if (logger.isDebugEnabled()) { logger.debug("CURRENT SERVICE TYPE : " + service); From feb4f845a840f43c923c764b7c7090b778c0d994 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 10:11:21 +0900 Subject: [PATCH 05/12] =?UTF-8?q?=ED=8C=9D=EC=97=85=20=EB=91=90=EB=B2=88?= =?UTF-8?q?=EC=A7=B8=20=EC=9D=B4=ED=9B=84=20=EC=98=A4=ED=94=88=EC=8B=9C=20?= =?UTF-8?q?=EC=84=A0=ED=83=9D=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/js/custom.js | 8 ++++++++ WebContent/jsp/js/custom.js | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/WebContent/js/custom.js b/WebContent/js/custom.js index e6bb511..c5e7c5f 100644 --- a/WebContent/js/custom.js +++ b/WebContent/js/custom.js @@ -36,6 +36,14 @@ // save the returnValue in options so that it is available in the callback function optns.returnValue = $frame[0].contentWindow.window.returnValue; optns.onClose(); + // Remove iframe from DOM so window.frames doesn't accumulate stale entries; + // without this, a second showModal call leaves frames[0] pointing to the first + // (closed) iframe, causing the previous returnValue to bleed into the next callback. + var $dialogEl = $frame.closest('.ui-dialog'); + setTimeout(function() { + $frame.remove(); + if ($dialogEl.length) $dialogEl.remove(); + }, 0); if(optns.option && optns.option.fullScreenPopup){ $('iframe[name=topFrame]',window.parent.document).css('display', 'block'); diff --git a/WebContent/jsp/js/custom.js b/WebContent/jsp/js/custom.js index 2cde935..5eda123 100644 --- a/WebContent/jsp/js/custom.js +++ b/WebContent/jsp/js/custom.js @@ -36,6 +36,14 @@ // save the returnValue in options so that it is available in the callback function optns.returnValue = $frame[0].contentWindow.window.returnValue; optns.onClose(); + // Remove iframe from DOM so window.frames doesn't accumulate stale entries; + // without this, a second showModal call leaves frames[0] pointing to the first + // (closed) iframe, causing the previous returnValue to bleed into the next callback. + var $dialogEl = $frame.closest('.ui-dialog'); + setTimeout(function() { + $frame.remove(); + if ($dialogEl.length) $dialogEl.remove(); + }, 0); if(optns.option && optns.option.fullScreenPopup){ $('iframe[name=topFrame]',window.parent.document).css('display', 'block'); From 480d7dac5a54b63dc6074144bf2bd97e98214d63 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 15:10:06 +0900 Subject: [PATCH 06/12] =?UTF-8?q?=EC=95=B1=EC=8A=B9=EC=9D=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=98=88=EC=83=81=EC=99=84=EB=A3=8C=EC=9D=BC=20=ED=95=AD?= =?UTF-8?q?=EB=AA=A9=20=EC=B6=94=EA=B0=80=20&=20=EC=8A=B9=EC=9D=B8?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EC=83=81=EC=84=B8=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EC=8B=9C=20"=EC=A7=84=ED=96=89=EC=A4=91"=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../approval/portalAppApprovalManPopup.jsp | 57 ++++++++++++++++++- .../onl/apim/approval/portalApprovalMan.jsp | 15 ++++- .../approval/PortalApprovalManController.java | 6 ++ .../approval/PortalApprovalManService.java | 17 ++++++ .../onl/apim/approval/PortalApprovalUI.java | 2 + 5 files changed, 92 insertions(+), 5 deletions(-) diff --git a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp index ad28250..03e3996 100644 --- a/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp +++ b/WebContent/jsp/onl/apim/approval/portalAppApprovalManPopup.jsp @@ -38,12 +38,22 @@ var loginUser = '<%= loginVo.getUserId() %>'; var url = ''; var url_view = ''; + + function dateFormat(cellvalue) { + if ( cellvalue == null || cellvalue.length < 8 ) + return ''; + return cellvalue.substr(0 ,4) + '-' + + cellvalue.substr(4, 2) + '-' + + cellvalue.substr(6, 2) ; + } $(document).ready(function () { var key = "${param.id}"; if (key) { detail(key); } + + $("#expectEndDate").datepicker().inputmask("yyyy-mm-dd", {'autoUnmask': true}); $("#btn_app_approve").click(function () { if (confirm("승인하시겠습니까?")) { @@ -112,6 +122,28 @@ }); } }); + + $("#btn_modify").click(function () { + if (confirm("수정하시겠습니까?")) { + $.ajax({ + type: "POST", + url: url, + data: {cmd: "UPDATE", id: key, expectEndDate: $("#expectEndDate").val().replaceAll('-','')}, + success: function (args) { + alert("수정되었습니다."); + if (window.dialogArguments && window.dialogArguments.self) { + window.dialogArguments.self.location.reload(); + } else if (window.opener) { + window.opener.location.reload(); + } + window.close(); + }, + error: function (e) { + alert(e.responseText); + } + }); + } + }); $("#btn_close").click(function () { window.close(); @@ -126,12 +158,25 @@ data: {cmd: 'DETAIL', id: key}, success: function (json) { var data = json; + + if (data.approvalStatus.code == 'END') { + $('#btn_modify').hide(); + $('#expectEndDate').hide(); + $('#spExpectEndDate').show(); + $('#spExpectEndDate').text(dateFormat(data.expectEndDate)); + } else { + $('#btn_modify').show(); + $('#expectEndDate').show(); + $('#spExpectEndDate').hide(); + } + $("#approvalType").text(data.approvalType === 'USER' ? "법인사용자" : "API 사용"); $("#approvalStatus").text(data.approvalStatus.description); $("#requesterName").text(data.requester.userName); $("#approvalSubject").text(data.approvalSubject); $("#approvalDetail").html(data.approvalDetail); $("#createdDate").text(data.createdDate).inputmask("9999-99-99 99:99:99.999", {'autoUnmask': true}); + $("#expectEndDate").val(data.expectEndDate); if (data.approvers.some(approver => approver.approverStatus === 'CURRENT' && @@ -144,7 +189,7 @@ document.getElementById("btn_app_reject").style.display = "none"; } - if (data.approvalStatus.description === '배포실패') { + if (data.approvalStatus.code === 'FAILED') { document.getElementById("btn_app_redeploy").style.display = ""; } @@ -242,9 +287,14 @@ 상세 내용 - +
+ 예상완료일 + + + + @@ -282,6 +332,9 @@
+ diff --git a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp index dff4b54..c00c10b 100644 --- a/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp +++ b/WebContent/jsp/onl/apim/approval/portalApprovalMan.jsp @@ -21,6 +21,14 @@ 'USER': '법인사용자', 'APP': 'API 사용' }; + + function dateFormat(cellvalue, options, rowObject) { + if ( cellvalue == null || cellvalue.length < 8 ) + return ''; + return cellvalue.substr(0 ,4) + '-' + + cellvalue.substr(4, 2) + '-' + + cellvalue.substr(6, 2) ; + } $(document).ready(function() { $('#grid').jqGrid({ @@ -33,7 +41,7 @@ searchApprovalStatus: $('select[name=searchApprovalStatus]').val(), searchApprovalSubject: $('input[name=searchApprovalSubject]').val() }, - colNames: ['No.', 'id', '제목', '승인 유형', '승인 유형', '승인 상태','요청자', '생성일'], + colNames: ['No.', 'id', '제목', '승인 유형', '승인 유형', '승인 상태','요청자', '생성일', '예상완료일'], colModel: [ { name: 'rowNum', align: 'center', width: '30', sortable: false}, { name: 'id', align: 'center', key: true, hidden: true }, @@ -42,7 +50,8 @@ { name: 'approvalType', align: 'center', width: 80, hidden: true}, { name: 'approvalStatus.description', align: 'center', width: 80 }, { name: 'requester.userName', align: 'center', width: 100 }, - { name: 'createdDate', align: 'center', width: 120, formatter: 'date', formatoptions: { srcformat: 'ISO8601Long', newformat: 'Y-m-d H:i:s' } } + { name: 'createdDate', align: 'center', width: 120, formatter: 'date', formatoptions: { srcformat: 'ISO8601Long', newformat: 'Y-m-d H:i:s' } }, + { name: 'expectEndDate', align: 'center', width: 100, formatter: dateFormat}, ], jsonReader: { repeatitems: false @@ -134,8 +143,8 @@
diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java index 8a72d2f..532ae3a 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManController.java @@ -76,4 +76,10 @@ public class PortalApprovalManController extends BaseAnnotationController { portalApprovalManService.redeploy(id); return ResponseEntity.ok().build(); } + + @PostMapping(value = "/onl/apim/approval/portalApprovalMan.json", params = "cmd=UPDATE") + public ResponseEntity update(String id, String expectEndDate) { + portalApprovalManService.update(id, expectEndDate); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java index 99cf1b2..8210bd8 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalManService.java @@ -76,6 +76,16 @@ public class PortalApprovalManService extends BaseService { * 마스킹된 상세 정보 조회 */ public PortalApprovalUI selectDetail(String id) { + //2026.06.05 관리자가 승인요청을 조회시 심사중으로 상태 변경 + //APP 유형이고 REQUESTED 상태인 경우 관리자 조회 시 PROCESSING으로 변경 + approvalService.findById(id).ifPresent(approval -> { + if (approval.getApprovalType().equals(ApprovalType.APP) + && approval.getApprovalStatus() instanceof RequestedState) { + approval.setApprovalStatus(new ProcessingState()); + approvalService.save(approval); + } + }); + PortalApprovalUI result = getDetailWithMaskOption(id, false); if (result == null) { throw new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id); @@ -320,6 +330,13 @@ public class PortalApprovalManService extends BaseService { sendEvent(id, ApprovalEvent.DENY, options); } + public void update(String id, String expectEndDate) { + Approval approval = approvalService.findById(id) + .orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); + approval.setExpectEndDate(expectEndDate); + approvalService.save(approval); + } + public void redeploy(String id) { Map options = new HashMap<>(); Approval approval = approvalService.findById(id).orElseThrow(() -> new IllegalArgumentException("승인 정보를 찾을 수 없습니다. ID: " + id)); diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java index 5df32b4..029d3f6 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/approval/PortalApprovalUI.java @@ -38,6 +38,8 @@ public class PortalApprovalUI { @DateTimeFormat(pattern = "yyyyMMddHHmmssSSS") private String approvalDate; + private String expectEndDate; + public String getApprovalTypeDescription() { return approvalType != null ? approvalType.getDescription() : ""; } From ec8d6bfd7bc1251abe73ad390feff83a85be3997 Mon Sep 17 00:00:00 2001 From: eastargh Date: Fri, 5 Jun 2026 17:41:37 +0900 Subject: [PATCH 07/12] =?UTF-8?q?Q&A=20=EA=B2=8C=EC=8B=9C=ED=8C=90=20?= =?UTF-8?q?=EB=8C=93=EA=B8=80=20=EC=9E=91=EC=84=B1=20=EA=B8=B0=EB=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../portalinquiry/portalInquiryManDetail.jsp | 104 ++++++++++++++++++ .../InquiryCommentRepository.java | 15 +++ .../PortalInquiryCommentService.java | 27 +++++ .../portalInquiry/PortalInquiryCommentUI.java | 42 +++++++ .../PortalInquiryCommentUIMapper.java | 17 +++ .../PortalInquiryManController.java | 18 +++ .../PortalInquiryManService.java | 54 +++++++++ 7 files changed, 277 insertions(+) create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java diff --git a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp index 7711d66..a302d4e 100644 --- a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp @@ -36,6 +36,13 @@ padding-bottom: 10px; border-bottom: 2px solid #e0e0e0; /* 제목 아래 줄 긋기 */ } + + .comment-section { + margin-bottom: 30px; + border: 1px solid #e0e0e0; /* 동일한 박스 스타일 */ + padding: 20px; + border-radius: 5px; + } .info-row { margin-bottom: 10px; @@ -57,6 +64,15 @@ width: 100%; min-height: 200px; } + + #commentDetail { + min-height: 100px; + border: 1px solid #00000032; + border-radius: 4px; + padding: 10px; + flex: 1; + font-family: '맑은고딕' + } .required-mark { color: red; @@ -94,6 +110,8 @@ var decodedContent = decodeHTMLEntities(data.responseDetail); $("#responseDetail").summernote('code', decodedContent || ''); + // 댓글 표시 + listComment(key); // 첨부 파일 표시 displayAttachFiles(data.fileInfo); @@ -104,6 +122,55 @@ } }); } + + function listComment(inquiryId) { + $.ajax({ + type: "POST", + url: url, + dataType: "json", + data: {cmd: 'LIST_COMMENT', id: inquiryId}, + success: function (data) { + var $commentList = $('#commentList'); + $commentList.empty(); + if (!data || data.length === 0) return; + $.each(data, function (i, comment) { + var date = comment.createdDate ? timeStampFormat(comment.createdDate) : ''; + var row = $('
').addClass('info-row'); + $('
').addClass('info-label').css('color', '#555').text(comment.writerName || '').appendTo(row); + var content = $('
').addClass('info-content'); + $('
').css('white-space', 'pre-wrap').text(comment.commentDetail).appendTo(content); + var meta = $('
').css({'font-size': '0.9em', 'color': '#999', 'margin-top': '2px'}); + $('').text(date).appendTo(meta); + $('
+ + +
+
+
+
${sessionScope.login.userName}
+
+ + +
+
+
+
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java new file mode 100644 index 0000000..caf0618 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java @@ -0,0 +1,15 @@ +package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.EMSDataSource; + +import java.util.List; + +@EMSDataSource +public interface InquiryCommentRepository extends BaseRepository { + + long countByInquiry_Id(String inquiryId); + + List findByInquiry_IdAndDelYnOrderBySeqAsc(String inquiryId, String delYn); +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java new file mode 100644 index 0000000..b13b422 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java @@ -0,0 +1,27 @@ +package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@Transactional(transactionManager = "transactionManagerForEMS") +public class PortalInquiryCommentService extends AbstractEMSDataSerivce { + + // AbstractEMSDataSerivce의 repository 필드가 BaseRepository로 고정되어 + // 커스텀 메서드를 호출할 수 없으므로 별도 필드로 직접 주입 + @Autowired + private InquiryCommentRepository inquiryCommentRepository; + + public long countByInquiryId(String inquiryId) { + return inquiryCommentRepository.countByInquiry_Id(inquiryId); + } + + public List findByInquiryId(String inquiryId) { + return inquiryCommentRepository.findByInquiry_IdAndDelYnOrderBySeqAsc(inquiryId, "N"); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java new file mode 100644 index 0000000..b5eddea --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java @@ -0,0 +1,42 @@ +package com.eactive.eai.rms.onl.apim.portalInquiry; + +import com.eactive.apim.portal.file.entity.FileInfo; +import com.eactive.eai.data.converter.LocalDateTimeFormatters; +import com.eactive.eai.rms.onl.apim.portaluser.PortalUserUI; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.multipart.MultipartFile; + +import java.time.LocalDateTime; +import java.util.List; + + +@Data +public class PortalInquiryCommentUI { + + private String id; + + private String inquiryId; + + private String commentDetail; + + private int seq; + + private String delYn; + + private String createdBy; + + private String writerName; + + private String lastModifiedBy; + + @JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14) + @DateTimeFormat(pattern = "yyyyMMddHHmmss") + private LocalDateTime createdDate; + + @JsonFormat(pattern = LocalDateTimeFormatters.FORMAT_YYYYMMDDHHMMSS_14) + @DateTimeFormat(pattern = "yyyyMMddHHmmss") + private LocalDateTime lastModifiedDate; + +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java new file mode 100644 index 0000000..8a5e3dd --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUIMapper.java @@ -0,0 +1,17 @@ +package com.eactive.eai.rms.onl.apim.portalInquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import org.mapstruct.Mapper; +import org.mapstruct.Mapping; +import org.mapstruct.ReportingPolicy; + +import java.util.List; + +@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) +public interface PortalInquiryCommentUIMapper { + + @Mapping(target = "inquiryId", source = "inquiry.id") + PortalInquiryCommentUI toVo(InquiryComment entity); + + List toVoList(List entities); +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java index a87c6ee..5fe6a76 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManController.java @@ -73,5 +73,23 @@ public class PortalInquiryManController extends BaseAnnotationController { portalInquiryManService.deleteBulk(ids); return ResponseEntity.ok().build(); } + + @PostMapping(value = "/onl/apim/portalinquiry/portalInquiryMan.json", params = "cmd=LIST_COMMENT") + public ResponseEntity> selectCommentList(String id) { + return ResponseEntity.ok(portalInquiryManService.selectCommentList(id)); + } + + @PostMapping(value = "/onl/apim/portalinquiry/portalInquiryMan.json", params = "cmd=INSERT_COMMENT") + public ResponseEntity insertComment(HttpServletRequest request, PortalInquiryCommentUI portalInquiryCommentUI) { + String userid = SessionManager.getUserId(request); + portalInquiryManService.insertComment(portalInquiryCommentUI, userid); + return ResponseEntity.ok().build(); + } + + @PostMapping(value = "/onl/apim/portalinquiry/portalInquiryMan.json", params = "cmd=DELETE_COMMENT") + public ResponseEntity deleteComment(String id) { + portalInquiryManService.deleteComment(id); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java index f8549d1..e9895ff 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java @@ -4,10 +4,13 @@ import com.eactive.apim.portal.file.entity.FileInfo; import com.eactive.apim.portal.file.service.FileService; import com.eactive.apim.portal.portaluser.entity.PortalUser; import com.eactive.apim.portal.portaluser.entity.PortalUserEnums; +import com.eactive.apim.portal.portaluser.repository.PortalUserRepository; import com.eactive.apim.portal.qna.entity.Inquiry; +import com.eactive.apim.portal.qna.entity.InquiryComment; import com.eactive.apim.portal.user.entity.UserInfo; import com.eactive.eai.rms.common.base.BaseService; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquirySearch; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryService; import com.eactive.eai.rms.onl.apim.masking.MaskingUtils; @@ -22,14 +25,18 @@ import lombok.extern.slf4j.Slf4j; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; +import java.util.Optional; @Service @Transactional(transactionManager = "transactionManagerForEMS") @Slf4j public class PortalInquiryManService extends BaseService { private final PortalInquiryService portalInquiryService; + private final PortalInquiryCommentService portalInquiryCommentService; private final PortalInquiryUIMapper portalInquiryUIMapper; + private final PortalInquiryCommentUIMapper portalInquiryCommentUIMapper; private final UserInfoService userInfoService; + private final PortalUserRepository portalUserRepository; private final FileService fileService; public static final String PENDING = "PENDING"; @@ -37,12 +44,18 @@ public class PortalInquiryManService extends BaseService { public PortalInquiryManService(PortalInquiryService portalInquiryService, + PortalInquiryCommentService portalInquiryCommentService, PortalInquiryUIMapper portalInquiryUIMapper, + PortalInquiryCommentUIMapper portalInquiryCommentUIMapper, UserInfoService userInfoService, + PortalUserRepository portalUserRepository, FileService fileService){ this.portalInquiryService = portalInquiryService; + this.portalInquiryCommentService = portalInquiryCommentService; this.portalInquiryUIMapper = portalInquiryUIMapper; + this.portalInquiryCommentUIMapper = portalInquiryCommentUIMapper; this.userInfoService = userInfoService; + this.portalUserRepository = portalUserRepository; this.fileService = fileService; } @@ -161,5 +174,46 @@ public class PortalInquiryManService extends BaseService { List idList = Arrays.asList(ids.split(",")); portalInquiryService.deleteByIds(idList); } + + public List selectCommentList(String inquiryId) { + List comments = portalInquiryCommentService.findByInquiryId(inquiryId); + List result = portalInquiryCommentUIMapper.toVoList(comments); + result.forEach(ui -> ui.setWriterName(resolveWriterName(ui.getCreatedBy()))); + return result; + } + + private String resolveWriterName(String userId) { + if (StringUtils.isBlank(userId)) return ""; + // 직원(내부 사용자) 여부 먼저 확인 → 이름 그대로 반환 + Optional staff = userInfoService.findById(userId); + if (staff.isPresent()) { + return staff.get().getUsername(); + } + // 포털 회원이면 이름 마스킹 처리 (김수민 → 김수*) + Optional portalUser = portalUserRepository.findById(userId); + if (portalUser.isPresent()) { + return MaskingUtils.maskName(portalUser.get().getUserName()); + } + return userId; + } + + public void insertComment(PortalInquiryCommentUI commentUI, String userId) { + Inquiry inquiry = portalInquiryService.getById(commentUI.getInquiryId()); + + InquiryComment comment = new InquiryComment(); + comment.setInquiry(inquiry); + comment.setCommentDetail(commentUI.getCommentDetail()); + comment.setDelYn("N"); + int nextSeq = (int) portalInquiryCommentService.countByInquiryId(commentUI.getInquiryId()) + 1; + comment.setSeq(nextSeq); + + portalInquiryCommentService.save(comment); + } + + public void deleteComment(String commentId) { + InquiryComment comment = portalInquiryCommentService.getById(commentId); + comment.setDelYn("Y"); + portalInquiryCommentService.save(comment); + } } From 62ccebd773c3b33cb3b5abc2817514adeeee62df Mon Sep 17 00:00:00 2001 From: eastargh Date: Mon, 8 Jun 2026 17:19:04 +0900 Subject: [PATCH 08/12] =?UTF-8?q?Q&A=207=EC=9D=BC=ED=9B=84=20=EC=9E=90?= =?UTF-8?q?=EB=8F=99=20=EC=A2=85=EB=A3=8C=20=EB=B0=B0=EC=B9=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apim/portalinquiry/portalInquiryMan.jsp | 15 +++- .../portalinquiry/portalInquiryManDetail.jsp | 31 +++++++- .../InquiryCommentRepository.java | 15 ---- .../PortalInquiryCommentRepository.java | 28 +++++++ .../PortalInquiryCommentService.java | 10 ++- .../PortalInquiryRepository.java | 3 + .../portalinquiry/PortalInquiryService.java | 24 ++++-- .../ext/djb/job/PortalInquiryClosingJob.java | 73 +++++++++++++++++ .../PortalInquiryClosingService.java | 78 +++++++++++++++++++ .../portalInquiry/PortalInquiryCommentUI.java | 4 +- .../PortalInquiryManService.java | 15 +++- .../apim/portalInquiry/PortalInquiryUI.java | 2 + 12 files changed, 263 insertions(+), 35 deletions(-) delete mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java create mode 100644 src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java diff --git a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp index 37de99d..d2c25ca 100644 --- a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp +++ b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryMan.jsp @@ -20,15 +20,22 @@ var select_orgId = ""; function formatInquiryStatus(cellvalue, options, rowObject) { - return cellvalue === 'PENDING' - ? '문의중' - : '답변완료'; + if (cellvalue == 'PENDING') { + return '문의중'; + } else if (cellvalue == 'RESPONDED') { + return '답변완료' + } else if (cellvalue == 'CLOSED') { + return '답변종료' + } else { + return cellvalue; + } } function formatFile(cellvalue, options, rowObject) { var iconPath = '${pageContext.request.contextPath}/images/icon_file.png'; var icon = rowObject.hasAttachment ? 'File Attached' : ''; - return cellvalue + icon; + var commentCount = rowObject.commentCount > 0 ? ' [' + rowObject.commentCount + ']' : ''; + return cellvalue + icon + commentCount; } function deleteSelectedRows() { diff --git a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp index a302d4e..a6cd313 100644 --- a/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp +++ b/WebContent/jsp/onl/apim/portalinquiry/portalInquiryManDetail.jsp @@ -84,6 +84,7 @@ var url = ''; var url_view = ''; var file_download = ''; + var inquiryStatus = 'PENDING'; function decodeHTMLEntities(text) { var textArea = document.createElement('textarea'); @@ -98,10 +99,21 @@ dataType: "json", data: {cmd: 'DETAIL', id: key}, success: function (data) { + + $("#id").val(key); + $("#inquirySubject").text(data.inquirySubject); $("#inquiryDetail").html(data.inquiryDetail); - $("#inquiryStatus").text(data.inquiryStatus === 'PENDING' ? '문의중' : '답변완료'); + + inquiryStatus = data.inquiryStatus; + if (data.inquiryStatus == 'PENDING') { + $("#inquiryStatus").text('문의중'); + } else if (data.inquiryStatus == 'RESPONDED') { + $("#inquiryStatus").text('답변완료'); + } else if (data.inquiryStatus == 'CLOSED') { + $("#inquiryStatus").text('답변종료'); + } $("#inquirer").text(data.inquirer.userName); $("#createdDate").text(timeStampFormat(data.createdDate)); $("#responder").text(data.responderName || ''); @@ -158,6 +170,10 @@ } function deleteComment(commentId, inquiryId) { + if (inquiryStatus == 'CLOSED') { + alert('답변이 종료되어 삭제할 수 없습니다'); + return; + } if (!confirm("댓글을 삭제하시겠습니까?")) return; $.ajax({ type: "POST", @@ -188,6 +204,10 @@ } $("#btn_modify").click(function () { + if (inquiryStatus == 'CLOSED') { + alert('답변이 종료되어 수정할 수 없습니다'); + return; + } if (!checkRequired("ajaxForm")) return; if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return; @@ -209,7 +229,10 @@ }); $("#btn_comment").click(function () { - + if (inquiryStatus == 'CLOSED') { + alert('답변이 종료되어 댓글을 등록할 수 없습니다'); + return; + } if (!confirm("<%= localeMessage.getString("common.checkSave")%>")) return; $.ajax({ @@ -297,6 +320,10 @@
+
+
상태
+
+
답변자
diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java deleted file mode 100644 index caf0618..0000000 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/InquiryCommentRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; - -import com.eactive.apim.portal.qna.entity.InquiryComment; -import com.eactive.eai.data.jpa.BaseRepository; -import com.eactive.eai.rms.data.EMSDataSource; - -import java.util.List; - -@EMSDataSource -public interface InquiryCommentRepository extends BaseRepository { - - long countByInquiry_Id(String inquiryId); - - List findByInquiry_IdAndDelYnOrderBySeqAsc(String inquiryId, String delYn); -} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java new file mode 100644 index 0000000..6fc58f4 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentRepository.java @@ -0,0 +1,28 @@ +package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; + +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.data.jpa.BaseRepository; +import com.eactive.eai.rms.data.EMSDataSource; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +@EMSDataSource +public interface PortalInquiryCommentRepository extends BaseRepository { + + long countByInquiry_Id(String inquiryId); + + long countByInquiry_IdAndDelYn(String inquiryId, String delYn); + + List findByInquiry_IdAndDelYnOrderByCreatedDateAsc(String inquiryId, String delYn); + + Optional findTopByInquiry_IdAndDelYnOrderByCreatedDateDesc( + String inquiryId, String delYn); + + Optional findTopByInquiry_IdAndAdminYnAndDelYnOrderByCreatedDateDesc( + String inquiryId, String adminYn, String delYn); + + boolean existsByInquiry_IdAndAdminYnAndDelYnAndCreatedDateAfter( + String inquiryId, String adminYn, String delYn, LocalDateTime after); +} diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java index b13b422..0ccbb30 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryCommentService.java @@ -10,18 +10,22 @@ import java.util.List; @Service @Transactional(transactionManager = "transactionManagerForEMS") -public class PortalInquiryCommentService extends AbstractEMSDataSerivce { +public class PortalInquiryCommentService extends AbstractEMSDataSerivce { // AbstractEMSDataSerivce의 repository 필드가 BaseRepository로 고정되어 // 커스텀 메서드를 호출할 수 없으므로 별도 필드로 직접 주입 @Autowired - private InquiryCommentRepository inquiryCommentRepository; + private PortalInquiryCommentRepository inquiryCommentRepository; public long countByInquiryId(String inquiryId) { return inquiryCommentRepository.countByInquiry_Id(inquiryId); } + public long countActiveByInquiryId(String inquiryId) { + return inquiryCommentRepository.countByInquiry_IdAndDelYn(inquiryId, "N"); + } + public List findByInquiryId(String inquiryId) { - return inquiryCommentRepository.findByInquiry_IdAndDelYnOrderBySeqAsc(inquiryId, "N"); + return inquiryCommentRepository.findByInquiry_IdAndDelYnOrderByCreatedDateAsc(inquiryId, "N"); } } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java index 3dc9f19..9dd631a 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryRepository.java @@ -4,7 +4,10 @@ import com.eactive.apim.portal.qna.entity.Inquiry; import com.eactive.eai.data.jpa.BaseRepository; import com.eactive.eai.rms.data.EMSDataSource; +import java.util.List; + @EMSDataSource public interface PortalInquiryRepository extends BaseRepository { + List findByInquiryStatus(String inquiryStatus); } diff --git a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java index bb20d6c..a9456d9 100644 --- a/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java +++ b/src/main/java/com/eactive/eai/rms/data/entity/onl/apim/portalinquiry/PortalInquiryService.java @@ -1,20 +1,28 @@ package com.eactive.eai.rms.data.entity.onl.apim.portalinquiry; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + import com.eactive.apim.portal.qna.entity.Inquiry; import com.eactive.apim.portal.qna.entity.QInquiry; import com.eactive.eai.rms.data.jpa.AbstractEMSDataSerivce; import com.querydsl.core.BooleanBuilder; -import org.apache.commons.lang3.StringUtils; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.List; @Service @Transactional(transactionManager = "transactionManagerForEMS") public class PortalInquiryService extends AbstractEMSDataSerivce { + // AbstractEMSDataSerivce의 repository 필드가 BaseRepository로 고정되어 + // 커스텀 메서드를 호출할 수 없으므로 별도 필드로 직접 주입 + @Autowired + private PortalInquiryRepository portalInquiryRepository; + public Page findAll(Pageable pageable, PortalInquirySearch portalInquirySearch) { QInquiry qInquiry = QInquiry.inquiry; @@ -58,4 +66,8 @@ public class PortalInquiryService extends AbstractEMSDataSerivce findByInquiryStatus(String inquiryStatus) { + return portalInquiryRepository.findByInquiryStatus(inquiryStatus); + } } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java b/src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java new file mode 100644 index 0000000..2c976cd --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java @@ -0,0 +1,73 @@ +package com.eactive.eai.rms.ext.djb.job; + +import com.eactive.eai.rms.common.datasource.DataSourceContextHolder; +import com.eactive.eai.rms.common.datasource.DataSourceTypeManager; +import com.eactive.eai.rms.common.util.CommonUtil; +import com.eactive.eai.rms.onl.apim.portalInquiry.PortalInquiryClosingService; +import com.eactive.eai.rms.onl.common.util.DateUtil; +import org.quartz.DisallowConcurrentExecution; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 매일 00:05 실행 - RESPONDED 상태 문의글 자동 종료 배치 + * + *

종료 조건 (기본 7일):

+ *
    + *
  • 답변완료 후 댓글이 7일간 없는 경우
    • + *
  • 관리자 댓글 등록 후 7일간 포탈사용자 댓글이 없는 경우
    • + *
+ * + *

Cron: 0 5 0 * * ?

+ * + *

Job 파라미터 (JobDataMap):

+ *
    + *
  • {@value #KEY_INQUIRY_COMMENT_CLOSING_DAY}: 종료 기준 일수 (기본값: 7)
    • + *
+ */ +@DisallowConcurrentExecution +public class PortalInquiryClosingJob implements Job { + + private static final Logger log = LoggerFactory.getLogger(PortalInquiryClosingJob.class); + + /** Job 파라미터 키: 댓글종료 기간(일) */ + public static final String KEY_INQUIRY_COMMENT_CLOSING_DAY = "inquiry.comment.closing_day"; + + private static final int DEFAULT_CLOSING_DAYS = 7; + + @Autowired + private PortalInquiryClosingService inquiryCommentClosingService; + + @Override + public void execute(JobExecutionContext context) throws JobExecutionException { + log.info("*** START PortalInquiryCommentClosingService run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm")); + + int closingDays = DEFAULT_CLOSING_DAYS; + String closingDayParam = context.getMergedJobDataMap().getString(KEY_INQUIRY_COMMENT_CLOSING_DAY); + if (closingDayParam != null) { + try { + closingDays = Integer.parseInt(closingDayParam); + } catch (NumberFormatException e) { + log.warn("잘못된 {} 파라미터 값: '{}', 기본값 {}일 사용", KEY_INQUIRY_COMMENT_CLOSING_DAY, closingDayParam, DEFAULT_CLOSING_DAYS); + } + } + + DataSourceContextHolder.setDataSourceType( + DataSourceTypeManager.getDataSourceType(DataSourceTypeManager.APIGW)); + try { + int closedCount = inquiryCommentClosingService.closeExpiredInquiries(closingDays); + log.info("PortalInquiryCommentClosingService 완료: {}건 CLOSED 처리", closedCount); + } catch (Exception e) { + log.error("PortalInquiryCommentClosingService execution failed", e); + throw new JobExecutionException(e); + } finally { + DataSourceContextHolder.clearDataSourceType(); + } + + log.info("*** END PortalInquiryCommentClosingService run({})", DateUtil.getDateTime("yyyy-MM-dd HH:mm")); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java new file mode 100644 index 0000000..48b6dae --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryClosingService.java @@ -0,0 +1,78 @@ +package com.eactive.eai.rms.onl.apim.portalInquiry; + +import com.eactive.apim.portal.qna.entity.Inquiry; +import com.eactive.apim.portal.qna.entity.InquiryComment; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentRepository; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentService; +import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +/** + * RESPONDED 상태 문의글 중 아래 조건에 해당하는 경우 CLOSED로 변경한다. + * - 조건 A: 활성 댓글이 없고 답변완료일(responseDate)로부터 N일 경과 + * - 조건 B: 마지막 관리자 댓글(adminYn=Y) 이후 N일간 포탈사용자(adminYn=N) 댓글 없음 + */ +@Service +@Transactional(transactionManager = "transactionManagerForEMS") +@Slf4j +@RequiredArgsConstructor +public class PortalInquiryClosingService { + + private static final String RESPONDED = "RESPONDED"; + private static final String CLOSED = "CLOSED"; + + private final PortalInquiryService portalInquiryService; + private final PortalInquiryCommentService portalInquiryCommentService; + private final PortalInquiryCommentRepository inquiryCommentRepository; + + public int closeExpiredInquiries(int closingDays) { + LocalDateTime threshold = LocalDateTime.now().minusDays(closingDays); + List respondedInquiries = portalInquiryService.findByInquiryStatus(RESPONDED); + + int closedCount = 0; + for (Inquiry inquiry : respondedInquiries) { + if (shouldClose(inquiry, threshold)) { + inquiry.setInquiryStatus(CLOSED); + portalInquiryService.save(inquiry); + closedCount++; + log.info("문의글 CLOSED 처리: id={}", inquiry.getId()); + } + } + log.info("InquiryCommentClosingService: 총 {}건 CLOSED 처리 (기준={}일)", closedCount, closingDays); + return closedCount; + } + + private boolean shouldClose(Inquiry inquiry, LocalDateTime threshold) { + long activeCommentCount = portalInquiryCommentService.countActiveByInquiryId(inquiry.getId()); + + // 댓글 없음 → 답변완료일 기준 N일 경과 여부만 확인 + if (activeCommentCount == 0) { + LocalDateTime responseDate = inquiry.getResponseDate(); + return responseDate != null && !responseDate.isAfter(threshold); + } + + // 가장 최근 활성 댓글 확인 + Optional lastComment = inquiryCommentRepository + .findTopByInquiry_IdAndDelYnOrderByCreatedDateDesc(inquiry.getId(), "N"); + + if (!lastComment.isPresent()) { + return false; + } + + // 포탈사용자(adminYn != 'Y')가 마지막 댓글 작성자 → CLOSED 불가 + if (!"Y".equals(lastComment.get().getAdminYn())) { + return false; + } + + // 관리자가 마지막 댓글 작성자 → N일 경과 여부 확인 + LocalDateTime lastAdminDate = lastComment.get().getCreatedDate(); + return lastAdminDate != null && !lastAdminDate.isAfter(threshold); + } +} diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java index b5eddea..d609ca4 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryCommentUI.java @@ -20,9 +20,7 @@ public class PortalInquiryCommentUI { private String inquiryId; private String commentDetail; - - private int seq; - + private String delYn; private String createdBy; diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java index e9895ff..fff483c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryManService.java @@ -9,6 +9,7 @@ import com.eactive.apim.portal.qna.entity.Inquiry; import com.eactive.apim.portal.qna.entity.InquiryComment; import com.eactive.apim.portal.user.entity.UserInfo; import com.eactive.eai.rms.common.base.BaseService; +import com.eactive.eai.rms.common.exception.IntegrationException; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquiryCommentService; import com.eactive.eai.rms.data.entity.onl.apim.portalinquiry.PortalInquirySearch; @@ -41,6 +42,7 @@ public class PortalInquiryManService extends BaseService { public static final String PENDING = "PENDING"; public static final String RESPONDED = "RESPONDED"; + public static final String CLOSED = "CLOSED"; public PortalInquiryManService(PortalInquiryService portalInquiryService, @@ -68,6 +70,7 @@ public class PortalInquiryManService extends BaseService { if (ui.getInquirer() != null) { maskPortalInquiryUI(ui); } + ui.setCommentCount((int) portalInquiryCommentService.countActiveByInquiryId(inquiry.getId())); return setInquiryAttachmentStatus(ui); }); } @@ -154,6 +157,7 @@ public class PortalInquiryManService extends BaseService { UserInfo userinfo = userInfoService.getById(userId); Inquiry inquiry = portalInquiryService.getById(portalInquiryUI.getId()); + validateNotClosed(inquiry); // 답변 대기중 상태일 경우만 답변완료로 상태 변경 if(inquiry.getInquiryStatus().equals(PENDING)) { inquiry.setInquiryStatus(RESPONDED); @@ -199,21 +203,28 @@ public class PortalInquiryManService extends BaseService { public void insertComment(PortalInquiryCommentUI commentUI, String userId) { Inquiry inquiry = portalInquiryService.getById(commentUI.getInquiryId()); + validateNotClosed(inquiry); InquiryComment comment = new InquiryComment(); comment.setInquiry(inquiry); comment.setCommentDetail(commentUI.getCommentDetail()); comment.setDelYn("N"); - int nextSeq = (int) portalInquiryCommentService.countByInquiryId(commentUI.getInquiryId()) + 1; - comment.setSeq(nextSeq); + comment.setAdminYn("Y"); portalInquiryCommentService.save(comment); } public void deleteComment(String commentId) { InquiryComment comment = portalInquiryCommentService.getById(commentId); + validateNotClosed(comment.getInquiry()); comment.setDelYn("Y"); portalInquiryCommentService.save(comment); } + private void validateNotClosed(Inquiry inquiry) { + if (CLOSED.equals(inquiry.getInquiryStatus())) { + throw new IntegrationException("답변종료되어 수정할 수 없습니다."); + } + } + } diff --git a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java index fd48292..df3669c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java +++ b/src/main/java/com/eactive/eai/rms/onl/apim/portalInquiry/PortalInquiryUI.java @@ -55,4 +55,6 @@ public class PortalInquiryUI { private LocalDateTime lastModifiedDate; private String orgName; + + private int commentCount; } From 8109f91aa23d0831fd10286f2028f5d41acfcf16 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 09:51:05 +0900 Subject: [PATCH 09/12] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=ED=98=84=ED=99=A9=20=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inflow/inflowAdapterControlManDetail.jsp | 579 +++++++++++++---- .../inflow/inflowClientControlManDetail.jsp | 602 ++++++++++++++---- .../inflowInterfaceControlManDetail.jsp | 579 +++++++++++++---- .../InflowAdapterControlManController.java | 8 + .../InflowClientControlManController.java | 8 + .../inflow/InflowControlManService.java | 75 +++ .../InflowInterfaceControlManController.java | 8 + 7 files changed, 1464 insertions(+), 395 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp index 6aed70c..305470a 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp @@ -16,173 +16,486 @@ - - -
-
- -
-
-
- - - -<%-- " alt="" id="btn_delete" level="W" status="DETAIL"/> --%> -<%-- " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> --%> -<%-- " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> --%> -
-
<%= localeMessage.getString("infAdpConMan.title") %><%= localeMessage.getString("infAdpConMan.title") %>
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
<%= localeMessage.getString("infAdpConMan.adaNm") %>
<%= localeMessage.getString("infAdpConMan.adaDes") %>
<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>
<%= localeMessage.getString("infAdpConMan.thr") %>
<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %> -
-
<%= localeMessage.getString("infAdpConMan.useYn") %> -
-
-
- -
-
- - + +
+
+ +
+
+
+ + + +
+
+
<%= localeMessage.getString("infAdpConMan.title") %><%= localeMessage.getString("infAdpConMan.title") %>
+ +
+ + +
+ + +
+ + +
+
+ 기본 정보 + + + + + + + + + + + + + + + + + + + +
<%= localeMessage.getString("infAdpConMan.adaNm") %>
<%= localeMessage.getString("infAdpConMan.adaDes") %>
<%= localeMessage.getString("infAdpConMan.useYn") %> + +
+ + 유량제어 설정 + + + + + + + + + + + + + + + +
+ <%= localeMessage.getString("infAdpConMan.thrPerSecond") %> + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
+ + req/sec +
+
+ <%= localeMessage.getString("infAdpConMan.thr") %> + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
+ + + requests +
+
+
+
+ + +
+
+
+ 마지막 갱신: - + +
+ + + + +
+
+ hourglass_empty + 버킷 현황을 조회하려면 새로고침 버튼을 클릭하세요 +
+
+
+
+ +
+
+ + diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp index 2bac2cd..0846a98 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp @@ -16,170 +16,514 @@ - - -
-
- -
-
-
- - - -
-
클라이언트 유량제어 클라이언트 유량제어
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
클라이언트 ID
클라이언트명
<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>
<%= localeMessage.getString("infAdpConMan.thr") %>
<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %> -
-
<%= localeMessage.getString("infAdpConMan.useYn") %> -
-
-
- -
-
- - + +
+
+ +
+
+
+ + + +
+
+
클라이언트 유량제어클라이언트 유량제어
+ +
+ + +
+ + +
+ + +
+
+ 기본 정보 + + + + + + + + + + + + + + + + + + + +
클라이언트 ID
클라이언트명
<%= localeMessage.getString("infAdpConMan.useYn") %> + +
+ + 유량제어 설정 + + + + + + + + + + + + + + + +
+ <%= localeMessage.getString("infAdpConMan.thrPerSecond") %> + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
+ + req/sec +
+
+ <%= localeMessage.getString("infAdpConMan.thr") %> + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
+ + + requests +
+
+
+
+ + +
+
+
+ 마지막 갱신: - + +
+ + + + +
+
+ hourglass_empty + 버킷 현황을 조회하려면 새로고침 버튼을 클릭하세요 +
+
+
+
+ +
+
+ + diff --git a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp index 03a2aa6..62fa1d1 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp @@ -16,173 +16,486 @@ - - -
-
- -
-
-
- - - -<%-- " alt="" id="btn_delete" level="W" status="DETAIL"/> --%> -<%-- " alt="" id="btn_modify" level="W" status="DETAIL,NEW" /> --%> -<%-- " alt="" id="btn_previous" level="R" status="DETAIL,NEW"/> --%> -
-
<%= localeMessage.getString("infIfConMan.title") %><%= localeMessage.getString("infIfConMan.title") %>
- -
-
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - -
<%= localeMessage.getString("infIfConMan.ifNm") %>
<%= localeMessage.getString("infIfConMan.ifDesc") %>
<%= localeMessage.getString("infAdpConMan.thrPerSecond") %>
<%= localeMessage.getString("infAdpConMan.thr") %>
<%= localeMessage.getString("infAdpConMan.thrTimeUnit") %> -
-
<%= localeMessage.getString("infAdpConMan.useYn") %> -
-
-
- -
-
- - + +
+
+ +
+
+
+ + + +
+
+
<%= localeMessage.getString("infIfConMan.title") %><%= localeMessage.getString("infIfConMan.title") %>
+ +
+ + +
+ + +
+ + +
+
+ 기본 정보 + + + + + + + + + + + + + + + + + + + +
<%= localeMessage.getString("infIfConMan.ifNm") %>
<%= localeMessage.getString("infIfConMan.ifDesc") %>
<%= localeMessage.getString("infAdpConMan.useYn") %> + +
+ + 유량제어 설정 + + + + + + + + + + + + + + + +
+ <%= localeMessage.getString("infAdpConMan.thrPerSecond") %> + help_outline + 1초 단위의 순간 트래픽 제한입니다. 매 초마다 설정한 건수만큼 토큰이 리필되며, 초과 시 요청이 거부됩니다. + + +
+ + req/sec +
+
+ <%= localeMessage.getString("infAdpConMan.thr") %> + help_outline + 장시간 누적 트래픽 제한입니다. 시간단위를 선택하면 해당 주기마다 토큰이 리필됩니다. + + +
+ + + requests +
+
+
+
+ + +
+
+
+ 마지막 갱신: - + +
+ + + + +
+
+ hourglass_empty + 버킷 현황을 조회하려면 새로고침 버튼을 클릭하세요 +
+
+
+
+ +
+
+ + diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java index 37cbe36..ceba2e5 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java @@ -85,4 +85,12 @@ public class InflowAdapterControlManController extends OnlBaseAnnotationControll return new ModelAndView("jsonView", resultMap); } + @RequestMapping(value = "/onl/admin/inflow/inflowAdapterControlMan.json", params = "cmd=LIST_BUCKET_STATUS") + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { + List> statusList = service.getAdapterBucketStatus(); + Map resultMap = new HashMap<>(); + resultMap.put("servers", statusList); + return new ModelAndView("jsonView", resultMap); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java index a384d01..9f08629 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java @@ -83,4 +83,12 @@ public class InflowClientControlManController extends OnlBaseAnnotationControlle return new ModelAndView("jsonView", resultMap); } + @RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST_BUCKET_STATUS") + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { + List> statusList = service.getClientBucketStatus(); + Map resultMap = new HashMap<>(); + resultMap.put("servers", statusList); + return new ModelAndView("jsonView", resultMap); + } + } \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java index c5c6d19..7d55e59 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java @@ -1,12 +1,21 @@ package com.eactive.eai.rms.onl.manage.inflow.inflow; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.Optional; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; import com.eactive.eai.data.entity.onl.inflow.InflowControl; import com.eactive.eai.data.entity.onl.inflow.InflowControlId; @@ -14,10 +23,13 @@ import com.eactive.eai.rms.common.base.BaseService; import com.eactive.eai.rms.common.combo.ComboService; import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlService; import com.eactive.eai.rms.data.entity.onl.inflow.InflowControlServiceDto; +import com.eactive.eai.rms.onl.common.service.EaiServerInfoService; @Service public class InflowControlManService extends BaseService { + private static final Logger logger = LoggerFactory.getLogger(InflowControlManService.class); + private static final String ADAPTER_TYPE_INFLOW = "01"; private static final String INTERFACE_TYPE_INFLOW = "02"; private static final String CLIENT_TYPE_INFLOW = "03"; @@ -32,6 +44,11 @@ public class InflowControlManService extends BaseService { @Autowired private InflowControlManMapper mapper; + @Autowired + private EaiServerInfoService eaiServerInfoService; + + private RestTemplate restTemplate = new RestTemplate(); + // 어댑터 유량제어 public Page selectAdapterList(Pageable pageable, String searchName) { Page dtoList = service.findAllForAdapter(pageable, searchName); @@ -123,6 +140,64 @@ public class InflowControlManService extends BaseService { InflowControlId id = toId(CLIENT_TYPE_INFLOW, name); service.findById(id).ifPresent(service::delete); } + + @SuppressWarnings("unchecked") + public List> getClientBucketStatus() { + return getBucketStatus("client", "클라이언트가 로드되지 않음", "클라이언트 버킷 상태 조회 실패"); + } + + @SuppressWarnings("unchecked") + public List> getAdapterBucketStatus() { + return getBucketStatus("adapter", "어댑터가 로드되지 않음", "어댑터 버킷 상태 조회 실패"); + } + + @SuppressWarnings("unchecked") + public List> getInterfaceBucketStatus() { + return getBucketStatus("interface", "인터페이스가 로드되지 않음", "인터페이스 버킷 상태 조회 실패"); + } + + @SuppressWarnings("unchecked") + private List> getBucketStatus(String type, String noDataMessage, String logPrefix) { + List> result = new ArrayList<>(); + List> serverList = eaiServerInfoService.getEaiServerIpList(); + + for (Map server : serverList) { + String serverName = server.get("EAISVRINSTNM"); + String serverIp = server.get("EAISVRIP"); + String serverPort = server.get("WEBSERVERPORT"); + + if (StringUtils.isEmpty(serverPort)) { + serverPort = server.get("EAISVRLSNPORT"); + } + + Map serverStatus = new HashMap<>(); + serverStatus.put("serverName", serverName); + serverStatus.put("serverIp", serverIp); + serverStatus.put("serverPort", serverPort); + + try { + String url = String.format("http://%s:%s/manage/inflow/%s/bucket-status", + serverIp, serverPort, type); + ResponseEntity response = restTemplate.getForEntity(url, Map.class); + + if (response.getBody() != null && Boolean.TRUE.equals(response.getBody().get("success"))) { + serverStatus.put("status", "online"); + serverStatus.put("data", response.getBody().get("data")); + } else { + serverStatus.put("status", "no_data"); + serverStatus.put("message", noDataMessage); + } + } catch (Exception e) { + logger.warn("{} - server: {}, error: {}", logPrefix, serverName, e.getMessage()); + serverStatus.put("status", "offline"); + serverStatus.put("message", "서버 연결 실패"); + } + + result.add(serverStatus); + } + + return result; + } private InflowControlId toId(InflowControlManUI ui) { diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java index e2eef98..69cdcc4 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java @@ -83,4 +83,12 @@ public class InflowInterfaceControlManController extends OnlBaseAnnotationContro return new ModelAndView("jsonView", resultMap); } + @RequestMapping(value = "/onl/admin/inflow/inflowInterfaceControlMan.json", params = "cmd=LIST_BUCKET_STATUS") + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { + List> statusList = service.getInterfaceBucketStatus(); + Map resultMap = new HashMap<>(); + resultMap.put("servers", statusList); + return new ModelAndView("jsonView", resultMap); + } + } \ No newline at end of file From 06ad1230b2f0d22e58afacac747f5f2f3c7859c4 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 11:34:10 +0900 Subject: [PATCH 10/12] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inflow/inflowAdapterControlManDetail.jsp | 2 +- .../inflow/inflowClientControlManDetail.jsp | 2 +- .../inflow/inflowInterfaceControlManDetail.jsp | 2 +- .../InflowAdapterControlManController.java | 4 ++-- .../InflowClientControlManController.java | 4 ++-- .../inflow/inflow/InflowControlManService.java | 18 +++++++++--------- .../InflowInterfaceControlManController.java | 4 ++-- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp index 305470a..0a3b453 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowAdapterControlManDetail.jsp @@ -119,7 +119,7 @@ function loadBucketStatus() { $.ajax({ type: 'POST', url: url, - data: { cmd: 'LIST_BUCKET_STATUS' }, + data: { cmd: 'LIST_BUCKET_STATUS', adapterId: "${param.name}" }, dataType: 'json', success: function(result) { renderBucketStatus(result.servers || []); diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp index 0846a98..5dbe333 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp @@ -121,7 +121,7 @@ function loadBucketStatus() { $.ajax({ type: 'POST', url: url, - data: { cmd: 'LIST_BUCKET_STATUS' }, + data: { cmd: 'LIST_BUCKET_STATUS', clientId: "${param.name}" }, dataType: 'json', success: function(result) { renderBucketStatus(result.servers || []); diff --git a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp index 62fa1d1..511bc59 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowInterfaceControlManDetail.jsp @@ -119,7 +119,7 @@ function loadBucketStatus() { $.ajax({ type: 'POST', url: url, - data: { cmd: 'LIST_BUCKET_STATUS' }, + data: { cmd: 'LIST_BUCKET_STATUS', interfaceId: "${param.name}" }, dataType: 'json', success: function(result) { renderBucketStatus(result.servers || []); diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java index ceba2e5..01ea2b4 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowAdapterControlManController.java @@ -86,8 +86,8 @@ public class InflowAdapterControlManController extends OnlBaseAnnotationControll } @RequestMapping(value = "/onl/admin/inflow/inflowAdapterControlMan.json", params = "cmd=LIST_BUCKET_STATUS") - public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { - List> statusList = service.getAdapterBucketStatus(); + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response, String adapterId) { + List> statusList = service.getAdapterBucketStatus(adapterId); Map resultMap = new HashMap<>(); resultMap.put("servers", statusList); return new ModelAndView("jsonView", resultMap); diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java index 9f08629..897414d 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowClientControlManController.java @@ -84,8 +84,8 @@ public class InflowClientControlManController extends OnlBaseAnnotationControlle } @RequestMapping(value = "/onl/admin/inflow/inflowClientControlMan.json", params = "cmd=LIST_BUCKET_STATUS") - public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { - List> statusList = service.getClientBucketStatus(); + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response, String clientId) { + List> statusList = service.getClientBucketStatus(clientId); Map resultMap = new HashMap<>(); resultMap.put("servers", statusList); return new ModelAndView("jsonView", resultMap); diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java index 7d55e59..4638120 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowControlManService.java @@ -142,22 +142,22 @@ public class InflowControlManService extends BaseService { } @SuppressWarnings("unchecked") - public List> getClientBucketStatus() { - return getBucketStatus("client", "클라이언트가 로드되지 않음", "클라이언트 버킷 상태 조회 실패"); + public List> getClientBucketStatus(String clientId) { + return getBucketStatus("client", clientId, "클라이언트가 로드되지 않음", "클라이언트 버킷 상태 조회 실패"); } @SuppressWarnings("unchecked") - public List> getAdapterBucketStatus() { - return getBucketStatus("adapter", "어댑터가 로드되지 않음", "어댑터 버킷 상태 조회 실패"); + public List> getAdapterBucketStatus(String adapterId) { + return getBucketStatus("adapter", adapterId, "어댑터가 로드되지 않음", "어댑터 버킷 상태 조회 실패"); } @SuppressWarnings("unchecked") - public List> getInterfaceBucketStatus() { - return getBucketStatus("interface", "인터페이스가 로드되지 않음", "인터페이스 버킷 상태 조회 실패"); + public List> getInterfaceBucketStatus(String interfaceId) { + return getBucketStatus("interface", interfaceId, "인터페이스가 로드되지 않음", "인터페이스 버킷 상태 조회 실패"); } @SuppressWarnings("unchecked") - private List> getBucketStatus(String type, String noDataMessage, String logPrefix) { + private List> getBucketStatus(String target, String targetId, String noDataMessage, String logPrefix) { List> result = new ArrayList<>(); List> serverList = eaiServerInfoService.getEaiServerIpList(); @@ -176,8 +176,8 @@ public class InflowControlManService extends BaseService { serverStatus.put("serverPort", serverPort); try { - String url = String.format("http://%s:%s/manage/inflow/%s/bucket-status", - serverIp, serverPort, type); + String url = String.format("http://%s:%s/manage/inflow/%s/%s/bucket-status", + serverIp, serverPort, target, targetId); ResponseEntity response = restTemplate.getForEntity(url, Map.class); if (response.getBody() != null && Boolean.TRUE.equals(response.getBody().get("success"))) { diff --git a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java index 69cdcc4..a72d95c 100644 --- a/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java +++ b/src/main/java/com/eactive/eai/rms/onl/manage/inflow/inflow/InflowInterfaceControlManController.java @@ -84,8 +84,8 @@ public class InflowInterfaceControlManController extends OnlBaseAnnotationContro } @RequestMapping(value = "/onl/admin/inflow/inflowInterfaceControlMan.json", params = "cmd=LIST_BUCKET_STATUS") - public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response) { - List> statusList = service.getInterfaceBucketStatus(); + public ModelAndView getBucketStatus(HttpServletRequest request, HttpServletResponse response, String interfaceId) { + List> statusList = service.getInterfaceBucketStatus(interfaceId); Map resultMap = new HashMap<>(); resultMap.put("servers", statusList); return new ModelAndView("jsonView", resultMap); From c8caeeda8c3a7cee649f34163673ccd8eea30f8f Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 13:04:32 +0900 Subject: [PATCH 11/12] =?UTF-8?q?=EC=9C=A0=EB=9F=89=EC=A0=9C=EC=96=B4=20?= =?UTF-8?q?=EB=AA=A8=EB=8B=88=ED=84=B0=EB=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/inflow/inflowClientControlManDetail.jsp | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp index 5dbe333..db4bf9a 100644 --- a/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp +++ b/WebContent/jsp/onl/admin/inflow/inflowClientControlManDetail.jsp @@ -194,19 +194,6 @@ function renderBucketStatus(servers) { $('#summaryThresholdWrap').hide(); } - // 활성 API 정보 표시 - var activeApis = interfaceList.filter(function(item) { - return item.useYn === '1' || item.useYn === undefined; - }); - $('#summaryActiveApi').html(activeApis.length + '개'); - if (activeApis.length > 0) { - var apiIds = activeApis.map(function(item) { return item.interfaceId; }); - var displayText = apiIds.length <= 3 ? apiIds.join(', ') : apiIds.slice(0, 3).join(', ') + ' 외 ' + (apiIds.length - 3) + '개'; - $('#summaryActiveApiList').text(displayText); - } else { - $('#summaryActiveApiList').text(''); - } - $('#bucketSummary').show(); } else { $('#bucketSummary').hide(); From 1aa40f2c61cddfaede84f8a05be4b6593b70ef91 Mon Sep 17 00:00:00 2001 From: eastargh Date: Tue, 9 Jun 2026 15:39:05 +0900 Subject: [PATCH 12/12] =?UTF-8?q?UMS=EA=B4=80=EB=A0=A8=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apistatus/ApiStatusDetectionService.java | 41 +++++++++++++++++++ .../djb/apistatus/ApiStatusRepository.java | 7 ++-- .../ext/djb/apistatus/ApiStatusService.java | 5 +-- .../eai/rms/ext/djb/util/UmsManager.java | 5 ++- .../webhook/config/WebhookAsyncConfig.java | 26 ++++++++++++ 5 files changed, 76 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java create mode 100644 src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java new file mode 100644 index 0000000..f8687ef --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusDetectionService.java @@ -0,0 +1,41 @@ +package com.eactive.eai.rms.ext.djb.apistatus; + +import java.util.List; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +public class ApiStatusDetectionService { + + private static final Logger log = LoggerFactory.getLogger(ApiStatusDetectionService.class); + + /** + * 이벤트 감지 + * @param event "CONTROL_START" : 점검시작 + "CONTROL_END" : 점검종료 + "ERROR_START" : 장애시작 + "ERROR_END" : 장애종료 + "DELAY_START" : 지연시작 + "DELAY_END" : 지연종료 + * @param apiIds API IDs + */ + public void detect(String event, List apiIds) { + log.debug("이벤트 감지: {} {}", event, apiIds); + } + + // API FSM 내 아직 장애로 남아있는 API 목록 + public void remainDownApiIds() { + + } + + + // 정상 동작 - detect()에서 일괄 처리 (복구 = 점검종료, 장애종료, 지연종료) +// public void recovered(String event, String[] apiIds) { +// +// } + +} \ No newline at end of file diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java index ec80426..617077b 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java @@ -39,9 +39,10 @@ public interface ApiStatusRepository extends BaseRepository { + " FROM (" + " SELECT A.EAISVCNAME" + " , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE" - + " , NVL(( SELECT 'Y' FROM EMSAPP.PTL_NOTICE_API X " - + " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID " - + " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " + //TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것 + + " , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X " + + " WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)" + //+ " AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) " + " AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN " + " , (SELECT CASE WHEN TOTAL = 0 THEN 'X'" + " WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'" diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java index 885de37..9d7f215 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusService.java @@ -16,7 +16,6 @@ import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatus; import com.eactive.eai.rms.data.entity.onl.djb.apistatus.ApiStatusEvent; import com.eactive.eai.rms.ext.djb.util.UmsManager; -import com.eactive.ext.djb.apistatus.DjbIncidentDetectionService; @Service @@ -32,7 +31,7 @@ public class ApiStatusService { private UmsManager ums; @Autowired - private DjbIncidentDetectionService djbService; + private ApiStatusDetectionService apiStatusDectionService; public void updateApiStatus(HashMap param) { @@ -83,7 +82,7 @@ public class ApiStatusService { ums.sendWebhook(event, apiIds); //개발자포탈 API상태모니터링 화면을 위한 처리 - djbService.detect(event, apiIds); + apiStatusDectionService.detect(event, apiIds); } } diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java index a33ccbf..64d5111 100644 --- a/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java +++ b/src/main/java/com/eactive/eai/rms/ext/djb/util/UmsManager.java @@ -5,13 +5,13 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; import com.eactive.apim.portal.template.entity.MessageCode; import com.eactive.apim.portal.template.service.MessageHandlerService; import com.eactive.apim.portal.template.service.MessageRecipient; import com.eactive.apim.portal.user.entity.UserInfo; -import com.eactive.eai.rms.data.entity.man.role.Role; import com.eactive.eai.rms.data.entity.man.user.UserInfoService; import com.eactive.eai.rms.ext.djb.webhook.dto.WebhookSendRequest; import com.eactive.eai.rms.ext.djb.webhook.service.WebhookService; @@ -75,10 +75,11 @@ public class UmsManager { } /** - * event를 구독중인 제휴사에게 웹훅 발송 + * event를 구독중인 제휴사에게 웹훅 발송 (비동기) * @param event * @param apiIds */ + @Async("webhookExecutor") public void sendWebhook(String event, List apiIds) { List list = webhookService.findSendList(event, apiIds); for (WebhookSendRequest req : list) { diff --git a/src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java new file mode 100644 index 0000000..ec7fc83 --- /dev/null +++ b/src/main/java/com/eactive/eai/rms/ext/djb/webhook/config/WebhookAsyncConfig.java @@ -0,0 +1,26 @@ +package com.eactive.eai.rms.ext.djb.webhook.config; + +import java.util.concurrent.Executor; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; + +@Configuration +@EnableAsync +public class WebhookAsyncConfig { + + @Bean(name = "webhookExecutor") + public Executor webhookExecutor() { + ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor(); + executor.setCorePoolSize(2); + executor.setMaxPoolSize(10); + executor.setQueueCapacity(100); + executor.setThreadNamePrefix("webhook-"); + executor.setWaitForTasksToCompleteOnShutdown(true); + executor.setAwaitTerminationSeconds(30); + executor.initialize(); + return executor; + } +}