From 1e4790f7013fb09de81f93864b6e700ddad822ac Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 27 Feb 2026 15:06:48 +0900 Subject: [PATCH 01/14] =?UTF-8?q?260227=5F01=5FENH:=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=EB=90=98=EB=8A=94=20cache=20clear=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kri/lge/penetration/controller/CacheAdminController.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java index 01ed9f8..837906b 100644 --- a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java +++ b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java @@ -25,7 +25,6 @@ public class CacheAdminController { private final YearCache yearCache; private final VariableCache variableCache; - private final StatisticsDbCache statisticsDbCache; private final AuthService authService; @Operation(summary = "가용 연도 리스트 캐시 조회") @@ -45,7 +44,6 @@ public class CacheAdminController { throw BusinessException.unauthorized("IS_NOT_ADMIN", "권한이 없습니다."); } - statisticsDbCache.clearStatisticsCache(); return yearCache.reload(); } @@ -56,7 +54,6 @@ public class CacheAdminController { throw BusinessException.unauthorized("IS_NOT_ADMIN", "권한이 없습니다."); } - statisticsDbCache.clearStatisticsCache(); return variableCache.reload(); } } From 23ebd7865c9fa0aa6b23ed64b0778cb3f0ed1f84 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 27 Feb 2026 15:30:41 +0900 Subject: [PATCH 02/14] =?UTF-8?q?260227=5F02=5FENH:=20=20reload=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kri/lge/penetration/dto/VariableItemInfoDto.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java b/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java index 48fee0f..cdc9ba5 100644 --- a/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java +++ b/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java @@ -1,6 +1,7 @@ package com.kri.lge.penetration.dto; import io.swagger.v3.oas.annotations.media.Schema; +import java.io.Serializable; import java.util.List; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,7 +13,10 @@ import lombok.Setter; @Builder @AllArgsConstructor @Schema(description = "변수 보기 정보 Dto") -public class VariableItemInfoDto { +public class VariableItemInfoDto implements Serializable { + + @Builder.Default + private static final long serialVersionUID = 1L; private Integer order; From ad1c445f5b94e3e2dcf943c9b95ea8e904682bce Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 5 Mar 2026 12:08:29 +0900 Subject: [PATCH 03/14] =?UTF-8?q?260305=5F01=5FENH:=20=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=20=EB=B0=B0=EC=B9=98=20count=20=EC=83=81=EC=88=98=EB=AA=85=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lge/penetration/common/consts/LgePenetrationConst.java | 2 +- .../java/com/kri/lge/penetration/service/UploadService.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/kri/lge/penetration/common/consts/LgePenetrationConst.java b/src/main/java/com/kri/lge/penetration/common/consts/LgePenetrationConst.java index 6e6f655..f35c28c 100644 --- a/src/main/java/com/kri/lge/penetration/common/consts/LgePenetrationConst.java +++ b/src/main/java/com/kri/lge/penetration/common/consts/LgePenetrationConst.java @@ -2,7 +2,7 @@ package com.kri.lge.penetration.common.consts; public final class LgePenetrationConst { - public static final int BATCH_SIZE = 1000; + public static final int INSERT_CHUNK_SIZE = 1000; public static final int ADMIN_ROLE = 9999; public static final String EXCEL_ID = "ID"; diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java index 09b98fa..6a5cb3b 100644 --- a/src/main/java/com/kri/lge/penetration/service/UploadService.java +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.service; -import static com.kri.lge.penetration.common.consts.LgePenetrationConst.BATCH_SIZE; +import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_CHUNK_SIZE; import static com.kri.lge.penetration.common.consts.LgePenetrationConst.EXCEL_ID; import com.fasterxml.jackson.core.JsonProcessingException; @@ -42,7 +42,7 @@ public class UploadService { public ExcelUploadResultDto uploadData(MultipartFile file){ try (InputStream in = file.getInputStream()) { - List buffer = new ArrayList<>(BATCH_SIZE); + List buffer = new ArrayList<>(INSERT_CHUNK_SIZE); List> failRows = new ArrayList<>(); AtomicInteger total = new AtomicInteger(); @@ -64,7 +64,7 @@ public class UploadService { buffer.add(new RowContext(rowIndex, row, parsed.entity)); - if (buffer.size() >= BATCH_SIZE) { + if (buffer.size() >= INSERT_CHUNK_SIZE) { flushBuffer(buffer, success, fail, failRows); } }); From a30f7d09d45b4a2952db05051a8d863de365ae9f Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 11 Mar 2026 16:22:24 +0900 Subject: [PATCH 04/14] =?UTF-8?q?260311=5F01=5FENH:=20JDBC=20Template=20?= =?UTF-8?q?=EA=B8=B0=EB=B0=98=20Bulk=20Insert=EB=A1=9C=20=EA=B5=90?= =?UTF-8?q?=EC=B2=B4=20=EB=B0=8F=20=EB=94=94=EC=8A=A4=ED=81=AC=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=20=EC=97=91=EC=85=80=20=EC=8A=A4=ED=8A=B8=EB=A6=BC=20?= =?UTF-8?q?=EB=A6=AC=EB=8D=94=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../LgePenetrationBackApplication.java | 2 + .../config/FileStorageProperties.java | 12 ++ .../lge/penetration/config/JdbcConfig.java | 15 ++ .../persistence/jdbc/DataJdbcRepository.java | 178 +++++++++++++++++ .../penetration/service/UploadService.java | 186 ++++++++---------- .../service/file/AbstractFileService.java | 131 ++++++++++++ .../service/file/DataFileService.java | 36 ++++ src/main/resources/application-local.yml | 2 +- src/main/resources/application.yml | 3 + 10 files changed, 466 insertions(+), 101 deletions(-) create mode 100644 src/main/java/com/kri/lge/penetration/config/FileStorageProperties.java create mode 100644 src/main/java/com/kri/lge/penetration/config/JdbcConfig.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/jdbc/DataJdbcRepository.java create mode 100644 src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java create mode 100644 src/main/java/com/kri/lge/penetration/service/file/DataFileService.java diff --git a/build.gradle b/build.gradle index 3fe041b..2d6b697 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.66" + implementation "com.kri.common:starter:beta.1.0.69" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java b/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java index dc3e18b..9f5de98 100644 --- a/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java +++ b/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java @@ -4,11 +4,13 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.properties.ConfigurationPropertiesScan; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @Slf4j @SpringBootApplication +@ConfigurationPropertiesScan public class LgePenetrationBackApplication { public static void main(String[] args) { diff --git a/src/main/java/com/kri/lge/penetration/config/FileStorageProperties.java b/src/main/java/com/kri/lge/penetration/config/FileStorageProperties.java new file mode 100644 index 0000000..6647251 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/config/FileStorageProperties.java @@ -0,0 +1,12 @@ +package com.kri.lge.penetration.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; + +@Getter +@Setter +@ConfigurationProperties(prefix = "kri.file") +public class FileStorageProperties { + private String dataBaseDir; +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/config/JdbcConfig.java b/src/main/java/com/kri/lge/penetration/config/JdbcConfig.java new file mode 100644 index 0000000..a679e48 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/config/JdbcConfig.java @@ -0,0 +1,15 @@ +package com.kri.lge.penetration.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); + } +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/jdbc/DataJdbcRepository.java b/src/main/java/com/kri/lge/penetration/persistence/jdbc/DataJdbcRepository.java new file mode 100644 index 0000000..bfb5019 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/jdbc/DataJdbcRepository.java @@ -0,0 +1,178 @@ +package com.kri.lge.penetration.persistence.jdbc; + +import java.sql.BatchUpdateException; +import java.sql.PreparedStatement; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.BatchPreparedStatementSetter; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class DataJdbcRepository { + + private final JdbcTemplate jdbcTemplate; + private static final String INSERT_SQL = """ + insert into t_data ( + data_idx, + sid, + raw_data, + reg_user, + reg_dt + ) values (?, ?, ?, ?, ?) + """; + + public record TDataInsertRow( + String dataIdx, + String sid, + String rawDataJson, + String regUser, + LocalDateTime regDt + ) { + } + + public record TDataInsertFailure( + int index, + String reason + ) { + } + + public record TDataBatchInsertResult( + List successIndexes, + List failures + ) { + public int successCount() { + return successIndexes == null ? 0 : successIndexes.size(); + } + + public int failCount() { + return failures == null ? 0 : failures.size(); + } + } + + public TDataBatchInsertResult bulkInsert(List rows) { + if (rows == null || rows.isEmpty()) { + return new TDataBatchInsertResult(List.of(), List.of()); + } + + try { + jdbcTemplate.batchUpdate(INSERT_SQL, new BatchPreparedStatementSetter() { + @Override + public void setValues(PreparedStatement ps, int i) throws SQLException { + TDataInsertRow row = rows.get(i); + ps.setString(1, row.dataIdx()); + ps.setString(2, row.sid()); + ps.setString(3, row.rawDataJson()); + ps.setString(4, row.regUser()); + ps.setTimestamp(5, Timestamp.valueOf(row.regDt())); + } + + @Override + public int getBatchSize() { + return rows.size(); + } + }); + + List successIndexes = new ArrayList<>(rows.size()); + for (int i = 0; i < rows.size(); i++) { + successIndexes.add(i); + } + return new TDataBatchInsertResult(successIndexes, List.of()); + + } catch (DataAccessException e) { + return handleBatchFailure(rows, e); + } + } + + private TDataBatchInsertResult handleBatchFailure(List rows, DataAccessException e) { + BatchUpdateException batchEx = findBatchUpdateException(e); + + List successIndexes = new ArrayList<>(); + List failures = new ArrayList<>(); + + if (batchEx == null) { + for (int i = 0; i < rows.size(); i++) { + retryOne(rows.get(i), i, successIndexes, failures); + } + return new TDataBatchInsertResult(successIndexes, failures); + } + + int[] counts = batchEx.getUpdateCounts(); + boolean[] needsRetry = new boolean[rows.size()]; + for (int i = 0; i < rows.size(); i++) { + needsRetry[i] = true; + } + + if (counts != null) { + int limit = Math.min(counts.length, rows.size()); + for (int i = 0; i < limit; i++) { + int c = counts[i]; + if (isBatchSuccess(c)) { + successIndexes.add(i); + needsRetry[i] = false; + } else if (c == Statement.EXECUTE_FAILED) { + needsRetry[i] = true; + } + } + } + + for (int i = 0; i < rows.size(); i++) { + if (needsRetry[i]) { + retryOne(rows.get(i), i, successIndexes, failures); + } + } + + return new TDataBatchInsertResult(successIndexes, failures); + } + + private void retryOne( + TDataInsertRow row, + int index, + List successIndexes, + List failures + ) { + try { + jdbcTemplate.update( + INSERT_SQL, + row.dataIdx(), + row.sid(), + row.rawDataJson(), + row.regUser(), + Timestamp.valueOf(row.regDt()) + ); + successIndexes.add(index); + } catch (DataAccessException ex) { + failures.add(new TDataInsertFailure(index, rootMessage(ex))); + } + } + + private static BatchUpdateException findBatchUpdateException(Throwable t) { + Throwable cur = t; + while (cur != null) { + if (cur instanceof BatchUpdateException bue) { + return bue; + } + cur = cur.getCause(); + } + return null; + } + + private static boolean isBatchSuccess(int count) { + return count >= 0 || count == Statement.SUCCESS_NO_INFO; + } + + private static String rootMessage(Throwable t) { + Throwable cur = t; + while (cur.getCause() != null) { + cur = cur.getCause(); + } + return cur.getMessage(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java index 6a5cb3b..b96e8e2 100644 --- a/src/main/java/com/kri/lge/penetration/service/UploadService.java +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -1,33 +1,33 @@ package com.kri.lge.penetration.service; -import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_CHUNK_SIZE; import static com.kri.lge.penetration.common.consts.LgePenetrationConst.EXCEL_ID; +import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_CHUNK_SIZE; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.kri.common.datetime.DateTimeUtil; import com.kri.common.excel.ExcelMapper; -import com.kri.common.web.BusinessException; import com.kri.lge.penetration.dto.DataItemDto; import com.kri.lge.penetration.dto.ExcelUploadResultDto; -import com.kri.lge.penetration.persistence.entity.TDataEntity; -import com.kri.lge.penetration.persistence.repository.DataRepository; -import jakarta.persistence.EntityManager; -import jakarta.persistence.PersistenceContext; +import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository; +import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository.TDataBatchInsertResult; +import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository.TDataInsertFailure; +import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository.TDataInsertRow; +import com.kri.lge.penetration.service.file.DataFileService; import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; +import java.nio.file.Path; import java.time.LocalDateTime; import java.util.ArrayList; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import java.util.concurrent.atomic.AtomicInteger; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.apache.poi.ss.usermodel.Workbook; -import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @Log4j2 @@ -35,58 +35,51 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class UploadService { - @PersistenceContext - private EntityManager em; + private final DataFileService dataFileService; private final ObjectMapper objectMapper; - private final DataRepository dataRepository; + private final DataJdbcRepository tDataJdbcRepository; - public ExcelUploadResultDto uploadData(MultipartFile file){ - try (InputStream in = file.getInputStream()) { - List buffer = new ArrayList<>(INSERT_CHUNK_SIZE); - List> failRows = new ArrayList<>(); + @Transactional + public ExcelUploadResultDto uploadData(MultipartFile file) { + Path dataFilePath = dataFileService.saveListFile(file); - AtomicInteger total = new AtomicInteger(); - AtomicInteger success = new AtomicInteger(); - AtomicInteger fail = new AtomicInteger(); + List buffer = new ArrayList<>(INSERT_CHUNK_SIZE); + List> failRows = new ArrayList<>(); - final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - final String regUser = "system"; + AtomicInteger total = new AtomicInteger(); + AtomicInteger success = new AtomicInteger(); + AtomicInteger fail = new AtomicInteger(); - ExcelMapper.readStreaming(in, (row, rowIndex) -> { - total.incrementAndGet(); + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + final String regUser = "system"; - ParsedRow parsed = parseRowToEntity(row, regUser, now); - if (parsed.reason != null) { - fail.incrementAndGet(); - failRows.add(buildFailRow(row, rowIndex, parsed.reason)); - return; - } + ExcelMapper.readStreaming(dataFilePath, (row, rowIndex) -> { + total.incrementAndGet(); - buffer.add(new RowContext(rowIndex, row, parsed.entity)); + ParsedRow parsed = parseRow(row, regUser, now); + if (parsed.reason != null) { + fail.incrementAndGet(); + failRows.add(buildFailRow(row, rowIndex, parsed.reason)); + return; + } - if (buffer.size() >= INSERT_CHUNK_SIZE) { - flushBuffer(buffer, success, fail, failRows); - } - }); + buffer.add(new RowContext(rowIndex, row, parsed.insertRow)); - if (!buffer.isEmpty()) { + if (buffer.size() >= INSERT_CHUNK_SIZE) { flushBuffer(buffer, success, fail, failRows); } + }); - byte[] errorFile = null; - boolean hasErrorFile = !failRows.isEmpty(); - - if (hasErrorFile) { - errorFile = toXlsx(failRows); - } - - return ExcelUploadResultDto.of(total.get(), success.get(), fail.get(), errorFile); - - } catch (IOException ex){ - throw BusinessException.badRequest("CAN_NOT_OPEN", "파일 스트림을 열 수 없습니다.") - .with("fileName",file.getOriginalFilename()) - .with("errorMessage",ex.getMessage()); + if (!buffer.isEmpty()) { + flushBuffer(buffer, success, fail, failRows); } + + byte[] errorFile = null; + if (!failRows.isEmpty()) { + errorFile = toXlsx(failRows); + } + + return ExcelUploadResultDto.of(total.get(), success.get(), fail.get(), errorFile); } private void flushBuffer( @@ -95,29 +88,30 @@ public class UploadService { AtomicInteger fail, List> failRows ) { - try { - List entities = buffer.stream().map(rc -> rc.entity).toList(); + if (buffer.isEmpty()) { + return; + } - dataRepository.saveAll(entities); - success.addAndGet(buffer.size()); - } catch (DataAccessException e) { - // 배치가 한 번에 터지면, 개별 저장으로 폴백해서 "어느 행이 문제인지" 잡는다 - for (RowContext rc : buffer) { - try { - dataRepository.saveAndFlush(rc.entity); - success.incrementAndGet(); - } catch (DataAccessException ex) { - fail.incrementAndGet(); - failRows.add(buildFailRow(rc.rawRow, rc.rowIndex, "DB 저장 실패: " + rootMessage(ex))); - } + try { + List rows = buffer.stream() + .map(RowContext::insertRow) + .toList(); + + TDataBatchInsertResult result = tDataJdbcRepository.bulkInsert(rows); + + success.addAndGet(result.successCount()); + + for (TDataInsertFailure failure : result.failures()) { + RowContext rc = buffer.get(failure.index()); + fail.incrementAndGet(); + failRows.add(buildFailRow(rc.rawRow(), rc.rowIndex(), "DB 저장 실패: " + failure.reason())); } } finally { - em.clear(); buffer.clear(); } } - private ParsedRow parseRowToEntity( + private ParsedRow parseRow( Map row, String regUser, LocalDateTime regDt @@ -126,7 +120,6 @@ public class UploadService { return ParsedRow.fail("빈 행"); } - // sid String sid = firstNonBlank(row.get(EXCEL_ID), row.get("sid"), row.get("SID")); if (sid == null) { return ParsedRow.fail("ID(sid) 누락"); @@ -135,21 +128,16 @@ public class UploadService { return ParsedRow.fail("ID(sid) 길이 초과(>32): " + sid); } - // rawData 구성 Map> rawData = new LinkedHashMap<>(); for (Map.Entry e : row.entrySet()) { String key = e.getKey(); if (key == null) continue; - - // 제외 if (EXCEL_ID.equals(key)) continue; - //if (EXCEL_YEAR.equals(key)) continue; - //if (EXCEL_PRODUCT.equals(key)) continue; String v = e.getValue(); if (v == null || v.isBlank()) { - continue; // 빈 값은 rawData에 안 넣음 + continue; } Double s = parseDoubleLoose(v); @@ -157,23 +145,33 @@ public class UploadService { return ParsedRow.fail("숫자 파싱 실패: key=" + key + ", value=" + safe(v)); } - if(key.contains("#")){ - key = key.substring(0,key.indexOf("#")); + if (key.contains("#")) { + key = key.substring(0, key.indexOf("#")); } - rawData.computeIfAbsent(key, k -> new ArrayList<>()).add(DataItemDto.from(null, null, s)); + + rawData.computeIfAbsent(key, k -> new ArrayList<>()) + .add(DataItemDto.from(null, null, s)); } - TDataEntity entity = new TDataEntity(); - entity.setSid(sid); - entity.setRawData(rawData); - entity.setRegUser(regUser); - entity.setRegDt(regDt); + String rawDataJson; + try { + rawDataJson = objectMapper.writeValueAsString(rawData); + } catch (JsonProcessingException e) { + return ParsedRow.fail("rawData JSON 직렬화 실패: " + rootMessage(e)); + } - return ParsedRow.ok(entity); + TDataInsertRow insertRow = new TDataInsertRow( + UUID.randomUUID().toString(), + sid, + rawDataJson, + regUser, + regDt + ); + + return ParsedRow.ok(insertRow); } private Map buildFailRow(Map row, int rowIndex, String reason) { - // 에러 엑셀에 행번호/사유를 앞에 고정 컬럼으로 넣고, 원본 컬럼들도 같이 싣는다 Map m = new LinkedHashMap<>(); m.put("rowIndex", String.valueOf(rowIndex)); m.put("reason", reason); @@ -195,26 +193,16 @@ public class UploadService { private static String rootMessage(Throwable t) { Throwable cur = t; - while (cur.getCause() != null) cur = cur.getCause(); - return cur.getMessage(); - } - - private void doDebugLog(TDataEntity e){ - try { - String json = objectMapper - .writerWithDefaultPrettyPrinter() - .writeValueAsString(e.getRawData()); - log.info("rawDataJson={}", json); - } catch (JsonProcessingException ex) { - log.warn("rawData json serialize failed", ex); + while (cur.getCause() != null) { + cur = cur.getCause(); } + return cur.getMessage(); } private static Double parseDoubleLoose(String s) { if (s == null) return null; String t = s.trim(); if (t.isEmpty()) return null; - // 천단위 콤마 제거 t = t.replace(",", ""); try { return Double.parseDouble(t); @@ -238,19 +226,19 @@ public class UploadService { private record RowContext( int rowIndex, Map rawRow, - TDataEntity entity + TDataInsertRow insertRow ) {} private record ParsedRow( - TDataEntity entity, + TDataInsertRow insertRow, String reason ) { - static ParsedRow ok(TDataEntity entity) { - return new ParsedRow(entity, null); + static ParsedRow ok(TDataInsertRow insertRow) { + return new ParsedRow(insertRow, null); } static ParsedRow fail(String reason) { return new ParsedRow(null, reason); } } -} +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java b/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java new file mode 100644 index 0000000..3f6b145 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java @@ -0,0 +1,131 @@ +package com.kri.lge.penetration.service.file; + +import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.util.CommonUtil; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; +import java.util.Optional; +import org.springframework.web.multipart.MultipartFile; + +public abstract class AbstractFileService { + + protected abstract Path getBaseDir(); + + protected String extractExtension(String originalFileName) { + if (originalFileName == null || originalFileName.isBlank()) { + return ""; + } + + int dot = originalFileName.lastIndexOf('.'); + if (dot > -1 && dot < originalFileName.length() - 1) { + return originalFileName.substring(dot); + } + + return ""; + } + + protected String extractBaseName(String originalFileName) { + if (originalFileName == null || originalFileName.isBlank()) { + return "file"; + } + + String fileName = java.nio.file.Paths.get(originalFileName).getFileName().toString(); + int dot = fileName.lastIndexOf('.'); + + if (dot > 0) { + return fileName.substring(0, dot); + } + + return fileName; + } + + protected String buildFileName(MultipartFile file) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + return CommonUtil.uuid32() + extractExtension(original); + } + + protected String buildFileNameWithTime(MultipartFile file, String prefix) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + String baseName = extractBaseName(original); + String ext = extractExtension(original); + + String timestamp = DateTimeUtil.nowKstLocalDateTime() + .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); + + return prefix + "_" + timestamp + "_" + baseName + ext; + } + + protected Path createDirectories(Path dir) throws IOException { + return Files.createDirectories(dir.toAbsolutePath().normalize()); + } + + protected String saveFile(Path dir, MultipartFile file) throws IOException { + if (file == null || file.isEmpty()) { + throw new IllegalArgumentException("업로드할 파일이 없습니다."); + } + + Path normalizedDir = createDirectories(dir); + String fileName = buildFileName(file); + Path target = normalizedDir.resolve(fileName).normalize(); + + if (!target.startsWith(normalizedDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + + file.transferTo(target.toFile()); + return fileName; + } + + protected void saveFile(Path dir, MultipartFile file, String fileName) throws IOException { + if (file == null || file.isEmpty()) { + throw new IllegalArgumentException("업로드할 파일이 없습니다."); + } + + Path normalizedDir = createDirectories(dir); + Path target = normalizedDir.resolve(fileName).normalize(); + + if (!target.startsWith(normalizedDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + + file.transferTo(target.toFile()); + } + + protected void moveFile(Path sourceDir, Path targetDir, String fileName) throws IOException { + if (fileName == null || fileName.isBlank()) { + return; + } + + Path normalizedSourceDir = sourceDir.toAbsolutePath().normalize(); + Path normalizedTargetDir = createDirectories(targetDir); + + Path source = normalizedSourceDir.resolve(fileName).normalize(); + Path target = normalizedTargetDir.resolve(fileName).normalize(); + + if (!source.startsWith(normalizedSourceDir) || !target.startsWith(normalizedTargetDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + if (!Files.exists(source)) { + return; + } + + Files.move(source, target, StandardCopyOption.REPLACE_EXISTING); + } + + protected void deleteFile(Path dir, String fileName) throws IOException { + if (fileName == null || fileName.isBlank()) { + return; + } + + Path normalizedDir = dir.toAbsolutePath().normalize(); + Path target = normalizedDir.resolve(fileName).normalize(); + + if (!target.startsWith(normalizedDir)) { + throw new IllegalStateException("잘못된 파일 경로입니다."); + } + + Files.deleteIfExists(target); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java new file mode 100644 index 0000000..16cf0ca --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java @@ -0,0 +1,36 @@ +package com.kri.lge.penetration.service.file; + +import com.kri.common.util.CommonUtil; +import com.kri.common.web.BusinessException; +import com.kri.lge.penetration.config.FileStorageProperties; +import java.io.IOException; +import java.nio.file.Path; +import java.nio.file.Paths; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +@RequiredArgsConstructor +public class DataFileService extends AbstractFileService { + + private final FileStorageProperties properties; + + @Override + protected Path getBaseDir() { + return Paths.get(properties.getDataBaseDir()).toAbsolutePath().normalize(); + } + + public Path saveListFile(MultipartFile file) { + String newFileName = buildFileNameWithTime(file, CommonUtil.uuid32()); + Path dir = getBaseDir().toAbsolutePath().normalize(); + Path savedPath = dir.resolve(newFileName).toAbsolutePath().normalize(); + + try { + saveFile(dir, file, newFileName); + return savedPath; + } catch (IOException e) { + throw BusinessException.internalError("FAIL_DATA_UPLOAD", e.getMessage()); + } + } +} \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 35327f4..fac7a3e 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -20,6 +20,6 @@ spring: logging: level: org.hibernate.SQL: DEBUG - org.hibernate.orm.jdbc.bind: TRACE + #org.hibernate.orm.jdbc.bind: TRACE #org.hibernate.orm.jdbc.extract: TRACE org.hibernate.engine.jdbc.batch.internal: DEBUG \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 87b0ec0..84388ba 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -47,6 +47,9 @@ kri: version: "v1.0.0" base-package: "com.kri.lge.penetration" + file: + data-base-dir: ./upload-file/data + common: web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) From 844d098f8a66c78efc1e753e058378032d5a16cb Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 11 Mar 2026 16:26:56 +0900 Subject: [PATCH 05/14] =?UTF-8?q?260311=5F02=5FENH:=20=EC=97=85=EB=A1=9C?= =?UTF-8?q?=EB=93=9C=20=ED=9B=84=20=EC=97=85=EB=A1=9C=EB=93=9C=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kri/lge/penetration/service/UploadService.java | 2 ++ .../lge/penetration/service/file/DataFileService.java | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java index b96e8e2..91be87b 100644 --- a/src/main/java/com/kri/lge/penetration/service/UploadService.java +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -79,6 +79,8 @@ public class UploadService { errorFile = toXlsx(failRows); } + dataFileService.deleteListFile(dataFilePath.getFileName().toString()); + return ExcelUploadResultDto.of(total.get(), success.get(), fail.get(), errorFile); } diff --git a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java index 16cf0ca..cfc5198 100644 --- a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java +++ b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java @@ -33,4 +33,14 @@ public class DataFileService extends AbstractFileService { throw BusinessException.internalError("FAIL_DATA_UPLOAD", e.getMessage()); } } + + public void deleteListFile(String fileName) { + Path dir = getBaseDir().toAbsolutePath().normalize(); + + try { + deleteFile(dir, fileName); + } catch (IOException e) { + throw BusinessException.internalError("FAIL_DATA_DELETE", e.getMessage()); + } + } } \ No newline at end of file From 70a6538378b4a320ec072feb9386cf88391497e4 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 11 Mar 2026 17:39:05 +0900 Subject: [PATCH 06/14] =?UTF-8?q?260311=5F03=5FENH:=20=EC=A7=91=EA=B3=84?= =?UTF-8?q?=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=BA=90=EC=8B=9C=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=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 --- .../penetration/controller/CacheAdminController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java index 837906b..4f383cc 100644 --- a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java +++ b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java @@ -25,6 +25,7 @@ public class CacheAdminController { private final YearCache yearCache; private final VariableCache variableCache; + private final StatisticsDbCache statisticsDbCache; private final AuthService authService; @Operation(summary = "가용 연도 리스트 캐시 조회") @@ -56,4 +57,14 @@ public class CacheAdminController { return variableCache.reload(); } + + @Operation(summary = "통계처리 캐시 클리어") + @PostMapping("/statistics-db/clear/{adminPw}") + public void clearStatisticsDbCache(@PathVariable String adminPw) { + if (!authService.isAdmin(adminPw)) { + throw BusinessException.unauthorized("IS_NOT_ADMIN", "권한이 없습니다."); + } + + statisticsDbCache.clearStatisticsCache(); + } } From 4e977e5f497e0659b76227873b1895836e196129 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 12 Mar 2026 09:46:23 +0900 Subject: [PATCH 07/14] =?UTF-8?q?260312=5F01=5FENH:=20index,=20banner=20sc?= =?UTF-8?q?alar=EC=97=90=20sort=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../penetration/service/StatisticsService.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java index 8d9c9b3..e6aed9e 100644 --- a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java +++ b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; +import java.util.Comparator; import java.util.DoubleSummaryStatistics; import java.util.HashMap; import java.util.HashSet; @@ -200,7 +201,9 @@ public class StatisticsService { String qid = v.getTargetQid(); List choices = new ArrayList<>(); - for (VariableItemInfoDto scalar : v.getScalarInfo()) { + VariableItemInfoDto[] bannerScalarList =filterVariableScalarInfo(v.getScalarInfo(), null); + + for (VariableItemInfoDto scalar : bannerScalarList) { if (scalar == null) continue; List vals = scalar.getValue(); if (vals == null || vals.isEmpty()) continue; @@ -666,9 +669,18 @@ public class StatisticsService { return new VariableItemInfoDto[0]; } + return filterVariableScalarInfo(scalarInfo, sValueSet); + } + + private VariableItemInfoDto[] filterVariableScalarInfo(VariableItemInfoDto[] scalarInfo, Set sValueSet) { + //sValueSet 이 없을 수도 있음 없으면 filter를 하지 말아야 함 return Arrays.stream(scalarInfo) .filter(Objects::nonNull) - .filter(info -> containsAny(info.getValue(), sValueSet)) + .filter(info -> sValueSet == null || sValueSet.isEmpty() || containsAny(info.getValue(), sValueSet)) + .sorted(Comparator.comparing( + VariableItemInfoDto::getOrder, + Comparator.nullsLast(Integer::compareTo) + )) .toArray(VariableItemInfoDto[]::new); } From 09048040366c97f2fc881764b1cd55c8861c08bf Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 19 Mar 2026 16:37:30 +0900 Subject: [PATCH 08/14] =?UTF-8?q?260319=5F01=5FENH:=20=EC=B2=A8=EB=B6=80?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B5=9C=EB=8C=80=20=EC=9A=A9=EB=9F=89=20?= =?UTF-8?q?=EB=8A=98=EB=A6=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 84388ba..5ff3996 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -22,8 +22,8 @@ spring: servlet: multipart: - max-file-size: 50MB - max-request-size: 50MB + max-file-size: 100MB + max-request-size: 100MB logging: file: From a60cf5efd91a21faacaddd47deb8a017e3872bd7 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 20 Mar 2026 09:54:13 +0900 Subject: [PATCH 09/14] =?UTF-8?q?260320=5F01=5FENH:=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EC=97=85=EB=A1=9C=EB=93=9C=20=EC=9A=A9=EB=9F=89=20=EB=B0=8F?= =?UTF-8?q?=20=ED=8A=B9=EC=A0=95=20=EB=AC=B8=EC=9E=90=20=EB=AC=B4=EC=8B=9C?= =?UTF-8?q?=ED=95=98=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 +- .../java/com/kri/lge/penetration/service/UploadService.java | 2 +- src/main/resources/application.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2d6b697..4544825 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.69" + implementation "com.kri.common:starter:beta.1.0.70" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java index 91be87b..e572e90 100644 --- a/src/main/java/com/kri/lge/penetration/service/UploadService.java +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -138,7 +138,7 @@ public class UploadService { if (EXCEL_ID.equals(key)) continue; String v = e.getValue(); - if (v == null || v.isBlank()) { + if (v == null || v.isBlank() || "#NULL!".equals(v.trim())) { continue; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5ff3996..37bf518 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 6101 forward-headers-strategy: framework tomcat: - max-http-form-post-size: 50MB + max-http-form-post-size: 100MB max-swallow-size: -1 spring: From 84551d22de8b8cef50b1d24f78b17703559bf62e Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 20 Mar 2026 09:57:19 +0900 Subject: [PATCH 10/14] =?UTF-8?q?260320=5F02=5FENH:=20=EC=8A=A4=EC=9B=A8?= =?UTF-8?q?=EA=B1=B0=20=ED=97=88=EC=9A=A9=20IP=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 37bf518..79b3777 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -42,6 +42,8 @@ kri: swagger: enabled: true + allowed-ips: + - 211.254.145.130 title: "LGE CX Dash" description: "LGE 가전 보급률 Dashboard" version: "v1.0.0" From 801bc617834af42c839e053385d2f792659b897b Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 24 Mar 2026 14:46:22 +0900 Subject: [PATCH 11/14] =?UTF-8?q?260324=5F01=5FENH:=20db=20=EA=B3=84?= =?UTF-8?q?=EC=A0=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application-dev.yml | 4 ++-- src/main/resources/application-local.yml | 4 ++-- src/main/resources/application-prod.yml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 78f68d1..ec67ea3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -2,6 +2,6 @@ spring: datasource: #private 도메인 url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true - username: kriit - password: it#51304 + username: prjct_lge_cx + password: lge#260324 driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index fac7a3e..2499534 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -2,8 +2,8 @@ spring: datasource: #public 도메인 url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true - username: kriit - password: it#51304 + username: prjct_lge_cx + password: lge#260324 driver-class-name: com.mysql.cj.jdbc.Driver jpa: diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 78f68d1..fd0bd15 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -1,7 +1,7 @@ spring: datasource: #private 도메인 - url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true - username: kriit - password: it#51304 + url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true + username: prjct_lge_cx + password: lge#260324 driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file From d64329544166b48c9931c7ba798b45ccee1c3ce7 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 27 Mar 2026 11:31:48 +0900 Subject: [PATCH 12/14] =?UTF-8?q?260327=5F01=5FENH:=20kri.common=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EB=A6=AC?= =?UTF-8?q?=ED=8E=99=ED=86=A0=EB=A7=81=EC=9C=BC=EB=A1=9C=20=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EC=B0=B8=EC=A1=B0=20=EA=B2=BD=EB=A1=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../com/kri/lge/penetration/common/cache/VariableCache.java | 2 +- .../com/kri/lge/penetration/common/cache/YearCache.java | 2 +- .../com/kri/lge/penetration/common/enums/VariableType.java | 2 +- .../com/kri/lge/penetration/controller/AuthController.java | 4 ++-- .../lge/penetration/controller/CacheAdminController.java | 2 +- .../com/kri/lge/penetration/dto/ExcelUploadResultDto.java | 2 +- .../java/com/kri/lge/penetration/dto/LoginResponseDto.java | 2 +- .../java/com/kri/lge/penetration/service/AuthService.java | 6 +++--- .../com/kri/lge/penetration/service/StatisticsService.java | 2 +- .../java/com/kri/lge/penetration/service/UploadService.java | 6 +++--- .../lge/penetration/service/file/AbstractFileService.java | 6 +++--- .../kri/lge/penetration/service/file/DataFileService.java | 6 +++--- src/main/resources/application.yml | 1 - 14 files changed, 22 insertions(+), 23 deletions(-) diff --git a/build.gradle b/build.gradle index 4544825..e705f96 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.70" + implementation "com.kri.common:starter:beta.1.1.01" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java b/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java index aaa27e2..ccd5a60 100644 --- a/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java +++ b/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.common.cache; -import com.kri.common.cache.AbstractMapCache; +import com.kri.common.feature.cache.AbstractMapCache; import com.kri.lge.penetration.dto.VariableDto; import com.kri.lge.penetration.persistence.entity.TVariableEntity; import com.kri.lge.penetration.persistence.repository.VariableRepository; diff --git a/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java b/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java index 3d6f469..5c3a5c5 100644 --- a/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java +++ b/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.common.cache; -import com.kri.common.cache.AbstractListCache; +import com.kri.common.feature.cache.AbstractListCache; import com.kri.lge.penetration.persistence.repository.YearRepository; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java b/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java index f8e3148..e297a0f 100644 --- a/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java +++ b/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java @@ -2,7 +2,7 @@ package com.kri.lge.penetration.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 java.util.Objects; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/kri/lge/penetration/controller/AuthController.java b/src/main/java/com/kri/lge/penetration/controller/AuthController.java index 8257c7d..862d906 100644 --- a/src/main/java/com/kri/lge/penetration/controller/AuthController.java +++ b/src/main/java/com/kri/lge/penetration/controller/AuthController.java @@ -1,7 +1,7 @@ package com.kri.lge.penetration.controller; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.webmvc.RequestUserContext; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; import com.kri.lge.penetration.dto.LoginRequestDto; import com.kri.lge.penetration.dto.LoginResponseDto; import com.kri.lge.penetration.service.AuthService; diff --git a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java index 4f383cc..26d785d 100644 --- a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java +++ b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.controller; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.common.cache.StatisticsDbCache; import com.kri.lge.penetration.common.cache.VariableCache; import com.kri.lge.penetration.common.cache.YearCache; diff --git a/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java index ce56fab..f42f50c 100644 --- a/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java +++ b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.dto; -import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.feature.datetime.DateTimeUtil; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDateTime; import lombok.Getter; diff --git a/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java b/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java index 4a70fcf..a433bbc 100644 --- a/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java +++ b/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.dto; -import com.kri.common.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kri/lge/penetration/service/AuthService.java b/src/main/java/com/kri/lge/penetration/service/AuthService.java index 7290d4f..68b0030 100644 --- a/src/main/java/com/kri/lge/penetration/service/AuthService.java +++ b/src/main/java/com/kri/lge/penetration/service/AuthService.java @@ -1,8 +1,8 @@ package com.kri.lge.penetration.service; -import com.kri.common.auth.dto.JwtUserClaimsDto; -import com.kri.common.auth.jwt.JwtService; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.auth.dto.JwtUserClaimsDto; +import com.kri.common.feature.auth.jwt.JwtService; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.common.consts.LgePenetrationConst; import com.kri.lge.penetration.dto.LoginRequestDto; import com.kri.lge.penetration.dto.LoginResponseDto; diff --git a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java index e6aed9e..5f59b0b 100644 --- a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java +++ b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java @@ -1,6 +1,6 @@ package com.kri.lge.penetration.service; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.common.cache.StatisticsDbCache; import com.kri.lge.penetration.common.cache.VariableCache; import com.kri.lge.penetration.common.cache.YearCache; diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java index e572e90..301d7bc 100644 --- a/src/main/java/com/kri/lge/penetration/service/UploadService.java +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -5,8 +5,8 @@ import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_C import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.excel.ExcelMapper; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.excel.ExcelMapper; import com.kri.lge.penetration.dto.DataItemDto; import com.kri.lge.penetration.dto.ExcelUploadResultDto; import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository; @@ -243,4 +243,4 @@ public class UploadService { return new ParsedRow(null, reason); } } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java b/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java index 3f6b145..6a3a1f4 100644 --- a/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java +++ b/src/main/java/com/kri/lge/penetration/service/file/AbstractFileService.java @@ -1,7 +1,7 @@ package com.kri.lge.penetration.service.file; -import com.kri.common.datetime.DateTimeUtil; -import com.kri.common.util.CommonUtil; +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.util.CommonUtil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; @@ -128,4 +128,4 @@ public abstract class AbstractFileService { Files.deleteIfExists(target); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java index cfc5198..c4a05ae 100644 --- a/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java +++ b/src/main/java/com/kri/lge/penetration/service/file/DataFileService.java @@ -1,7 +1,7 @@ package com.kri.lge.penetration.service.file; -import com.kri.common.util.CommonUtil; -import com.kri.common.web.BusinessException; +import com.kri.common.feature.util.CommonUtil; +import com.kri.common.feature.web.BusinessException; import com.kri.lge.penetration.config.FileStorageProperties; import java.io.IOException; import java.nio.file.Path; @@ -43,4 +43,4 @@ public class DataFileService extends AbstractFileService { throw BusinessException.internalError("FAIL_DATA_DELETE", e.getMessage()); } } -} \ No newline at end of file +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 79b3777..1990a2a 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -52,7 +52,6 @@ kri: file: data-base-dir: ./upload-file/data -common: web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) webmvc: From 0a6246964ba34434fdd31fa3716dfcfa668a006f Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 27 Mar 2026 12:00:06 +0900 Subject: [PATCH 13/14] =?UTF-8?q?260327=5F02=5FENH:=20kri.common=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B5=9C?= =?UTF-8?q?=EC=8B=A0=20=EB=B2=84=EC=A0=84=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e705f96..2a90ecd 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.1.01" + 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' From 4b080ec7259d788d8a16add18ab2c1b8e6905225 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 27 Mar 2026 12:10:16 +0900 Subject: [PATCH 14/14] =?UTF-8?q?260327=5F03=5FENH:=20kri.common=20?= =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=B8=8C=EB=9F=AC=EB=A6=AC=20JWT=20=EB=B2=84?= =?UTF-8?q?=EC=A0=84=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2a90ecd..5d77b5c 100644 --- a/build.gradle +++ b/build.gradle @@ -32,7 +32,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.1.02" + implementation "com.kri.common:starter:beta.1.1.03" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security'