Compare commits

...

15 Commits

Author SHA1 Message Date
b99b964bfe Merge pull request '260720_01_ENH: 코드 일부 리팩토링' (#3) from develop into master
Reviewed-on: #3
2026-07-20 14:53:05 +09:00
324ba3a1ca 260720_01_ENH: 코드 일부 리팩토링 2026-07-20 14:36:04 +09:00
8a889c71af 260401_01_ENH: 코드 일부 리팩토링 2026-04-01 15:08:19 +09:00
7b30f4161a Merge pull request '260330_01_ENH: db 컨넥션 정보 수정' (#2) from develop into master
Reviewed-on: #2
2026-03-30 14:45:20 +09:00
4361a42aca 260330_01_ENH: db 컨넥션 정보 수정 2026-03-30 14:41:16 +09:00
0aff805596 Merge pull request 'develop' (#1) from develop into master
Reviewed-on: #1
2026-03-30 14:08:58 +09:00
4b080ec725 260327_03_ENH: kri.common 라이브러리 JWT 버전 문제 해결 적용 2026-03-27 12:10:16 +09:00
0a6246964b 260327_02_ENH: kri.common 라이브러리 최신 버전 적용 2026-03-27 12:00:06 +09:00
d643295441 260327_01_ENH: kri.common 라이브러리 리펙토링으로 인한 참조 경로 수정 2026-03-27 11:31:48 +09:00
801bc61783 260324_01_ENH: db 계정 수정 2026-03-24 14:46:22 +09:00
84551d22de 260320_02_ENH: 스웨거 허용 IP 추가 2026-03-20 09:57:19 +09:00
a60cf5efd9 260320_01_ENH: 파일 업로드 용량 및 특정 문자 무시하게 수정 2026-03-20 09:54:13 +09:00
0904804036 260319_01_ENH: 첨부파일 최대 용량 늘림 2026-03-19 16:37:30 +09:00
4e977e5f49 260312_01_ENH: index, banner scalar에 sort 적용 2026-03-12 09:46:23 +09:00
70a6538378 260311_03_ENH: 집계 데이터 캐시 초기화 기능 추가 2026-03-11 17:39:05 +09:00
19 changed files with 85 additions and 62 deletions

3
.gitignore vendored
View File

@@ -35,3 +35,6 @@ out/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
logs
upload-file

View File

@@ -32,7 +32,7 @@ repositories {
} }
dependencies { dependencies {
implementation "com.kri.common:starter:beta.1.0.69" implementation "com.kri.common:starter:beta.1.1.17"
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-security'
@@ -50,7 +50,7 @@ dependencies {
compileOnly 'org.projectlombok:lombok' compileOnly 'org.projectlombok:lombok'
annotationProcessor 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok'
implementation 'org.apache.poi:poi-ooxml:5.2.5' implementation 'org.apache.poi:poi-ooxml:5.5.1'
developmentOnly 'org.springframework.boot:spring-boot-devtools' developmentOnly 'org.springframework.boot:spring-boot-devtools'

View File

@@ -1,6 +1,6 @@
package com.kri.lge.penetration.common.cache; 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.dto.VariableDto;
import com.kri.lge.penetration.persistence.entity.TVariableEntity; import com.kri.lge.penetration.persistence.entity.TVariableEntity;
import com.kri.lge.penetration.persistence.repository.VariableRepository; import com.kri.lge.penetration.persistence.repository.VariableRepository;

View File

@@ -1,6 +1,6 @@
package com.kri.lge.penetration.common.cache; 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 com.kri.lge.penetration.persistence.repository.YearRepository;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@@ -2,7 +2,7 @@ package com.kri.lge.penetration.common.enums;
import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonValue; import com.fasterxml.jackson.annotation.JsonValue;
import com.kri.common.enums.CodeEnum; import com.kri.common.feature.enums.CodeEnum;
import java.util.Objects; import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@@ -1,7 +1,7 @@
package com.kri.lge.penetration.controller; package com.kri.lge.penetration.controller;
import com.kri.common.datetime.DateTimeUtil; import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.webmvc.RequestUserContext; import com.kri.common.feature.web.RequestUserContext;
import com.kri.lge.penetration.dto.LoginRequestDto; import com.kri.lge.penetration.dto.LoginRequestDto;
import com.kri.lge.penetration.dto.LoginResponseDto; import com.kri.lge.penetration.dto.LoginResponseDto;
import com.kri.lge.penetration.service.AuthService; import com.kri.lge.penetration.service.AuthService;

View File

@@ -1,6 +1,6 @@
package com.kri.lge.penetration.controller; 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.StatisticsDbCache;
import com.kri.lge.penetration.common.cache.VariableCache; import com.kri.lge.penetration.common.cache.VariableCache;
import com.kri.lge.penetration.common.cache.YearCache; import com.kri.lge.penetration.common.cache.YearCache;
@@ -25,6 +25,7 @@ public class CacheAdminController {
private final YearCache yearCache; private final YearCache yearCache;
private final VariableCache variableCache; private final VariableCache variableCache;
private final StatisticsDbCache statisticsDbCache;
private final AuthService authService; private final AuthService authService;
@Operation(summary = "가용 연도 리스트 캐시 조회") @Operation(summary = "가용 연도 리스트 캐시 조회")
@@ -56,4 +57,14 @@ public class CacheAdminController {
return variableCache.reload(); 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();
}
} }

View File

@@ -9,8 +9,8 @@ import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpHeaders; import org.springframework.http.HttpHeaders;
@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
public class UploadController { public class UploadController {
private static final String XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; private static final String XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
private static final MediaType XLSX_MEDIA_TYPE = MediaType.valueOf(XLSX);
private final StatisticsDbCache statisticsDbCache; private final StatisticsDbCache statisticsDbCache;
private final UploadService uploadService; private final UploadService uploadService;
@@ -39,7 +40,6 @@ public class UploadController {
produces = {MediaType.APPLICATION_JSON_VALUE, XLSX} produces = {MediaType.APPLICATION_JSON_VALUE, XLSX}
) )
@Operation(summary = "파일 업로드", description = "성공이면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환") @Operation(summary = "파일 업로드", description = "성공이면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환")
@ApiResponses({
@ApiResponse( @ApiResponse(
responseCode = "200", responseCode = "200",
description = "성공(JSON) 또는 실패 엑셀(xlsx)", description = "성공(JSON) 또는 실패 엑셀(xlsx)",
@@ -54,8 +54,7 @@ public class UploadController {
) )
} }
) )
}) public ResponseEntity<Object> importData(
public ResponseEntity<?> importData(
@Parameter(description = "업로드 파일", required = true) @Parameter(description = "업로드 파일", required = true)
@RequestPart("file") MultipartFile file @RequestPart("file") MultipartFile file
) { ) {
@@ -64,15 +63,14 @@ public class UploadController {
ExcelUploadResultDto result = uploadService.uploadData(file); ExcelUploadResultDto result = uploadService.uploadData(file);
if (result.isHasErrorFile()) { if (result.isHasErrorFile()) {
String contentDisposition = "attachment; filename*=UTF-8''" + String contentDisposition = "attachment; filename*=UTF-8''" +
java.net.URLEncoder.encode(result.getErrorFileName(), StandardCharsets.UTF_8); URLEncoder.encode(result.getErrorFileName(), StandardCharsets.UTF_8);
return ResponseEntity.ok() return ResponseEntity.ok()
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition) .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition)
.contentType(MediaType.parseMediaType(XLSX)) .contentType(XLSX_MEDIA_TYPE)
.body(result.getErrorFile()); .body(result.getErrorFile());
}
} else {
return ResponseEntity.ok(ExcelUploadSuccessDto.from(result)); return ResponseEntity.ok(ExcelUploadSuccessDto.from(result));
} }
}
} }

View File

@@ -1,6 +1,6 @@
package com.kri.lge.penetration.dto; 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 io.swagger.v3.oas.annotations.media.Schema;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,6 +1,6 @@
package com.kri.lge.penetration.dto; 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 io.swagger.v3.oas.annotations.media.Schema;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;

View File

@@ -1,8 +1,8 @@
package com.kri.lge.penetration.service; package com.kri.lge.penetration.service;
import com.kri.common.auth.dto.JwtUserClaimsDto; import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
import com.kri.common.auth.jwt.JwtService; import com.kri.common.feature.auth.jwt.JwtService;
import com.kri.common.web.BusinessException; import com.kri.common.feature.web.BusinessException;
import com.kri.lge.penetration.common.consts.LgePenetrationConst; import com.kri.lge.penetration.common.consts.LgePenetrationConst;
import com.kri.lge.penetration.dto.LoginRequestDto; import com.kri.lge.penetration.dto.LoginRequestDto;
import com.kri.lge.penetration.dto.LoginResponseDto; import com.kri.lge.penetration.dto.LoginResponseDto;

View File

@@ -1,6 +1,6 @@
package com.kri.lge.penetration.service; 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.StatisticsDbCache;
import com.kri.lge.penetration.common.cache.VariableCache; import com.kri.lge.penetration.common.cache.VariableCache;
import com.kri.lge.penetration.common.cache.YearCache; import com.kri.lge.penetration.common.cache.YearCache;
@@ -21,6 +21,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator;
import java.util.DoubleSummaryStatistics; import java.util.DoubleSummaryStatistics;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
@@ -200,7 +201,9 @@ public class StatisticsService {
String qid = v.getTargetQid(); String qid = v.getTargetQid();
List<BannerSpec> choices = new ArrayList<>(); List<BannerSpec> choices = new ArrayList<>();
for (VariableItemInfoDto scalar : v.getScalarInfo()) { VariableItemInfoDto[] bannerScalarList =filterVariableScalarInfo(v.getScalarInfo(), null);
for (VariableItemInfoDto scalar : bannerScalarList) {
if (scalar == null) continue; if (scalar == null) continue;
List<Integer> vals = scalar.getValue(); List<Integer> vals = scalar.getValue();
if (vals == null || vals.isEmpty()) continue; if (vals == null || vals.isEmpty()) continue;
@@ -666,9 +669,18 @@ public class StatisticsService {
return new VariableItemInfoDto[0]; return new VariableItemInfoDto[0];
} }
return filterVariableScalarInfo(scalarInfo, sValueSet);
}
private VariableItemInfoDto[] filterVariableScalarInfo(VariableItemInfoDto[] scalarInfo, Set<Integer> sValueSet) {
//sValueSet 이 없을 수도 있음 없으면 filter를 하지 말아야 함
return Arrays.stream(scalarInfo) return Arrays.stream(scalarInfo)
.filter(Objects::nonNull) .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); .toArray(VariableItemInfoDto[]::new);
} }

View File

@@ -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.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.kri.common.datetime.DateTimeUtil; import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.excel.ExcelMapper; import com.kri.common.feature.excel.ExcelMapper;
import com.kri.lge.penetration.dto.DataItemDto; import com.kri.lge.penetration.dto.DataItemDto;
import com.kri.lge.penetration.dto.ExcelUploadResultDto; import com.kri.lge.penetration.dto.ExcelUploadResultDto;
import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository; import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository;
@@ -138,7 +138,7 @@ public class UploadService {
if (EXCEL_ID.equals(key)) continue; if (EXCEL_ID.equals(key)) continue;
String v = e.getValue(); String v = e.getValue();
if (v == null || v.isBlank()) { if (v == null || v.isBlank() || "#NULL!".equals(v.trim())) {
continue; continue;
} }

View File

@@ -1,7 +1,7 @@
package com.kri.lge.penetration.service.file; package com.kri.lge.penetration.service.file;
import com.kri.common.datetime.DateTimeUtil; import com.kri.common.feature.datetime.DateTimeUtil;
import com.kri.common.util.CommonUtil; import com.kri.common.feature.util.CommonUtil;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;

View File

@@ -1,7 +1,7 @@
package com.kri.lge.penetration.service.file; package com.kri.lge.penetration.service.file;
import com.kri.common.util.CommonUtil; import com.kri.common.feature.util.CommonUtil;
import com.kri.common.web.BusinessException; import com.kri.common.feature.web.BusinessException;
import com.kri.lge.penetration.config.FileStorageProperties; import com.kri.lge.penetration.config.FileStorageProperties;
import java.io.IOException; import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;

View File

@@ -2,6 +2,6 @@ spring:
datasource: datasource:
#private 도메인 #private 도메인
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
username: kriit username: prjct_lge_cx
password: it#51304 password: lge#260324
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver

View File

@@ -2,8 +2,8 @@ spring:
datasource: datasource:
#public 도메인 #public 도메인
url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
username: kriit username: prjct_lge_cx
password: it#51304 password: lge#260324
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jpa: jpa:

View File

@@ -1,7 +1,7 @@
spring: spring:
datasource: datasource:
#private 도메인 #private 도메인
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true url: jdbc:mysql://db-40h0ul.vpc-cdb.ntruss.com:3306/prjct_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
username: kriit username: prjct_lge_cx
password: it#51304 password: lge#260324
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver

View File

@@ -2,7 +2,7 @@ server:
port: 6101 port: 6101
forward-headers-strategy: framework forward-headers-strategy: framework
tomcat: tomcat:
max-http-form-post-size: 50MB max-http-form-post-size: 100MB
max-swallow-size: -1 max-swallow-size: -1
spring: spring:
@@ -22,8 +22,8 @@ spring:
servlet: servlet:
multipart: multipart:
max-file-size: 50MB max-file-size: 100MB
max-request-size: 50MB max-request-size: 100MB
logging: logging:
file: file:
@@ -42,6 +42,8 @@ kri:
swagger: swagger:
enabled: true enabled: true
allowed-ips:
- 211.254.145.130
title: "LGE CX Dash" title: "LGE CX Dash"
description: "LGE 가전 보급률 Dashboard" description: "LGE 가전 보급률 Dashboard"
version: "v1.0.0" version: "v1.0.0"
@@ -50,12 +52,9 @@ kri:
file: file:
data-base-dir: ./upload-file/data data-base-dir: ./upload-file/data
common:
web: web:
enabled: true # 공통 Web 구성 사용 여부 (기본 true) enabled: true # 공통 Web 구성 사용 여부 (기본 true)
webmvc:
enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true)
redis: redis:
enabled: false # RedisQueueHelper 사용 시 true enabled: false # RedisQueueHelper 사용 시 true
scheduling: scheduling:
enabled: true # @Scheduled 사용 시 true enabled: false # @Scheduled 사용 시 true