From 6674c70ac6e0664421dc0e114a0135f51ee4ad69 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 26 Jun 2026 16:02:29 +0900 Subject: [PATCH] =?UTF-8?q?260626=5F02=5FENH:=20=EB=B0=9C=EC=86=A1=20?= =?UTF-8?q?=EC=B6=95=EC=95=BD=20=EA=B2=B0=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84,=20admin=EC=9A=A9=20api=20=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EA=B3=A0=20=EC=82=AC=EC=9A=A9=20=EA=B0=80=EB=8A=A5=ED=95=98?= =?UTF-8?q?=EA=B2=8C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../server/controller/ReportController.java | 10 ++ .../dto/report/ReportExcelResponseDto.java | 6 +- .../dto/report/SendResultSummaryDto.java | 35 ++++++ .../report/SendResultSummaryRequestDto.java | 38 +++++++ .../report/SendResultSummaryResponseDto.java | 24 ++++ .../repository/SendRepository.java | 34 +++++- .../repository/UnitPriceRepository.java | 10 ++ .../notihub/server/service/ReportService.java | 103 +++++++++++++++++- src/main/resources/application.yml | 4 +- 10 files changed, 256 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryDto.java create mode 100644 src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryRequestDto.java create mode 100644 src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryResponseDto.java create mode 100644 src/main/java/com/kri/notihub/server/persistence/repository/UnitPriceRepository.java diff --git a/build.gradle b/build.gradle index 826982d..bfb5acd 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.1.24" + implementation "com.kri.common:starter:beta.1.1.32" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/notihub/server/controller/ReportController.java b/src/main/java/com/kri/notihub/server/controller/ReportController.java index 299f24a..c679a0f 100644 --- a/src/main/java/com/kri/notihub/server/controller/ReportController.java +++ b/src/main/java/com/kri/notihub/server/controller/ReportController.java @@ -8,6 +8,8 @@ import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.report.BulkSendInfoDto; import com.kri.notihub.server.dto.report.ReportExcelResponseDto; import com.kri.notihub.server.dto.report.SendInfoDto; +import com.kri.notihub.server.dto.report.SendResultSummaryRequestDto; +import com.kri.notihub.server.dto.report.SendResultSummaryResponseDto; import com.kri.notihub.server.service.ReportService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -56,4 +58,12 @@ public class ReportController { public ReportExcelResponseDto getBulkSendDetailExcel(@PathVariable String bulkSendKey) { return reportService.getBulkSendDetailExcel(bulkSendKey); } + + @Operation(summary = "발송 결과 축약 조회") + @PostMapping("/send-result-summary") + public List getSendResultSummary( + @Valid @RequestBody SendResultSummaryRequestDto req + ) { + return reportService.getSendResultSummary(req); + } } diff --git a/src/main/java/com/kri/notihub/server/dto/report/ReportExcelResponseDto.java b/src/main/java/com/kri/notihub/server/dto/report/ReportExcelResponseDto.java index 337957e..7cc637b 100644 --- a/src/main/java/com/kri/notihub/server/dto/report/ReportExcelResponseDto.java +++ b/src/main/java/com/kri/notihub/server/dto/report/ReportExcelResponseDto.java @@ -11,8 +11,8 @@ import lombok.Setter; public class ReportExcelResponseDto { @Schema(description = "프론트가 저장용으로 쓸 파일명") - private String errorFileName; + private String fileName; - @Schema(description = "에러 엑셀 파일 (xlsx)의 Base64 문자열 (hasErrorFile == true일 때만 세팅)") - private String errorFileBase64; + @Schema(description = "엑셀 파일 (xlsx)의 Base64 문자열 (hasErrorFile == true일 때만 세팅)") + private String fileBase64; } diff --git a/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryDto.java b/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryDto.java new file mode 100644 index 0000000..9b3629c --- /dev/null +++ b/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryDto.java @@ -0,0 +1,35 @@ +package com.kri.notihub.server.dto.report; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "발송 축약 결과") +public class SendResultSummaryDto { + + @Schema(description = "발송 타입 코드") + private Short sendTy; + + @Schema(description = "발송 사") + private Short sendCorp; + + @Schema(description = "발송 성공 카운트") + private Long successCount; + + @Schema(description = "발송 실패 카운트") + private Long failCount; + + @Schema(description = "대기중 카운트") + private Long standByCount; + + @Schema(description = "전체 카운트") + private Long totalCount; +} diff --git a/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryRequestDto.java b/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryRequestDto.java new file mode 100644 index 0000000..693ffc4 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryRequestDto.java @@ -0,0 +1,38 @@ +package com.kri.notihub.server.dto.report; + + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "발송 축약 결과 요청") +public class SendResultSummaryRequestDto { + + @Schema(description = "대량발송 키") + private String bulkSendKey; + + @Schema(description = "인트라넷 프로젝트 코드") + private String itrntPrjctCd; + + @Schema(description = "요청 서비스") + private String reqstSvc; + + @Schema(description = "프로젝트 코드") + private String prjctCd; + + @Schema(description = "발송일시 조회 시작") + private LocalDateTime sendStartDt; + + @Schema(description = "발송일시 조회 종료") + private LocalDateTime sendEndDt; + +} diff --git a/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryResponseDto.java b/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryResponseDto.java new file mode 100644 index 0000000..932d468 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/dto/report/SendResultSummaryResponseDto.java @@ -0,0 +1,24 @@ +package com.kri.notihub.server.dto.report; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.math.BigDecimal; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "발송 축약 결과 응답") +public class SendResultSummaryResponseDto extends SendResultSummaryDto { + + @Schema(description = "발송 단가") + private BigDecimal price; + + @Schema(description = "발송 비용") + private BigDecimal cost; +} diff --git a/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java b/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java index 1128631..0b1e4eb 100644 --- a/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java +++ b/src/main/java/com/kri/notihub/server/persistence/repository/SendRepository.java @@ -1,6 +1,7 @@ package com.kri.notihub.server.persistence.repository; import com.kri.notihub.server.persistence.entity.TSendEntity; +import com.kri.notihub.server.dto.report.SendResultSummaryDto; import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -8,6 +9,7 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface SendRepository extends JpaRepository { @@ -64,4 +66,34 @@ public interface SendRepository extends JpaRepository { ); Page findByBulkSendKey(String bulkSendKey, Pageable pageable); -} \ No newline at end of file + + @Query(""" + select new com.kri.notihub.server.dto.report.SendResultSummaryDto( + s.sendTy, + s.sendCorp, + sum(case when src.resultCodeType = 1 then 1L else 0L end), + sum(case when src.resultCodeType = 0 then 1L else 0L end), + sum(case when src.resultCodeType = 9 then 1L else 0L end), + count(s) + ) + from TSendEntity s + join TSendResultCodeEntity src + on s.sendCorp = src.id.sendCorp + and s.resultCode = src.id.resultCode + where (:bulkSendKey is null or s.bulkSendKey = :bulkSendKey) + and (:itrntPrjctCd is null or s.itrntPrjctCd = :itrntPrjctCd) + and (:reqstSvc is null or s.reqstSvc = :reqstSvc) + and (:prjctCd is null or s.prjctCd = :prjctCd) + and (:sendStartDt is null or s.sendDt >= :sendStartDt) + and (:sendEndDt is null or s.sendDt <= :sendEndDt) + group by s.sendTy, s.sendCorp + """) + List findSendResultSummary( + @Param("bulkSendKey") String bulkSendKey, + @Param("itrntPrjctCd") String itrntPrjctCd, + @Param("reqstSvc") String reqstSvc, + @Param("prjctCd") String prjctCd, + @Param("sendStartDt") LocalDateTime sendStartDt, + @Param("sendEndDt") LocalDateTime sendEndDt + ); +} diff --git a/src/main/java/com/kri/notihub/server/persistence/repository/UnitPriceRepository.java b/src/main/java/com/kri/notihub/server/persistence/repository/UnitPriceRepository.java new file mode 100644 index 0000000..adf3a69 --- /dev/null +++ b/src/main/java/com/kri/notihub/server/persistence/repository/UnitPriceRepository.java @@ -0,0 +1,10 @@ +package com.kri.notihub.server.persistence.repository; + +import com.kri.notihub.server.persistence.entity.TUnitPriceEntity; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UnitPriceRepository extends JpaRepository { + + List findByUseTrue(); +} diff --git a/src/main/java/com/kri/notihub/server/service/ReportService.java b/src/main/java/com/kri/notihub/server/service/ReportService.java index b71a979..74d52a9 100644 --- a/src/main/java/com/kri/notihub/server/service/ReportService.java +++ b/src/main/java/com/kri/notihub/server/service/ReportService.java @@ -10,25 +10,37 @@ import com.kri.notihub.server.common.enums.SendType; import com.kri.notihub.server.dto.report.BulkSendInfoDto; import com.kri.notihub.server.dto.report.ReportExcelResponseDto; import com.kri.notihub.server.dto.report.SendInfoDto; +import com.kri.notihub.server.dto.report.SendResultSummaryDto; +import com.kri.notihub.server.dto.report.SendResultSummaryRequestDto; +import com.kri.notihub.server.dto.report.SendResultSummaryResponseDto; import com.kri.notihub.server.persistence.entity.TBulkSendEntity; import com.kri.notihub.server.persistence.entity.TSendEntity; import com.kri.notihub.server.persistence.entity.TSendResultCodeEntity; +import com.kri.notihub.server.persistence.entity.TUnitPriceEntity; import com.kri.notihub.server.persistence.repository.BulkSendRepository; import com.kri.notihub.server.persistence.repository.SendRepository; import com.kri.notihub.server.persistence.repository.SendResultCodeRepository; +import com.kri.notihub.server.persistence.repository.UnitPriceRepository; import java.io.ByteArrayOutputStream; import java.io.OutputStream; +import java.math.BigDecimal; import java.nio.charset.StandardCharsets; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.Base64; +import java.util.Comparator; import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; @Service @RequiredArgsConstructor @@ -37,6 +49,7 @@ public class ReportService { private final SendResultCodeRepository sendResultCodeRepository; private final BulkSendRepository bulkSendRepository; private final SendRepository sendRepository; + private final UnitPriceRepository unitPriceRepository; public List getBulkSendList(SendType sendTy, String reqstSvc, String prjctCd, String regCmpn) { @@ -120,8 +133,94 @@ public class ReportService { String base64 = new String(bos.toByteArray(), StandardCharsets.UTF_8); return ReportExcelResponseDto.builder() - .errorFileName(fileName) - .errorFileBase64(base64) + .fileName(fileName) + .fileBase64(base64) .build(); } + + public List getSendResultSummary( + SendResultSummaryRequestDto req) { + SendResultSummaryRequestDto condition = req != null ? req : new SendResultSummaryRequestDto(); + + List summaries = sendRepository.findSendResultSummary( + normalize(condition.getBulkSendKey()), + normalize(condition.getItrntPrjctCd()), + normalize(condition.getReqstSvc()), + normalize(condition.getPrjctCd()), + condition.getSendStartDt(), + condition.getSendEndDt() + ); + + Map unitPriceMap = unitPriceRepository.findByUseTrue() + .stream() + .collect(Collectors.toMap( + price -> new SendPriceKey(price.getSendTy(), price.getSendCorp()), + Function.identity(), + (left, right) -> left + )); + + Map summaryMap = summaries.stream() + .collect(Collectors.toMap( + summary -> new SendPriceKey(summary.getSendTy(), summary.getSendCorp()), + Function.identity(), + this::mergeSummary + )); + + return Stream.concat(unitPriceMap.keySet().stream(), summaryMap.keySet().stream()) + .collect(Collectors.toSet()) + .stream() + .sorted(Comparator + .comparing(SendPriceKey::sendTy, Comparator.nullsLast(Comparator.naturalOrder())) + .thenComparing(SendPriceKey::sendCorp, Comparator.nullsLast(Comparator.naturalOrder()))) + .map(key -> toSendResultSummaryResponse(key, summaryMap.get(key), unitPriceMap.get(key))) + .toList(); + } + + private SendResultSummaryResponseDto toSendResultSummaryResponse( + SendPriceKey key, + SendResultSummaryDto summary, + TUnitPriceEntity unitPrice + ) { + BigDecimal price = unitPrice != null + ? BigDecimal.valueOf(unitPrice.getPrice()) + : BigDecimal.ZERO; + Long successCount = summary != null ? summary.getSuccessCount() : 0L; + Long failCount = summary != null ? summary.getFailCount() : 0L; + Long standByCount = summary != null ? summary.getStandByCount() : 0L; + Long totalCount = summary != null ? summary.getTotalCount() : 0L; + BigDecimal cost = price.multiply(BigDecimal.valueOf(nullToZero(successCount))); + + return SendResultSummaryResponseDto.builder() + .sendTy(key.sendTy()) + .sendCorp(key.sendCorp()) + .successCount(successCount) + .failCount(failCount) + .standByCount(standByCount) + .totalCount(totalCount) + .price(price) + .cost(cost) + .build(); + } + + private SendResultSummaryDto mergeSummary(SendResultSummaryDto left, SendResultSummaryDto right) { + return SendResultSummaryDto.builder() + .sendTy(left.getSendTy()) + .sendCorp(left.getSendCorp()) + .successCount(nullToZero(left.getSuccessCount()) + nullToZero(right.getSuccessCount())) + .failCount(nullToZero(left.getFailCount()) + nullToZero(right.getFailCount())) + .standByCount(nullToZero(left.getStandByCount()) + nullToZero(right.getStandByCount())) + .totalCount(nullToZero(left.getTotalCount()) + nullToZero(right.getTotalCount())) + .build(); + } + + private String normalize(String value) { + return StringUtils.hasText(value) ? value : null; + } + + private long nullToZero(Long value) { + return value != null ? value : 0L; + } + + private record SendPriceKey(Short sendTy, Short sendCorp) { + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 39259da..4c0e551 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -55,8 +55,6 @@ kri: # 내부 운영용(원하면) admin-api-enabled: true admin-allow-ips: - - 127.0.0.1/32 - - 0:0:0:0:0:0:0:1 - 211.254.145.130 security: @@ -66,8 +64,8 @@ kri: - /swagger-ui.html - /swagger-ui/** - /ping - - /body-image/** - /internal/apikey/** + - /body-image/** swagger: enabled: true