Compare commits
3 Commits
00dbcec1dc
...
cab3eb4ba1
| Author | SHA1 | Date | |
|---|---|---|---|
| cab3eb4ba1 | |||
| e6f2603a29 | |||
| 9ace29400f |
@@ -38,7 +38,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "com.kri.common:starter:beta.1.0.66"
|
||||
implementation "com.kri.common:starter:beta.1.1.02"
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.common.enums;
|
||||
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
|
||||
@@ -4,8 +4,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.core.type.TypeReference;
|
||||
import com.fasterxml.jackson.databind.JsonNode;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.common.http.ExternalApiClient;
|
||||
import com.kri.common.http.ExternalApiResponse;
|
||||
import com.kri.common.feature.http.ExternalApiClient;
|
||||
import com.kri.common.feature.http.ExternalApiResponse;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnErrorDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnItemDto;
|
||||
import com.kri.notihub.server.common.external.pringo.dto.PringoJsonReturnRequestDto;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.common.external.pringo.dto;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
@@ -44,4 +44,4 @@ public class PringoJsonReturnRequestDto {
|
||||
throw new IllegalArgumentException("return_key is required.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.common.util;
|
||||
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.template.TemplateBasicDto;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
@@ -168,4 +168,4 @@ public final class TemplateContentSanitizer {
|
||||
public record SanitizedTemplate(SendType type, String title, String body) {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
15
src/main/java/com/kri/notihub/server/config/JdbcConfig.java
Normal file
15
src/main/java/com/kri/notihub/server/config/JdbcConfig.java
Normal file
@@ -0,0 +1,15 @@
|
||||
package com.kri.notihub.server.config;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
@Configuration
|
||||
public class JdbcConfig {
|
||||
|
||||
@Bean
|
||||
public JdbcTemplate jdbcTemplate(DataSource dataSource) {
|
||||
return new JdbcTemplate(dataSource);
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.webmvc.page.PageRequestDto;
|
||||
import com.kri.common.webmvc.page.PageResponseDto;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.report.BulkSendInfoDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendResponseDto;
|
||||
import com.kri.notihub.server.dto.send.EmailPollQueueResponseDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.dto.send.BizppurioCursorResponseDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendResponseDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import com.kri.notihub.server.dto.send.BulkSendResponseDto;
|
||||
import com.kri.notihub.server.dto.send.SendRequestBulkDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.controller;
|
||||
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.template.TemplateBasicDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.dto.report;
|
||||
|
||||
import com.kri.common.excel.ExcelColumn;
|
||||
import com.kri.common.feature.excel.ExcelColumn;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.dto.send;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -38,4 +38,4 @@ public class EmailPollQueueItemDto {
|
||||
.triggerAt(DateTimeUtil.toKstLocalDateTime(Instant.ofEpochMilli(triggerAtEpochMs)))
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.dto.send;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.kri.common.datetime.LenientLocalDateTime;
|
||||
import com.kri.common.feature.datetime.LenientLocalDateTime;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.persistence.entity;
|
||||
|
||||
import com.kri.common.jpa.BaseUuidEntity;
|
||||
import com.kri.common.feature.jpa.BaseUuidEntity;
|
||||
import com.kri.notihub.server.dto.send.BulkSendCreateRequestDto;
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -45,6 +45,7 @@ public class TBulkSendEntity extends BaseUuidEntity {
|
||||
|
||||
@NotNull
|
||||
@Column(name = "is_resve", nullable = false)
|
||||
@Builder.Default
|
||||
private Boolean resve = false;
|
||||
|
||||
@NotNull
|
||||
@@ -118,4 +119,4 @@ public class TBulkSendEntity extends BaseUuidEntity {
|
||||
protected int idLength() {
|
||||
return 32; // cmid가 32면 생략해도 되지만 명시해두면 안전
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,6 +56,7 @@ public class TSendEntity {
|
||||
|
||||
@NotNull
|
||||
@Column(name = "is_resve", nullable = false)
|
||||
@Builder.Default
|
||||
private boolean resve = false;
|
||||
|
||||
@NotNull
|
||||
@@ -261,4 +262,4 @@ public class TSendEntity {
|
||||
.regDt(regDt)
|
||||
.build();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,6 +106,7 @@ public class TTmplatEntity {
|
||||
@NotNull
|
||||
@ColumnDefault("0")
|
||||
@Column(name = "is_del", nullable = false)
|
||||
@Builder.Default
|
||||
private Boolean del = false;
|
||||
|
||||
@Size(max = 32)
|
||||
@@ -156,4 +157,4 @@ public class TTmplatEntity {
|
||||
this.modUser = modUser;
|
||||
this.modDt = modDt;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
package com.kri.notihub.server.persistence.jdbc;
|
||||
|
||||
import com.kri.notihub.server.persistence.entity.BizMsgEntity;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Timestamp;
|
||||
import java.sql.Types;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@Component
|
||||
@RequiredArgsConstructor
|
||||
public class BizMsgBulkJdbcWriter {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
|
||||
private static final String INSERT_BIZ_MSG_SQL = """
|
||||
insert into `BIZ_MSG` (
|
||||
`CMID`,
|
||||
`UMID`,
|
||||
`MSG_TYPE`,
|
||||
`STATUS`,
|
||||
`CALL_STATUS`,
|
||||
`REQUEST_TIME`,
|
||||
`SEND_TIME`,
|
||||
`REPORT_TIME`,
|
||||
`DEST_PHONE`,
|
||||
`DEST_NAME`,
|
||||
`SEND_PHONE`,
|
||||
`SEND_NAME`,
|
||||
`SUBJECT`,
|
||||
`MSG_BODY`,
|
||||
`NATION_CODE`,
|
||||
`SENDER_KEY`,
|
||||
`TEMPLATE_CODE`,
|
||||
`RESPONSE_METHOD`,
|
||||
`TIMEOUT`,
|
||||
`RE_TYPE`,
|
||||
`RE_BODY`,
|
||||
`RE_PART`,
|
||||
`COVER_FLAG`,
|
||||
`SMS_FLAG`,
|
||||
`REPLY_FLAG`,
|
||||
`RETRY_CNT`,
|
||||
`ATTACHED_FILE`,
|
||||
`VXML_FILE`,
|
||||
`USE_PAGE`,
|
||||
`USE_TIME`,
|
||||
`SN_RESULT`,
|
||||
`TEL_INFO`,
|
||||
`CINFO`,
|
||||
`USER_KEY`,
|
||||
`AD_FLAG`
|
||||
) values (
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
||||
?, ?, ?, ?, ?
|
||||
)
|
||||
""";
|
||||
|
||||
public void bulkInsert(List<BizMsgEntity> entityList) {
|
||||
if (entityList == null || entityList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
jdbcTemplate.batchUpdate(INSERT_BIZ_MSG_SQL, new BatchPreparedStatementSetter() {
|
||||
@Override
|
||||
public void setValues(PreparedStatement ps, int index) throws SQLException {
|
||||
BizMsgEntity e = entityList.get(index);
|
||||
|
||||
int p = 1;
|
||||
ps.setString(p++, e.getCmid());
|
||||
setNullableString(ps, p++, e.getUmid());
|
||||
setNullableInteger(ps, p++, e.getMsgType());
|
||||
setNullableInteger(ps, p++, e.getStatus());
|
||||
setNullableString(ps, p++, e.getCallStatus());
|
||||
setNullableDateTime(ps, p++, e.getRequestTime());
|
||||
setNullableDateTime(ps, p++, e.getSendTime());
|
||||
setNullableDateTime(ps, p++, e.getReportTime());
|
||||
ps.setString(p++, e.getDestPhone());
|
||||
setNullableString(ps, p++, e.getDestName());
|
||||
ps.setString(p++, e.getSendPhone());
|
||||
setNullableString(ps, p++, e.getSendName());
|
||||
setNullableString(ps, p++, e.getSubject());
|
||||
ps.setString(p++, e.getMsgBody());
|
||||
setNullableString(ps, p++, e.getNationCode());
|
||||
setNullableString(ps, p++, e.getSenderKey());
|
||||
setNullableString(ps, p++, e.getTemplateCode());
|
||||
setNullableString(ps, p++, e.getResponseMethod());
|
||||
setNullableString(ps, p++, e.getTimeout());
|
||||
setNullableString(ps, p++, e.getReType());
|
||||
setNullableString(ps, p++, e.getReBody());
|
||||
setNullableString(ps, p++, e.getRePart());
|
||||
setNullableInteger(ps, p++, e.getCoverFlag());
|
||||
setNullableInteger(ps, p++, e.getSmsFlag());
|
||||
setNullableInteger(ps, p++, e.getReplyFlag());
|
||||
setNullableInteger(ps, p++, e.getRetryCnt());
|
||||
setNullableString(ps, p++, e.getAttachedFile());
|
||||
setNullableString(ps, p++, e.getVxmlFile());
|
||||
setNullableInteger(ps, p++, e.getUsePage());
|
||||
setNullableInteger(ps, p++, e.getUseTime());
|
||||
setNullableInteger(ps, p++, e.getSnResult());
|
||||
setNullableString(ps, p++, e.getTelInfo());
|
||||
setNullableString(ps, p++, e.getCinfo());
|
||||
setNullableString(ps, p++, e.getUserKey());
|
||||
setNullableString(ps, p++, e.getAdFalg());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBatchSize() {
|
||||
return entityList.size();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void setNullableString(PreparedStatement ps, int index, String value) throws SQLException {
|
||||
if (value == null) {
|
||||
ps.setNull(index, Types.VARCHAR);
|
||||
} else {
|
||||
ps.setString(index, value);
|
||||
}
|
||||
}
|
||||
|
||||
private void setNullableInteger(PreparedStatement ps, int index, Integer value) throws SQLException {
|
||||
if (value == null) {
|
||||
ps.setNull(index, Types.INTEGER);
|
||||
} else {
|
||||
ps.setInt(index, value);
|
||||
}
|
||||
}
|
||||
|
||||
private void setNullableDateTime(PreparedStatement ps, int index, LocalDateTime value) throws SQLException {
|
||||
if (value == null) {
|
||||
ps.setNull(index, Types.TIMESTAMP);
|
||||
} else {
|
||||
ps.setTimestamp(index, Timestamp.valueOf(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
package com.kri.notihub.server.persistence.jdbc;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Timestamp;
|
||||
import java.sql.Types;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
@Component
|
||||
public class SendBulkJdbcWriter {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private final ObjectMapper objectMapper;
|
||||
|
||||
private static final String INSERT_T_SEND_SQL = """
|
||||
insert into t_send (
|
||||
cmid,
|
||||
bulk_send_key,
|
||||
send_ty,
|
||||
is_resve,
|
||||
send_corp,
|
||||
send_status,
|
||||
result_code,
|
||||
itrnt_prjct_cd,
|
||||
reqst_svc,
|
||||
prjct_cd,
|
||||
tmplat_idx,
|
||||
sender_key,
|
||||
kko_tmplat_cd,
|
||||
nation_cd,
|
||||
atch_fl,
|
||||
send_eml,
|
||||
send_tel,
|
||||
send_nm,
|
||||
send_dt,
|
||||
sid,
|
||||
msg_title,
|
||||
msg_body,
|
||||
msg_param,
|
||||
dest_eml,
|
||||
dest_tel,
|
||||
dest_nm,
|
||||
report_dt,
|
||||
reg_cmpn,
|
||||
reg_user,
|
||||
reg_dt
|
||||
) values (
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?,
|
||||
?, ?, ?, ?, ?, ?, ?, ?, ?, ?
|
||||
)
|
||||
""";
|
||||
|
||||
public void bulkInsert(List<TSendEntity> entityList) {
|
||||
if (entityList == null || entityList.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
jdbcTemplate.batchUpdate(INSERT_T_SEND_SQL, new BatchPreparedStatementSetter() {
|
||||
@Override
|
||||
public void setValues(PreparedStatement ps, int index) throws SQLException {
|
||||
TSendEntity e = entityList.get(index);
|
||||
|
||||
int p = 1;
|
||||
ps.setString(p++, e.getCmid());
|
||||
setNullableString(ps, p++, e.getBulkSendKey());
|
||||
ps.setShort(p++, e.getSendTy());
|
||||
ps.setBoolean(p++, e.isResve());
|
||||
ps.setShort(p++, e.getSendCorp());
|
||||
ps.setShort(p++, e.getSendStatus());
|
||||
ps.setShort(p++, e.getResultCode());
|
||||
ps.setString(p++, e.getItrntPrjctCd());
|
||||
ps.setString(p++, e.getReqstSvc());
|
||||
ps.setString(p++, e.getPrjctCd());
|
||||
setNullableLong(ps, p++, e.getTmplatIdx());
|
||||
setNullableString(ps, p++, e.getSenderKey());
|
||||
setNullableString(ps, p++, e.getKkoTmplatCd());
|
||||
setNullableString(ps, p++, e.getNationCd());
|
||||
setNullableString(ps, p++, e.getAtchFl());
|
||||
setNullableString(ps, p++, e.getSendEml());
|
||||
setNullableString(ps, p++, e.getSendTel());
|
||||
setNullableString(ps, p++, e.getSendNm());
|
||||
setNullableDateTime(ps, p++, e.getSendDt());
|
||||
ps.setString(p++, e.getSid());
|
||||
setNullableString(ps, p++, e.getMsgTitle());
|
||||
ps.setString(p++, e.getMsgBody());
|
||||
ps.setString(p++, toJson(e.getMsgParam()));
|
||||
setNullableString(ps, p++, e.getDestEml());
|
||||
setNullableString(ps, p++, e.getDestTel());
|
||||
setNullableString(ps, p++, e.getDestNm());
|
||||
setNullableDateTime(ps, p++, e.getReportDt());
|
||||
ps.setString(p++, e.getRegCmpn());
|
||||
ps.setString(p++, e.getRegUser());
|
||||
setNullableDateTime(ps, p++, e.getRegDt());
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBatchSize() {
|
||||
return entityList.size();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private String toJson(Map<String, String> value) throws SQLException {
|
||||
try {
|
||||
return objectMapper.writeValueAsString(value != null ? value : Map.of());
|
||||
} catch (JsonProcessingException e) {
|
||||
throw new SQLException("msg_param JSON 직렬화 실패", e);
|
||||
}
|
||||
}
|
||||
|
||||
private void setNullableString(PreparedStatement ps, int index, String value) throws SQLException {
|
||||
if (value == null) {
|
||||
ps.setNull(index, Types.VARCHAR);
|
||||
} else {
|
||||
ps.setString(index, value);
|
||||
}
|
||||
}
|
||||
|
||||
private void setNullableLong(PreparedStatement ps, int index, Long value) throws SQLException {
|
||||
if (value == null) {
|
||||
ps.setNull(index, Types.BIGINT);
|
||||
} else {
|
||||
ps.setLong(index, value);
|
||||
}
|
||||
}
|
||||
|
||||
private void setNullableDateTime(PreparedStatement ps, int index, LocalDateTime value) throws SQLException {
|
||||
if (value == null) {
|
||||
ps.setNull(index, Types.TIMESTAMP);
|
||||
} else {
|
||||
ps.setTimestamp(index, Timestamp.valueOf(value));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.scheduler;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.scheduler;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.common.external.pringo.PringoApiClient;
|
||||
@@ -8,6 +8,7 @@ import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendRequestDt
|
||||
import com.kri.notihub.server.dto.send.DestInfoDto;
|
||||
import com.kri.notihub.server.dto.send.SendInternalResultDto;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
import com.kri.notihub.server.service.SendEmailService;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -23,7 +24,6 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
@RequiredArgsConstructor
|
||||
public class SendReservationEmailScheduler {
|
||||
|
||||
private final PringoApiClient pringoApiClient;
|
||||
private final SendEmailService sendEmlService;
|
||||
private final SendRepository sendRepository;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
@@ -8,6 +8,8 @@ import com.kri.notihub.server.dto.send.DestInfoDto;
|
||||
import com.kri.notihub.server.dto.send.SendInternalResultDto;
|
||||
import com.kri.notihub.server.persistence.entity.BizMsgEntity;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import com.kri.notihub.server.persistence.jdbc.BizMsgBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.BizMsgRepository;
|
||||
import com.kri.notihub.server.persistence.repository.BulkSendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
@@ -15,18 +17,22 @@ import com.kri.notihub.server.persistence.repository.TemplateRepository;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public abstract class AbstractBizppurioSendService extends SendService {
|
||||
public abstract class AbstractBizppurioSendService extends AbstractSendService {
|
||||
|
||||
private final BizMsgBulkJdbcWriter bizMsgBulkJdbcWriter;
|
||||
private final BizMsgRepository bizMsgRepository;
|
||||
|
||||
protected AbstractBizppurioSendService(
|
||||
SendBulkJdbcWriter sendBulkJdbcWriter,
|
||||
BizMsgBulkJdbcWriter bizMsgBulkJdbcWriter,
|
||||
TemplateRepository templateRepository,
|
||||
BulkSendRepository bulkSendRepository,
|
||||
BizMsgRepository bizMsgRepository,
|
||||
SendRepository sendRepository,
|
||||
TemplateService templateService
|
||||
) {
|
||||
super(templateRepository, bulkSendRepository, sendRepository, templateService);
|
||||
super(sendBulkJdbcWriter, templateRepository, bulkSendRepository, sendRepository, templateService);
|
||||
this.bizMsgBulkJdbcWriter = bizMsgBulkJdbcWriter;
|
||||
this.bizMsgRepository = bizMsgRepository;
|
||||
}
|
||||
|
||||
@@ -77,8 +83,9 @@ public abstract class AbstractBizppurioSendService extends SendService {
|
||||
}
|
||||
|
||||
if (!msgList.isEmpty()) {
|
||||
bizMsgRepository.saveAll(msgList);
|
||||
bizMsgRepository.flush();
|
||||
//bizMsgRepository.saveAll(msgList);
|
||||
//bizMsgRepository.flush();
|
||||
bizMsgBulkJdbcWriter.bulkInsert(msgList);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.util.NumericUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import com.kri.common.feature.util.NumericUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
@@ -13,6 +13,7 @@ import com.kri.notihub.server.common.external.pringo.dto.PringoJsonSendResponseD
|
||||
import com.kri.notihub.server.dto.send.DestInfoDto;
|
||||
import com.kri.notihub.server.dto.send.SendInternalResultDto;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.BulkSendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.TemplateRepository;
|
||||
@@ -25,12 +26,13 @@ import java.util.concurrent.ThreadLocalRandom;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
@Slf4j
|
||||
public abstract class AbstractPringoSendService extends SendService {
|
||||
public abstract class AbstractPringoSendService extends AbstractSendService {
|
||||
|
||||
private final PringoApiClient pringoApiClient;
|
||||
private final EmailResultPoller emailResultPoller;
|
||||
|
||||
protected AbstractPringoSendService(
|
||||
SendBulkJdbcWriter sendBulkJdbcWriter,
|
||||
TemplateRepository templateRepository,
|
||||
BulkSendRepository bulkSendRepository,
|
||||
SendRepository sendRepository,
|
||||
@@ -38,7 +40,7 @@ public abstract class AbstractPringoSendService extends SendService {
|
||||
PringoApiClient pringoApiClient,
|
||||
EmailResultPoller emailResultPoller
|
||||
) {
|
||||
super(templateRepository, bulkSendRepository, sendRepository, templateService);
|
||||
super(sendBulkJdbcWriter, templateRepository, bulkSendRepository, sendRepository, templateService);
|
||||
this.pringoApiClient = pringoApiClient;
|
||||
this.emailResultPoller = emailResultPoller;
|
||||
}
|
||||
|
||||
@@ -2,9 +2,8 @@ package com.kri.notihub.server.service;
|
||||
|
||||
import static org.apache.commons.lang3.StringUtils.firstNonBlank;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
@@ -18,6 +17,7 @@ import com.kri.notihub.server.dto.send.SendRequestSingleDto;
|
||||
import com.kri.notihub.server.dto.template.TemplateDto;
|
||||
import com.kri.notihub.server.persistence.entity.TBulkSendEntity;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.BulkSendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.TemplateRepository;
|
||||
@@ -31,8 +31,9 @@ import java.util.regex.Pattern;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@RequiredArgsConstructor
|
||||
public abstract class SendService {
|
||||
public abstract class AbstractSendService {
|
||||
|
||||
protected final SendBulkJdbcWriter sendBulkJdbcWriter;
|
||||
protected final TemplateRepository templateRepository;
|
||||
protected final BulkSendRepository bulkSendRepository;
|
||||
protected final SendRepository sendRepository;
|
||||
@@ -175,7 +176,7 @@ public abstract class SendService {
|
||||
)
|
||||
));
|
||||
|
||||
sendRepository.saveAll(sendInfo);
|
||||
sendRepository.save(sendInfo.get(0));
|
||||
sendRepository.flush();
|
||||
|
||||
afterPersistSendEntities(sendInfo);
|
||||
@@ -358,8 +359,9 @@ public abstract class SendService {
|
||||
for (int i = 0; i < size; i += NotihubConst.INSERT_CHUNK_SIZE) {
|
||||
int end = Math.min(size, i + NotihubConst.INSERT_CHUNK_SIZE);
|
||||
List<TSendEntity> sub = entityList.subList(i, end);
|
||||
sendRepository.saveAll(sub);
|
||||
sendRepository.flush();
|
||||
//sendRepository.saveAll(sub);
|
||||
//sendRepository.flush();
|
||||
sendBulkJdbcWriter.bulkInsert(sub);
|
||||
|
||||
afterPersistSendEntities(sub);
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.NumericUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.NumericUtil;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendStatusType;
|
||||
import com.kri.notihub.server.common.external.pringo.PringoApiClient;
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.file.FileUtil;
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.feature.file.FileUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.DirectoryStream;
|
||||
import java.nio.file.Files;
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.excel.ExcelMapper;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.webmvc.page.PageRequestDto;
|
||||
import com.kri.common.webmvc.page.PageResponseDto;
|
||||
import com.kri.common.webmvc.page.Pageables;
|
||||
import com.kri.common.feature.excel.ExcelMapper;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.common.feature.web.page.PageRequestDto;
|
||||
import com.kri.common.feature.web.page.PageResponseDto;
|
||||
import com.kri.common.feature.web.page.Pageables;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.dto.report.BulkSendInfoDto;
|
||||
|
||||
@@ -1,13 +1,11 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.common.external.pringo.PringoApiClient;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.BulkSendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.TemplateRepository;
|
||||
import java.util.List;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@@ -16,6 +14,7 @@ import org.springframework.stereotype.Service;
|
||||
public class SendEmailService extends AbstractPringoSendService {
|
||||
|
||||
public SendEmailService(
|
||||
SendBulkJdbcWriter sendBulkJdbcWriter,
|
||||
TemplateRepository templateRepository,
|
||||
BulkSendRepository bulkSendRepository,
|
||||
SendRepository sendRepository,
|
||||
@@ -23,7 +22,7 @@ public class SendEmailService extends AbstractPringoSendService {
|
||||
PringoApiClient pringoApiClient,
|
||||
EmailResultPoller emailResultPoller
|
||||
) {
|
||||
super(templateRepository, bulkSendRepository, sendRepository, templateService, pringoApiClient, emailResultPoller);
|
||||
super(sendBulkJdbcWriter, templateRepository, bulkSendRepository, sendRepository, templateService, pringoApiClient, emailResultPoller);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,6 +4,8 @@ import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import com.kri.notihub.server.persistence.jdbc.BizMsgBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.BizMsgRepository;
|
||||
import com.kri.notihub.server.persistence.repository.BulkSendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
@@ -15,14 +17,15 @@ import org.springframework.stereotype.Service;
|
||||
public class SendKkoAtService extends AbstractBizppurioSendService {
|
||||
|
||||
public SendKkoAtService(
|
||||
SendBulkJdbcWriter sendBulkJdbcWriter,
|
||||
BizMsgBulkJdbcWriter bizMsgBulkJdbcWriter,
|
||||
TemplateRepository templateRepository,
|
||||
BulkSendRepository bulkSendRepository,
|
||||
BizMsgRepository bizMsgRepository,
|
||||
SendRepository sendRepository,
|
||||
TemplateService templateService
|
||||
) {
|
||||
super(templateRepository, bulkSendRepository, bizMsgRepository, sendRepository,
|
||||
templateService);
|
||||
super(sendBulkJdbcWriter, bizMsgBulkJdbcWriter,templateRepository, bulkSendRepository, bizMsgRepository, sendRepository, templateService);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,6 +4,8 @@ import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
import com.kri.notihub.server.persistence.entity.TSendEntity;
|
||||
import com.kri.notihub.server.persistence.jdbc.BizMsgBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.jdbc.SendBulkJdbcWriter;
|
||||
import com.kri.notihub.server.persistence.repository.BizMsgRepository;
|
||||
import com.kri.notihub.server.persistence.repository.BulkSendRepository;
|
||||
import com.kri.notihub.server.persistence.repository.SendRepository;
|
||||
@@ -15,13 +17,15 @@ import org.springframework.stereotype.Service;
|
||||
public class SendSmsService extends AbstractBizppurioSendService {
|
||||
|
||||
public SendSmsService(
|
||||
SendBulkJdbcWriter sendBulkJdbcWriter,
|
||||
BizMsgBulkJdbcWriter bizMsgBulkJdbcWriter,
|
||||
TemplateRepository templateRepository,
|
||||
BulkSendRepository bulkSendRepository,
|
||||
BizMsgRepository bizMsgRepository,
|
||||
SendRepository sendRepository,
|
||||
TemplateService templateService
|
||||
) {
|
||||
super(templateRepository, bulkSendRepository, bizMsgRepository, sendRepository, templateService);
|
||||
super(sendBulkJdbcWriter, bizMsgBulkJdbcWriter,templateRepository, bulkSendRepository, bizMsgRepository, sendRepository, templateService);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.notihub.server.service;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.StringUtil;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.StringUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.notihub.server.common.consts.NotihubConst;
|
||||
import com.kri.notihub.server.common.enums.ChannelType;
|
||||
import com.kri.notihub.server.common.enums.SendType;
|
||||
|
||||
@@ -5,7 +5,7 @@ kri:
|
||||
spring:
|
||||
datasource:
|
||||
#private 도메인
|
||||
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: kri_notihub
|
||||
password: notihub#51304
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
@@ -8,7 +8,7 @@ kri:
|
||||
spring:
|
||||
datasource:
|
||||
#private 도메인
|
||||
url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/kri_notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: kri_notihub
|
||||
password: notihub#51304
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
|
||||
@@ -5,7 +5,7 @@ kri:
|
||||
spring:
|
||||
datasource:
|
||||
#private 도메인
|
||||
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/kri_notice_hub?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: kri_notihub
|
||||
password: notihub#51304
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
@@ -87,7 +87,6 @@ kri:
|
||||
temp-expire-hours: 24
|
||||
temp-cleanup-cron: "0 0 0 * * *" # 매일 00:00(초 분 시 일 월 요일)
|
||||
|
||||
common:
|
||||
web:
|
||||
enabled: true # 공통 Web 구성 사용 여부 (기본 true)
|
||||
webmvc:
|
||||
|
||||
Reference in New Issue
Block a user