From 511e2ef765bb9a367b35af4626d2c0f983af732a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 25 Feb 2026 16:59:53 +0900 Subject: [PATCH] =?UTF-8?q?260225=5F01=5FENH:=20=EC=B5=9C=EC=B4=88=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + .gitignore | 37 + build.gradle | 65 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 46175 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++ gradlew.bat | 93 +++ settings.gradle | 1 + .../LgePenetrationBackApplication.java | 33 + .../common/cache/StatisticsDbCache.java | 78 ++ .../common/cache/VariableCache.java | 30 + .../penetration/common/cache/YearCache.java | 27 + .../common/consts/LgePenetrationConst.java | 19 + .../common/enums/VariableType.java | 34 + .../controller/AuthController.java | 33 + .../controller/CacheAdminController.java | 62 ++ .../controller/StatisticsController.java | 35 + .../controller/UploadController.java | 78 ++ .../com/kri/lge/penetration/dto/DataDto.java | 22 + .../kri/lge/penetration/dto/DataItemDto.java | 36 + .../penetration/dto/ExcelUploadResultDto.java | 37 + .../dto/ExcelUploadSuccessDto.java | 30 + .../lge/penetration/dto/LoginRequestDto.java | 17 + .../lge/penetration/dto/LoginResponseDto.java | 26 + .../penetration/dto/StatisticsRequestDto.java | 38 + .../dto/StatisticsRequestOptionDto.java | 25 + .../dto/StatisticsResponseDto.java | 24 + .../kri/lge/penetration/dto/VariableDto.java | 56 ++ .../penetration/dto/VariableItemInfoDto.java | 25 + .../persistence/entity/TDataEntity.java | 83 ++ .../entity/TStatisticsCacheEntity.java | 44 + .../persistence/entity/TUserEntity.java | 64 ++ .../persistence/entity/TVariableEntity.java | 69 ++ .../persistence/entity/TYearEntity.java | 19 + .../repository/DataRepository.java | 9 + .../repository/DataRepositoryCustom.java | 18 + .../repository/DataRepositoryCustomImpl.java | 166 ++++ .../repository/StatisticsCacheRepository.java | 9 + .../repository/UserRepository.java | 14 + .../repository/VariableRepository.java | 10 + .../repository/YearRepository.java | 16 + .../lge/penetration/service/AuthService.java | 45 + .../service/StatisticsService.java | 782 ++++++++++++++++++ .../penetration/service/UploadService.java | 256 ++++++ src/main/resources/application-dev.yml | 7 + src/main/resources/application-local.yml | 25 + src/main/resources/application-prod.yml | 7 + src/main/resources/application.yml | 58 ++ .../LgePenetrationBackApplicationTests.java | 13 + 49 files changed, 2933 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java create mode 100644 src/main/java/com/kri/lge/penetration/common/cache/StatisticsDbCache.java create mode 100644 src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java create mode 100644 src/main/java/com/kri/lge/penetration/common/cache/YearCache.java create mode 100644 src/main/java/com/kri/lge/penetration/common/consts/LgePenetrationConst.java create mode 100644 src/main/java/com/kri/lge/penetration/common/enums/VariableType.java create mode 100644 src/main/java/com/kri/lge/penetration/controller/AuthController.java create mode 100644 src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java create mode 100644 src/main/java/com/kri/lge/penetration/controller/StatisticsController.java create mode 100644 src/main/java/com/kri/lge/penetration/controller/UploadController.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/DataDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/DataItemDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/ExcelUploadSuccessDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/LoginRequestDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/StatisticsRequestDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/StatisticsRequestOptionDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/StatisticsResponseDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/VariableDto.java create mode 100644 src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/entity/TDataEntity.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/entity/TStatisticsCacheEntity.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/entity/TUserEntity.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/entity/TVariableEntity.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/entity/TYearEntity.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/DataRepository.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustom.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustomImpl.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/StatisticsCacheRepository.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/UserRepository.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/VariableRepository.java create mode 100644 src/main/java/com/kri/lge/penetration/persistence/repository/YearRepository.java create mode 100644 src/main/java/com/kri/lge/penetration/service/AuthService.java create mode 100644 src/main/java/com/kri/lge/penetration/service/StatisticsService.java create mode 100644 src/main/java/com/kri/lge/penetration/service/UploadService.java create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application-local.yml create mode 100644 src/main/resources/application-prod.yml create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/kri/lge/penetration/LgePenetrationBackApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..3fe041b --- /dev/null +++ b/build.gradle @@ -0,0 +1,65 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.kri.lge' +version = '0.0.1-SNAPSHOT' +description = 'lge-penetration-back' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +def giteaUser = findProperty("giteaUser") ?: "" +def giteaToken = findProperty("giteaToken") ?: "" + +repositories { + mavenCentral() + + maven { + name = "gitea" + url = uri("https://gitea.kric.com/api/packages/KRi/maven") + //allowInsecureProtocol = true + credentials { + username = giteaUser + password = giteaToken + } + } +} + +dependencies { + implementation "com.kri.common:starter:beta.1.0.66" + + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11" + + //JPA + implementation "org.springframework.boot:spring-boot-starter-data-jpa" + //Entity Json <-> Class 파싱용 + implementation "io.hypersistence:hypersistence-utils-hibernate-62:3.9.4" + + //MySQL + runtimeOnly "com.mysql:mysql-connector-j" + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + implementation 'org.apache.poi:poi-ooxml:5.2.5' + + developmentOnly 'org.springframework.boot:spring-boot-devtools' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.5' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..61285a659d17295f1de7c53e24fdf13ad755c379 GIT binary patch literal 46175 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

pVX@HRij*jw$g4?}Pn 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..19a6bde --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..adff685 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,93 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..43f8668 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'lge-penetration-back' diff --git a/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java b/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java new file mode 100644 index 0000000..dc3e18b --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/LgePenetrationBackApplication.java @@ -0,0 +1,33 @@ +package com.kri.lge.penetration; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.ApplicationRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; + +@Slf4j +@SpringBootApplication +public class LgePenetrationBackApplication { + + public static void main(String[] args) { + SpringApplication.run(LgePenetrationBackApplication.class, args); + } + + @Bean + ApplicationRunner dsCheck(ApplicationContext ctx) { + return args -> { + String[] names = ctx.getBeanNamesForType(javax.sql.DataSource.class); + log.info("DataSource beans = {}", java.util.Arrays.toString(names)); + for (String n : names) { + Object ds = ctx.getBean(n); + log.info(" - {} = {}", n, ds.getClass().getName()); + if (ds instanceof com.zaxxer.hikari.HikariDataSource hk) { + log.info(" jdbcUrl=" + hk.getJdbcUrl()); + log.info(" driver=" + hk.getDriverClassName()); + } + } + }; + } +} diff --git a/src/main/java/com/kri/lge/penetration/common/cache/StatisticsDbCache.java b/src/main/java/com/kri/lge/penetration/common/cache/StatisticsDbCache.java new file mode 100644 index 0000000..12de5c6 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/common/cache/StatisticsDbCache.java @@ -0,0 +1,78 @@ +package com.kri.lge.penetration.common.cache; + +import com.kri.lge.penetration.persistence.entity.TStatisticsCacheEntity; +import com.kri.lge.penetration.persistence.repository.StatisticsCacheRepository; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class StatisticsDbCache { + + private final StatisticsCacheRepository statisticsCacheRepository; + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void clearStatisticsCache() { + statisticsCacheRepository.deleteAll(); + } + + @Transactional(readOnly = true) + public TStatisticsCacheEntity getStatisticsCache(String cacheKey) { + return statisticsCacheRepository.findById(cacheKey).orElse(null); + } + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void saveStatisticsCache(List cacheList) { + if (cacheList == null || cacheList.isEmpty()) return; + statisticsCacheRepository.saveAll(cacheList); + } + + public String makeResultCacheKey(String requestKey, Map> filterCondition) { + String rk = (requestKey == null) ? "" : requestKey; + + if (filterCondition == null || filterCondition.isEmpty()) { + return rk; + } + + // Map 순회 순서(예: HashMap)가 불안정하면 캐시 키가 흔들리니 key/value 모두 정렬해서 고정 + List keys = new ArrayList<>(filterCondition.keySet()); + Collections.sort(keys); + + StringBuilder sb = new StringBuilder(rk.length() + 64); + sb.append(rk).append('_'); + + boolean firstFilter = true; + for (String k : keys) { + if (!firstFilter) sb.append('|'); + firstFilter = false; + + sb.append(k).append('#'); + + Collection values = filterCondition.get(k); + if (values == null || values.isEmpty()) { + continue; + } + + int[] sorted = values.stream() + .filter(Objects::nonNull) + .mapToInt(Integer::intValue) + .sorted() + .toArray(); + + for (int i = 0; i < sorted.length; i++) { + if (i > 0) sb.append(','); + sb.append(sorted[i]); + } + } + + return sb.toString(); + } +} 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 new file mode 100644 index 0000000..aaa27e2 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/common/cache/VariableCache.java @@ -0,0 +1,30 @@ +package com.kri.lge.penetration.common.cache; + +import com.kri.common.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; +import java.util.Map; +import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class VariableCache extends AbstractMapCache { + + private final StatisticsDbCache statisticsDbCache; + private final VariableRepository variableRepository; + + @Override + protected Map loadFromDb() { + statisticsDbCache.clearStatisticsCache(); + + return variableRepository.findAll().stream() + .collect(Collectors.toMap(TVariableEntity::getVariableId, VariableDto::from)); + } + + public Map getVariableMap() { + return getMap(); + } +} 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 new file mode 100644 index 0000000..3d6f469 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/common/cache/YearCache.java @@ -0,0 +1,27 @@ +package com.kri.lge.penetration.common.cache; + +import com.kri.common.cache.AbstractListCache; +import com.kri.lge.penetration.persistence.repository.YearRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class YearCache extends AbstractListCache { + + private final StatisticsDbCache statisticsDbCache; + private final YearRepository yearRepository; + + @Override + protected List loadFromDb() { + statisticsDbCache.clearStatisticsCache(); + + return yearRepository.findYearList(); + } + + // 기존 메서드명이 필요하면 래핑 + public List getYearList() { + return getList(); + } +} 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 new file mode 100644 index 0000000..6e6f655 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/common/consts/LgePenetrationConst.java @@ -0,0 +1,19 @@ +package com.kri.lge.penetration.common.consts; + +public final class LgePenetrationConst { + + public static final int BATCH_SIZE = 1000; + public static final int ADMIN_ROLE = 9999; + + public static final String EXCEL_ID = "ID"; + + public static final String YEAR_STR = "K연도"; + public static final String YEAR_LABEL_STR = "year"; + public static final String LABEL_STR = "rowLabel"; + public static final String TOTAL_LABEL_STR = "사례수"; + public static final String TOTAL_STR = "total"; + public static final int DECIMAL_POINT = 0; + + private LgePenetrationConst() { + } +} 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 new file mode 100644 index 0000000..f8e3148 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/common/enums/VariableType.java @@ -0,0 +1,34 @@ +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 java.util.Objects; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter(onMethod_ = @JsonValue) +@RequiredArgsConstructor +public enum VariableType implements CodeEnum { + SINGLE(21), + MULTI(31), + RANK(32), + SCALE(22), + NUMERIC(41); + + + private final Integer code; + + @JsonCreator(mode = JsonCreator.Mode.DELEGATING) + public static VariableType fromCode(Integer code) { + if (code == null) { + return null; + } + for (VariableType s : values()) { + if (Objects.equals(s.code, code)) { + return s; + } + } + throw new IllegalArgumentException("Unknown VariableType code: " + code); + } +} diff --git a/src/main/java/com/kri/lge/penetration/controller/AuthController.java b/src/main/java/com/kri/lge/penetration/controller/AuthController.java new file mode 100644 index 0000000..8257c7d --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/controller/AuthController.java @@ -0,0 +1,33 @@ +package com.kri.lge.penetration.controller; + +import com.kri.common.datetime.DateTimeUtil; +import com.kri.common.webmvc.RequestUserContext; +import com.kri.lge.penetration.dto.LoginRequestDto; +import com.kri.lge.penetration.dto.LoginResponseDto; +import com.kri.lge.penetration.service.AuthService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/auth") +@RequiredArgsConstructor +@Tag(name = "Auth", description = "인증 API") +public class AuthController { + + private final AuthService authService; + + @Operation(summary = "로그인 요청") + @PostMapping("/login") + public LoginResponseDto tryLogin( + @Valid @RequestBody LoginRequestDto request + ) { + return authService.tryLogin(request); + } +} diff --git a/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java new file mode 100644 index 0000000..01ed9f8 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/controller/CacheAdminController.java @@ -0,0 +1,62 @@ +package com.kri.lge.penetration.controller; + +import com.kri.common.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; +import com.kri.lge.penetration.dto.VariableDto; +import com.kri.lge.penetration.service.AuthService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/admin-cache") +@RequiredArgsConstructor +@Tag(name = "Admin Cache", description = "캐시 관리 API") +public class CacheAdminController { + + private final YearCache yearCache; + private final VariableCache variableCache; + private final StatisticsDbCache statisticsDbCache; + private final AuthService authService; + + @Operation(summary = "가용 연도 리스트 캐시 조회") + @GetMapping("/year") + public List getYearList() { + return yearCache.getYearList(); + } + + @Operation(summary = "변수 맵 캐시 조회") + @GetMapping("variable") + public Map getVariableMap() { return variableCache.getVariableMap(); } + + @Operation(summary = "가용 연도 리스트 캐시 수동 갱신") + @PostMapping("/year/reload/{adminPw}") + public List reloadYearList(@PathVariable String adminPw) { + if (!authService.isAdmin(adminPw)) { + throw BusinessException.unauthorized("IS_NOT_ADMIN", "권한이 없습니다."); + } + + statisticsDbCache.clearStatisticsCache(); + return yearCache.reload(); + } + + @Operation(summary = "변수 맵 캐시 수동 갱신") + @PostMapping("/variable/reload/{adminPw}") + public Map reloadVariableMap(@PathVariable String adminPw) { + if (!authService.isAdmin(adminPw)) { + throw BusinessException.unauthorized("IS_NOT_ADMIN", "권한이 없습니다."); + } + + statisticsDbCache.clearStatisticsCache(); + return variableCache.reload(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/controller/StatisticsController.java b/src/main/java/com/kri/lge/penetration/controller/StatisticsController.java new file mode 100644 index 0000000..c76121a --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/controller/StatisticsController.java @@ -0,0 +1,35 @@ +package com.kri.lge.penetration.controller; + +import com.kri.lge.penetration.dto.StatisticsRequestDto; +import com.kri.lge.penetration.dto.StatisticsRequestOptionDto; +import com.kri.lge.penetration.dto.StatisticsResponseDto; +import com.kri.lge.penetration.service.StatisticsService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/statistics") +@RequiredArgsConstructor +@Tag(name = "Statistics", description = "통계 API") +public class StatisticsController { + + private final StatisticsService statisticsService; + + @Operation(summary = "통계 처리") + @PostMapping + public StatisticsResponseDto getStatistics( + @Valid @RequestBody StatisticsRequestDto request + ) { + if (request.getOption() == null) { + request.setOption(new StatisticsRequestOptionDto()); + } + + return statisticsService.getStatistics(request); + } +} diff --git a/src/main/java/com/kri/lge/penetration/controller/UploadController.java b/src/main/java/com/kri/lge/penetration/controller/UploadController.java new file mode 100644 index 0000000..77f6a36 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/controller/UploadController.java @@ -0,0 +1,78 @@ +package com.kri.lge.penetration.controller; + +import com.kri.lge.penetration.common.cache.StatisticsDbCache; +import com.kri.lge.penetration.dto.ExcelUploadResultDto; +import com.kri.lge.penetration.dto.ExcelUploadSuccessDto; +import com.kri.lge.penetration.service.UploadService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +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 java.nio.charset.StandardCharsets; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequestMapping("/api/v1/upload") +@RequiredArgsConstructor +@Tag(name = "Upload", description = "업로드 API") +public class UploadController { + + private static final String XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + + private final StatisticsDbCache statisticsDbCache; + private final UploadService uploadService; + + @PostMapping( + value = "/data", + consumes = MediaType.MULTIPART_FORM_DATA_VALUE, + produces = {MediaType.APPLICATION_JSON_VALUE, XLSX} + ) + @Operation(summary = "파일 업로드", description = "성공이면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환") + @ApiResponses({ + @ApiResponse( + responseCode = "200", + description = "성공(JSON) 또는 실패 엑셀(xlsx)", + content = { + @Content( + mediaType = MediaType.APPLICATION_JSON_VALUE, + schema = @Schema(implementation = ExcelUploadSuccessDto.class) + ), + @Content( + mediaType = XLSX, + schema = @Schema(type = "string", format = "binary") + ) + } + ) + }) + public ResponseEntity importData( + @Parameter(description = "업로드 파일", required = true) + @RequestPart("file") MultipartFile file + ) { + statisticsDbCache.clearStatisticsCache(); + + ExcelUploadResultDto result = uploadService.uploadData(file); + if (result.isHasErrorFile()) { + String contentDisposition = "attachment; filename*=UTF-8''" + + java.net.URLEncoder.encode(result.getErrorFileName(), StandardCharsets.UTF_8); + + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition) + .contentType(MediaType.parseMediaType(XLSX)) + .body(result.getErrorFile()); + + } else { + return ResponseEntity.ok(ExcelUploadSuccessDto.from(result)); + } + } +} diff --git a/src/main/java/com/kri/lge/penetration/dto/DataDto.java b/src/main/java/com/kri/lge/penetration/dto/DataDto.java new file mode 100644 index 0000000..435c06a --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/DataDto.java @@ -0,0 +1,22 @@ +package com.kri.lge.penetration.dto; + +import com.kri.lge.penetration.persistence.entity.TDataEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Builder +@AllArgsConstructor +@Schema(description = "응닶 데이터 Dto") +public class DataDto { + + private String dataIdx; + private String sid; + private Map> rawData; +} diff --git a/src/main/java/com/kri/lge/penetration/dto/DataItemDto.java b/src/main/java/com/kri/lge/penetration/dto/DataItemDto.java new file mode 100644 index 0000000..d22a612 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/DataItemDto.java @@ -0,0 +1,36 @@ +package com.kri.lge.penetration.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "변수 데이터 Dto") +public class DataItemDto { + + @Schema(description = "2차원 값") + private Integer m; + + @Schema(description = "순위 값") + private Integer r; + + @Schema(description = "1차원 값(응답값)") + private Double s; + + public static DataItemDto from(Integer m, Integer r, Double s) { + return DataItemDto.builder() + .m(m) + .r(r) + .s(s) + .build(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java new file mode 100644 index 0000000..ce56fab --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadResultDto.java @@ -0,0 +1,37 @@ +package com.kri.lge.penetration.dto; + +import com.kri.common.datetime.DateTimeUtil; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +public class ExcelUploadResultDto extends ExcelUploadSuccessDto { + + @Schema(description = "에러 엑셀 파일이 있는지 여부") + private boolean hasErrorFile; + + @Schema(description = "프론트가 저장용으로 쓸 파일명") + private String errorFileName; + + @Schema(description = "에러 엑셀 파일 (xlsx)") + private byte[] errorFile; + + public static ExcelUploadResultDto of(int totalCount, int successCount, int failCount, byte[] errorFile) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + String fileName = "upload data error_" + now.format(DateTimeUtil.DATETIME_FMT) + ".xlsx"; + + return ExcelUploadResultDto.builder() + .totalCount(totalCount) + .successCount(successCount) + .failCount(failCount) + .hasErrorFile(errorFile != null && errorFile.length > 0) + .errorFileName(fileName) + .errorFile(errorFile) + .build(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/dto/ExcelUploadSuccessDto.java b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadSuccessDto.java new file mode 100644 index 0000000..1eb0559 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/ExcelUploadSuccessDto.java @@ -0,0 +1,30 @@ +package com.kri.lge.penetration.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +public class ExcelUploadSuccessDto { + + @Schema(description = "전체 읽은 행 수 (헤더 제외)") + private int totalCount; + + @Schema(description = "DB에 실제로 insert/update 성공한 개수") + private int successCount; + + @Schema(description = "실패(에러) 개수") + private int failCount; + + public static ExcelUploadSuccessDto from(ExcelUploadResultDto r) { + if (r == null) return null; + return ExcelUploadSuccessDto.builder() + .totalCount(r.getTotalCount()) + .successCount(r.getSuccessCount()) + .failCount(r.getFailCount()) + .build(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/dto/LoginRequestDto.java b/src/main/java/com/kri/lge/penetration/dto/LoginRequestDto.java new file mode 100644 index 0000000..82a9d55 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/LoginRequestDto.java @@ -0,0 +1,17 @@ +package com.kri.lge.penetration.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "사용자 로그인 요청") +public class LoginRequestDto { + + @Schema(description = "사용자 ID") + private String userId; + + @Schema(description = "사용자 PW") + private String userPw; +} diff --git a/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java b/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java new file mode 100644 index 0000000..4a70fcf --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/LoginResponseDto.java @@ -0,0 +1,26 @@ +package com.kri.lge.penetration.dto; + +import com.kri.common.auth.dto.JwtUserClaimsDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "로그인 응답") +public class LoginResponseDto { + + @Schema(description = "jwt access 토큰") + private String accessToken; + + @Schema(description = "사용자 정보") + private JwtUserClaimsDto user; + + public static LoginResponseDto from(String accessToken, JwtUserClaimsDto jwtUserClaims) { + return LoginResponseDto.builder() + .accessToken(accessToken) + .user(jwtUserClaims) + .build(); + } +} + diff --git a/src/main/java/com/kri/lge/penetration/dto/StatisticsRequestDto.java b/src/main/java/com/kri/lge/penetration/dto/StatisticsRequestDto.java new file mode 100644 index 0000000..ed35eea --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/StatisticsRequestDto.java @@ -0,0 +1,38 @@ +package com.kri.lge.penetration.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder(toBuilder = true) +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "통계 요청 Dto") +public class StatisticsRequestDto { + + @NotNull + @NotEmpty + @Schema(description = "변수 ID 맵(Key: 요청 Key, Value: 변수 ID)") + private Map<@NotBlank String, @NotBlank String> variableIdMap; + + @Schema(description = "배너 ID 배열 (1단 배너, 옆으로 붙이기)") + private List<@NotBlank String> bannerIdList; + + @Schema(description = "필터 정보") + private Map<@NotBlank String, @NotEmpty Collection<@NotNull Integer>> filterCondition; + + @Schema(description = "요청 옵션") + @Builder.Default + private StatisticsRequestOptionDto option = new StatisticsRequestOptionDto(); +} diff --git a/src/main/java/com/kri/lge/penetration/dto/StatisticsRequestOptionDto.java b/src/main/java/com/kri/lge/penetration/dto/StatisticsRequestOptionDto.java new file mode 100644 index 0000000..8cd9f1b --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/StatisticsRequestOptionDto.java @@ -0,0 +1,25 @@ +package com.kri.lge.penetration.dto; + +import com.kri.lge.penetration.common.consts.LgePenetrationConst; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +@Schema(description = "통계 요청 옵션 Dto") +public class StatisticsRequestOptionDto { + + @Schema(description = "마지막 연도만 조회") + private boolean useCache = true; + + @Schema(description = "마지막 연도만 조회") + private boolean lastYear = false; + + @Schema(description = "소수점") + private int decimalPoint = LgePenetrationConst.DECIMAL_POINT; +} diff --git a/src/main/java/com/kri/lge/penetration/dto/StatisticsResponseDto.java b/src/main/java/com/kri/lge/penetration/dto/StatisticsResponseDto.java new file mode 100644 index 0000000..60c508e --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/StatisticsResponseDto.java @@ -0,0 +1,24 @@ +package com.kri.lge.penetration.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Builder +@AllArgsConstructor +@Schema(description = "통계 데이터 응답 Dto") +public class StatisticsResponseDto { + + @Schema(description = "통계 데이터(Key: 요청 Key, Value: 결과물)") + private Map>> statisticsDataMap; + + static public StatisticsResponseDto of(Map>> statisticsDataMap) { + return StatisticsResponseDto.builder().statisticsDataMap(statisticsDataMap).build(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/dto/VariableDto.java b/src/main/java/com/kri/lge/penetration/dto/VariableDto.java new file mode 100644 index 0000000..2b54f70 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/VariableDto.java @@ -0,0 +1,56 @@ +package com.kri.lge.penetration.dto; + + +import com.kri.lge.penetration.common.enums.VariableType; +import com.kri.lge.penetration.persistence.entity.TVariableEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + + +@Getter +@Setter +@Builder +@AllArgsConstructor +@Schema(description = "변수 Dto") +public class VariableDto { + + @Schema(description = "변수 ID") + private String variableId; + + @Schema(description = "변수 순서") + private Integer variableOrder; + + @Schema(description = "변수 이름") + private String variableName; + + @Schema(description = "실제 분석에 사용될 QID") + private String targetQid; + + @Schema(description = "변수 차원(여기서는 1,2차원만)") + private Integer variableDimension; + + @Schema(description = "변수 타입(여기선 모두 single)") + private VariableType variableType; + + @Schema(description = "Matrix 값 정보") + private VariableItemInfoDto[] matrixInfo; + + @Schema(description = "Scalar 값 정보") + private VariableItemInfoDto[] scalarInfo; + + public static VariableDto from(TVariableEntity entity) { + return VariableDto.builder() + .variableId(entity.getVariableId()) + .variableOrder(entity.getVariableOrder()) + .variableName(entity.getVariableName()) + .targetQid(entity.getTargetQid()) + .variableDimension(entity.getVariableDimension()) + .variableType(VariableType.fromCode(entity.getVariableType())) + .matrixInfo(entity.getMatrixInfo()) + .scalarInfo(entity.getScalarInfo()) + .build(); + } +} diff --git a/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java b/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java new file mode 100644 index 0000000..48fee0f --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/dto/VariableItemInfoDto.java @@ -0,0 +1,25 @@ +package com.kri.lge.penetration.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Builder +@AllArgsConstructor +@Schema(description = "변수 보기 정보 Dto") +public class VariableItemInfoDto { + + private Integer order; + + private List value; + + private String label; + + @Builder.Default + private boolean useDeny = false; +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/entity/TDataEntity.java b/src/main/java/com/kri/lge/penetration/persistence/entity/TDataEntity.java new file mode 100644 index 0000000..21d2f4f --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/entity/TDataEntity.java @@ -0,0 +1,83 @@ +package com.kri.lge.penetration.persistence.entity; + +import com.kri.lge.penetration.dto.DataItemDto; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.PrePersist; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; + +@Getter +@Setter +@Entity +@Table(name = "t_data") +public class TDataEntity { + + @Id + @Column(name="data_idx", nullable=false, updatable=false, columnDefinition = "char(36)") + private String dataIdx; + + @Size(max = 32) + @Column(name = "sid", nullable = false, length = 32) + private String sid; + + @NotNull + @Column(name = "raw_data", nullable = false) + @JdbcTypeCode(SqlTypes.JSON) + private Map> rawData; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private LocalDateTime regDt; + + @Column(name = "wave", insertable = false, updatable = false) + private Integer wave; + + @Column(name = "product", insertable = false, updatable = false) + private Integer product; + + @Column(name = "life_stage", insertable = false, updatable = false) + private Integer lifeStage; + + @Column(name = "household", insertable = false, updatable = false) + private Integer household; + + @Column(name = "age", insertable = false, updatable = false) + private Integer age; + + @Column(name = "occupancy", insertable = false, updatable = false) + private Integer occupancy; + + @Column(name = "housing", insertable = false, updatable = false) + private Integer housing; + + @Column(name = "house_size", insertable = false, updatable = false) + private Integer houseSize; + + @Column(name = "region", insertable = false, updatable = false) + private Integer region; + + @Column(name = "income", insertable = false, updatable = false) + private Integer income; + + @PrePersist + public void prePersist() { + if (dataIdx == null) dataIdx = java.util.UUID.randomUUID().toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/persistence/entity/TStatisticsCacheEntity.java b/src/main/java/com/kri/lge/penetration/persistence/entity/TStatisticsCacheEntity.java new file mode 100644 index 0000000..fe14742 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/entity/TStatisticsCacheEntity.java @@ -0,0 +1,44 @@ +package com.kri.lge.penetration.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.util.List; +import java.util.Map; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; + +@Getter +@Setter +@Builder +@Entity +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "t_statistics_cache") +public class TStatisticsCacheEntity { + + @Id + @Size(max = 128) + @Column(name = "cache_key", nullable = false, length = 128) + private String cacheKey; + + @NotNull + @JdbcTypeCode(SqlTypes.JSON) + @Column(name = "result_cache", nullable = false) + private List> resultCache; + + public static TStatisticsCacheEntity of(String cacheKey, List> resultCache) { + return TStatisticsCacheEntity.builder() + .cacheKey(cacheKey) + .resultCache(resultCache) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/persistence/entity/TUserEntity.java b/src/main/java/com/kri/lge/penetration/persistence/entity/TUserEntity.java new file mode 100644 index 0000000..237d1df --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/entity/TUserEntity.java @@ -0,0 +1,64 @@ +package com.kri.lge.penetration.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Lob; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; + +@Getter +@Setter +@Entity +@Table(name = "t_user") +public class TUserEntity { + + @Id + @Size(max = 32) + @Column(name = "user_id", nullable = false, length = 32) + private String userId; + + @Size(max = 64) + @NotNull + @Column(name = "user_pw", nullable = false, length = 64) + private String userPw; + + @Size(max = 32) + @NotNull + @Column(name = "user_name", nullable = false, length = 32) + private String userName; + + @Size(max = 32) + @NotNull + @Column(name = "user_cmpn", nullable = false, length = 32) + private String userCmpn; + + @Size(max = 32) + @NotNull + @Column(name = "user_team", nullable = false, length = 32) + private String userTeam; + + @NotNull + @Column(name = "user_role", nullable = false) + private Integer userRole; + + @Lob + @Column(name = "memo") + private String memo; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private LocalDateTime regDt; + +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/persistence/entity/TVariableEntity.java b/src/main/java/com/kri/lge/penetration/persistence/entity/TVariableEntity.java new file mode 100644 index 0000000..971d8ca --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/entity/TVariableEntity.java @@ -0,0 +1,69 @@ +package com.kri.lge.penetration.persistence.entity; + +import com.kri.lge.penetration.dto.VariableItemInfoDto; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.JdbcTypeCode; +import org.hibernate.type.SqlTypes; + +@Getter +@Setter +@Entity +@Table(name = "t_variable") +public class TVariableEntity { + + @Id + @Size(max = 16) + @Column(name = "variable_id", nullable = false, length = 16) + private String variableId; + + @NotNull + @Column(name = "variable_order", nullable = false) + private Integer variableOrder; + + @Size(max = 32) + @NotNull + @Column(name = "variable_name", nullable = false, length = 32) + private String variableName; + + @Size(max = 16) + @Column(name = "target_qid", nullable = false, length = 16) + private String targetQid; + + @NotNull + @ColumnDefault("1") + @Column(name = "variable_dimension", nullable = false) + private Integer variableDimension; + + @NotNull + @ColumnDefault("21") + @Column(name = "variable_type", nullable = false) + private Integer variableType; + + @Column(name = "matrix_info") + @JdbcTypeCode(SqlTypes.JSON) + private VariableItemInfoDto[] matrixInfo; + + @Column(name = "scalar_info") + @JdbcTypeCode(SqlTypes.JSON) + private VariableItemInfoDto[] scalarInfo; + + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32) + private String regUser; + + @NotNull + @ColumnDefault("CURRENT_TIMESTAMP") + @Column(name = "reg_dt", nullable = false) + private LocalDateTime regDt; + +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/persistence/entity/TYearEntity.java b/src/main/java/com/kri/lge/penetration/persistence/entity/TYearEntity.java new file mode 100644 index 0000000..34b5450 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/entity/TYearEntity.java @@ -0,0 +1,19 @@ +package com.kri.lge.penetration.persistence.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@Table(name = "t_year") +public class TYearEntity { + + @Id + @Column(name = "use_year", nullable = false) + private Integer useYear; +} \ No newline at end of file diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepository.java b/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepository.java new file mode 100644 index 0000000..3952c3c --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepository.java @@ -0,0 +1,9 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.kri.lge.penetration.persistence.entity.TDataEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface DataRepository extends JpaRepository, + DataRepositoryCustom { + +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustom.java b/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustom.java new file mode 100644 index 0000000..477117d --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustom.java @@ -0,0 +1,18 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.kri.lge.penetration.dto.DataDto; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public interface DataRepositoryCustom { + List findByFilterConditionsNative( + List waves, + Map> filterCondition, + Set indexKeySet, + Set bannerKeySet, + boolean dropRowsWhenAnyKeyMissingOrNull, // true면 row 자체 제외(요청키 모두 유효해야 통과) + boolean omitNullKeysInJson // true면 JSON 결과에서 null/미존재 키는 아예 빼기 + ); +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustomImpl.java b/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustomImpl.java new file mode 100644 index 0000000..92cc6cb --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/DataRepositoryCustomImpl.java @@ -0,0 +1,166 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kri.lge.penetration.common.consts.LgePenetrationConst; +import com.kri.lge.penetration.dto.DataDto; +import com.kri.lge.penetration.dto.DataItemDto; +import jakarta.persistence.EntityManager; +import jakarta.persistence.Query; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class DataRepositoryCustomImpl implements DataRepositoryCustom { + + private final EntityManager em; + private final ObjectMapper objectMapper; + + private static final Map FILTER_COL_MAP = Map.ofEntries( + Map.entry("product", "product"), + Map.entry("lifeStage", "life_stage"), + Map.entry("household", "household"), + Map.entry("age", "age"), + Map.entry("occupancy", "occupancy"), + Map.entry("housing", "housing"), + Map.entry("houseSize", "house_size"), + Map.entry("region", "region"), + Map.entry("income", "income") + ); + + @Override + public List findByFilterConditionsNative( + List waves, + Map> filterCondition, + Set indexKeySet, + Set bannerKeySet, + boolean dropRowsWhenAnyKeyMissingOrNull, + boolean omitNullKeysInJson + ) { + if (waves == null || waves.isEmpty()) return List.of(); + if (indexKeySet == null || indexKeySet.isEmpty() || bannerKeySet == null || bannerKeySet.isEmpty()) { + throw new IllegalArgumentException("rawKeySet is required for native partial raw_data fetch"); + } + + List waveStr = waves.stream().map(String::valueOf).toList(); + + bannerKeySet.add(LgePenetrationConst.YEAR_STR); + // key별 JSON_EXTRACT 식 만들기 + List bannerKeyList = bannerKeySet.stream().distinct().toList(); + List indexKeyList = indexKeySet.stream().distinct().toList(); + List selectKeyList = Stream.concat(bannerKeyList.stream(), indexKeyList.stream()).distinct().toList(); + + // MySQL JSON path: $."key" (키에 특수문자 대비) + // SQL literal escape: ' -> '' + Function escSqlLiteral = k -> k.replace("'", "''"); + Function jsonPath = k -> "$.\"" + k.replace("\"", "\\\"") + "\""; // 큰따옴표 escape + + // 유효 조건(미존재/JSON null 제외) + Function validExpr = k -> { + String p = jsonPath.apply(k); + return "(JSON_EXTRACT(t.raw_data, '" + p + "') IS NOT NULL " + + "AND JSON_TYPE(JSON_EXTRACT(t.raw_data, '" + p + "')) <> 'NULL')"; + }; + + // SELECT raw_data 부분 + // 1) omitNullKeysInJson=false -> JSON_OBJECT('k1', JSON_EXTRACT(...), ...) + // 2) omitNullKeysInJson=true -> JSON_MERGE_PATCH(IF(valid,k->JSON_OBJECT(...),{}), ...) + String rawSelect; + if (!omitNullKeysInJson) { + + String jsonObjectArgs = selectKeyList.stream() + .map(k -> "'" + escSqlLiteral.apply(k) + "', JSON_EXTRACT(t.raw_data, '" + jsonPath.apply(k) + "')") + .reduce((a, b) -> a + ", " + b) + .orElse(""); + rawSelect = "JSON_OBJECT(" + jsonObjectArgs + ") AS raw_data"; + } else { + // null/미존재 키는 JSON에서 아예 제외 + String mergeArgs = selectKeyList.stream() + .map(k -> "JSON_OBJECT('" + escSqlLiteral.apply(k) + "', JSON_EXTRACT(t.raw_data, '" + jsonPath.apply(k) + "'))") + .reduce((a, b) -> a + ", " + b) + .orElse("JSON_OBJECT()"); + rawSelect = "JSON_MERGE_PATCH(" + mergeArgs + ") AS raw_data"; + } + + StringBuilder sql = new StringBuilder(); + sql.append("SELECT t.data_idx, t.sid, ").append(rawSelect).append("\n") + .append("FROM t_data t\n") + .append("WHERE t.wave IN (:waves)\n"); + + // filterCondition -> 컬럼 IN (...) (화이트리스트 기반) + Map> safeFilters = new LinkedHashMap<>(); + if (filterCondition != null) { + for (var e : filterCondition.entrySet()) { + String reqKey = e.getKey(); + Collection vals = e.getValue(); + if (vals == null || vals.isEmpty()) continue; + + String col = FILTER_COL_MAP.get(reqKey); + if (col == null) continue; + safeFilters.put(reqKey, vals); + + sql.append(" AND t.").append(col).append(" IN (:f_").append(reqKey).append(")\n"); + } + } + + if (dropRowsWhenAnyKeyMissingOrNull) { + for (String k : bannerKeyList) { + sql.append(" AND ").append(validExpr.apply(k)).append("\n"); + } + + String joined = indexKeyList.stream() + .map(validExpr) + .collect(Collectors.joining("\n OR ")); + + sql.append(" AND (\n") + .append(" ") + .append(joined) + .append("\n )\n"); + } + + Query q = em.createNativeQuery(sql.toString()); + q.setParameter("waves", waveStr); + + for (var e : safeFilters.entrySet()) { + q.setParameter("f_" + e.getKey(), e.getValue()); + } + + @SuppressWarnings("unchecked") + List rows = q.getResultList(); + + // 결과 매핑: (data_idx, sid, raw_json) -> DataDto + List out = new ArrayList<>(rows.size()); + for (Object[] r : rows) { + String dataIdx = (String) r[0]; + String sid = (String) r[1]; + + Object rawObj = r[2]; + String rawJson = (rawObj == null) ? "{}" : rawObj.toString(); + + Map> rawMap; + try { + rawMap = objectMapper.readValue(rawJson, new com.fasterxml.jackson.core.type.TypeReference<>() {}); + } catch (Exception ex) { + // 파싱 실패 시 방어 (원인 로깅 권장) + rawMap = Map.of(); + } + + out.add(DataDto.builder() + .dataIdx(dataIdx) // dataIdx 타입에 맞춰 조정 + .sid(sid) + .rawData(rawMap) + .build()); + } + + return out; + } +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/StatisticsCacheRepository.java b/src/main/java/com/kri/lge/penetration/persistence/repository/StatisticsCacheRepository.java new file mode 100644 index 0000000..fa82fc5 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/StatisticsCacheRepository.java @@ -0,0 +1,9 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.kri.lge.penetration.persistence.entity.TStatisticsCacheEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface StatisticsCacheRepository extends JpaRepository, + JpaSpecificationExecutor{ +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/UserRepository.java b/src/main/java/com/kri/lge/penetration/persistence/repository/UserRepository.java new file mode 100644 index 0000000..dea68aa --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/UserRepository.java @@ -0,0 +1,14 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.kri.lge.penetration.persistence.entity.TUserEntity; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface UserRepository extends JpaRepository, + JpaSpecificationExecutor { + + Optional findByUserIdAndUserPw(String userId, String userPw); + + boolean existsByUserRoleAndUserPw(Integer userRole, String userPw); +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/VariableRepository.java b/src/main/java/com/kri/lge/penetration/persistence/repository/VariableRepository.java new file mode 100644 index 0000000..83145f9 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/VariableRepository.java @@ -0,0 +1,10 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.kri.lge.penetration.persistence.entity.TVariableEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface VariableRepository extends JpaRepository, + JpaSpecificationExecutor { + +} diff --git a/src/main/java/com/kri/lge/penetration/persistence/repository/YearRepository.java b/src/main/java/com/kri/lge/penetration/persistence/repository/YearRepository.java new file mode 100644 index 0000000..7b50de3 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/persistence/repository/YearRepository.java @@ -0,0 +1,16 @@ +package com.kri.lge.penetration.persistence.repository; + +import com.kri.lge.penetration.persistence.entity.TYearEntity; +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface YearRepository extends JpaRepository { + + @Query(""" + select y.useYear + from TYearEntity y + order by y.useYear + """) + List findYearList(); +} diff --git a/src/main/java/com/kri/lge/penetration/service/AuthService.java b/src/main/java/com/kri/lge/penetration/service/AuthService.java new file mode 100644 index 0000000..7290d4f --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/service/AuthService.java @@ -0,0 +1,45 @@ +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.lge.penetration.common.consts.LgePenetrationConst; +import com.kri.lge.penetration.dto.LoginRequestDto; +import com.kri.lge.penetration.dto.LoginResponseDto; +import com.kri.lge.penetration.persistence.entity.TUserEntity; +import com.kri.lge.penetration.persistence.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AuthService { + + private final JwtService jwtService; + private final UserRepository userRepository; + + public LoginResponseDto tryLogin(LoginRequestDto request) { + + TUserEntity user = userRepository.findByUserIdAndUserPw(request.getUserId(), + request.getUserPw()) + .orElseThrow(() -> + BusinessException.notFound("USER_NOT_FOUND", "사용자가 없습니다.") + .with("userId", request.getUserId()) + ); + + JwtUserClaimsDto claims = JwtUserClaimsDto.builder() + .userId(user.getUserId()) + .userCmpn(user.getUserCmpn()) + .userName(user.getUserName()) + .userTeam(user.getUserTeam()) + .userRole(user.getUserRole()) + .build(); + + String accessToken = jwtService.generateAccessToken(claims); + return LoginResponseDto.from(accessToken, claims); + } + + public boolean isAdmin(String adminPw) { + return userRepository.existsByUserRoleAndUserPw(LgePenetrationConst.ADMIN_ROLE, adminPw); + } +} diff --git a/src/main/java/com/kri/lge/penetration/service/StatisticsService.java b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java new file mode 100644 index 0000000..8d9c9b3 --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/service/StatisticsService.java @@ -0,0 +1,782 @@ +package com.kri.lge.penetration.service; + +import com.kri.common.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; +import com.kri.lge.penetration.common.consts.LgePenetrationConst; +import com.kri.lge.penetration.common.enums.VariableType; +import com.kri.lge.penetration.dto.DataDto; +import com.kri.lge.penetration.dto.DataItemDto; +import com.kri.lge.penetration.dto.StatisticsRequestDto; +import com.kri.lge.penetration.dto.StatisticsRequestOptionDto; +import com.kri.lge.penetration.dto.StatisticsResponseDto; +import com.kri.lge.penetration.dto.VariableDto; +import com.kri.lge.penetration.dto.VariableItemInfoDto; +import com.kri.lge.penetration.persistence.entity.TStatisticsCacheEntity; +import com.kri.lge.penetration.persistence.repository.DataRepository; +import java.math.BigDecimal; +import java.math.RoundingMode; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.DoubleSummaryStatistics; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class StatisticsService { + + private final YearCache yearCache; + private final VariableCache variableCache; + private final StatisticsDbCache statisticsDbCache; + private final DataRepository dataRepository; + + + private record BannerSpec( + String title, // 예: "QID#1|2" 또는 "TOTAL" + String qid, // 예: "QID" (TOTAL이면 null) + List values // TOTAL이면 null + ) { + boolean isTotal() { + return values == null; + } + } + + private record BannerCondition( + String qid, + int[] values + ) {} + + private record BannerRuntime( + String title, + boolean total, + List conditions + ) {} + + private record YearSidIndex( + Map sidToId, + int sidCount + ) {} + + @Transactional(readOnly = true) + public StatisticsResponseDto getStatistics(StatisticsRequestDto request) { + Map variableMap = variableCache.getVariableMap(); + List yearList = getFilteredYearList(request.getOption()); + + validateCache(yearList, variableMap); + + Map>> cacheDataMap = new HashMap<>(); + + Map remainingVariableIdMap = new HashMap<>(request.getVariableIdMap()); + + if(request.getOption().isUseCache()) { + for (Map.Entry e : request.getVariableIdMap().entrySet()) { + String requestKey = e.getKey(); + + String cacheKey = statisticsDbCache.makeResultCacheKey(requestKey, + request.getFilterCondition()); + TStatisticsCacheEntity cache = statisticsDbCache.getStatisticsCache(cacheKey); + + if (cache != null) { + cacheDataMap.put(requestKey, cache.getResultCache()); + remainingVariableIdMap.remove(requestKey); // 집계 대상에서 제외 + } + } + + // 전부 캐시에 존재하면 DB 조회/집계 불필요 + if (remainingVariableIdMap.isEmpty()) { + return StatisticsResponseDto.of(cacheDataMap); + } + } + + StatisticsRequestDto remainingRequest = request.toBuilder() + .variableIdMap(remainingVariableIdMap) + .build(); + + List> bannerSpecsList = buildBannerSpecs(remainingRequest.getBannerIdList(), variableMap); + + Set indexKeySet = getTargetQids(variableMap, remainingRequest.getVariableIdMap()); + Set bannerKeySet = getTargetQids(bannerSpecsList); + + List dataList = fetchDataListNative(yearList, remainingRequest.getFilterCondition(), indexKeySet, bannerKeySet); + + Map>> statisticsDataMap = processStatistics( + remainingRequest, yearList, variableMap, bannerSpecsList, dataList + ); + + // 캐시 저장 + if(request.getOption().isUseCache()){ + List cacheDataList = new ArrayList<>(); + for (Map.Entry>> e : statisticsDataMap.entrySet()) { + String cacheKey = statisticsDbCache.makeResultCacheKey(e.getKey(), + request.getFilterCondition()); + + List> result = e.getValue(); + + cacheDataList.add(TStatisticsCacheEntity.of(cacheKey, result)); + } + + if(!cacheDataList.isEmpty()){ + statisticsDbCache.saveStatisticsCache(cacheDataList); + } + } + + //캐시랑 결과 합치기 + if(!cacheDataMap.isEmpty()){ + statisticsDataMap.putAll(cacheDataMap); + } + + return StatisticsResponseDto.of(statisticsDataMap); + } + + private List getFilteredYearList(StatisticsRequestOptionDto option) { + List yearList = yearCache.getYearList(); + + if (option.isLastYear()) { + Integer maxYear = + (yearList == null) ? null : yearList.stream().max(Integer::compareTo).orElse(null); + return (maxYear != null) ? List.of(maxYear) : List.of(); + } + + return yearList; + } + + private Set getTargetQids( + Map variableMap, + Map indexMap + ) { + return indexMap.values().stream() + .map(variableMap::get) + .filter(Objects::nonNull) + .map(VariableDto::getTargetQid) + .filter(Objects::nonNull) + .collect(Collectors.toSet()); + } + + private Set getTargetQids( + List> bannerSpecsList + ) { + return bannerSpecsList.stream() + .filter(Objects::nonNull) + .flatMap(List::stream) // List -> BannerSpec + .filter(Objects::nonNull) + .filter(spec -> !spec.isTotal()) + .map(BannerSpec::qid) + .collect(Collectors.toSet()); + } + + private List> buildBannerSpecs(List bannerIdList, Map variableMap) { + List> specs = new ArrayList<>(); + List totalSpecs = new ArrayList<>(); + + totalSpecs.add(new BannerSpec(LgePenetrationConst.TOTAL_STR, null, null)); + specs.add(totalSpecs); + + if (bannerIdList == null || bannerIdList.isEmpty()) { + return specs; + } + + for (String bannerId : bannerIdList) { + String[] bannerIds = bannerId.split("\\|"); // split 수정 + + List> choicesPerBId = new ArrayList<>(); + + for (String bId : bannerIds) { + VariableDto v = variableMap.get(bId); // get 수정 + if (v == null || v.getScalarInfo() == null) continue; + + String qid = v.getTargetQid(); + List choices = new ArrayList<>(); + + for (VariableItemInfoDto scalar : v.getScalarInfo()) { + if (scalar == null) continue; + List vals = scalar.getValue(); + if (vals == null || vals.isEmpty()) continue; + + String vars = vals.stream().map(String::valueOf).collect(Collectors.joining("|")); + String title = "%s#%s".formatted(qid, vars); + + choices.add(new BannerSpec(title, qid, vals)); + } + + if (!choices.isEmpty()) choicesPerBId.add(choices); + } + + if (choicesPerBId.isEmpty()) continue; + + List topChoices = choicesPerBId.get(0); // 상위(첫 번째 bId) + List> restCombos = + (choicesPerBId.size() == 1) + ? List.of(List.of()) + : crossBanner(choicesPerBId.subList(1, choicesPerBId.size())); + + // 원하는 출력: + // [{Q1,1}] + // [{Q1,1},{Q2,1}] ... + for (BannerSpec top : topChoices) { + specs.add(List.of(top)); // 서머리(상위만) + + for (List rest : restCombos) { + List combo = new ArrayList<>(1 + rest.size()); + combo.add(top); + combo.addAll(rest); + specs.add(combo); + } + } + } + + return specs; + } + + private static List> crossBanner(List> lists) { + List> result = new ArrayList<>(); + result.add(new ArrayList<>()); + + for (List choices : lists) { + List> next = new ArrayList<>(); + for (List base : result) { + for (BannerSpec c : choices) { + List merged = new ArrayList<>(base); + merged.add(c); + next.add(merged); + } + } + result = next; + } + return result; + } + + public List fetchDataListNative( + List waves, + Map> filterCondition, + Set indexKeySet, + Set bannerKeySet + ) { + return dataRepository.findByFilterConditionsNative( + waves, + filterCondition, + indexKeySet, + bannerKeySet, + true, // dropRowsWhenAnyKeyMissingOrNull + true // omitNullKeysInJson + ); + } + + private Map>> processStatistics( + StatisticsRequestDto request, + List yearList, + Map variableMap, + List> bannerSpecsList, + List dataList + ) { + Map>> statisticsDataMap = new HashMap<>(); + int decimalPoint = request.getOption().getDecimalPoint(); + + // banner spec -> runtime (values를 int[]로 변환해 hasValue 의미(OR)를 빠르게 재현) + List bannerRuntimes = new ArrayList<>(); + for (List bannerSpecs : bannerSpecsList) { + boolean total = bannerSpecs.get(0).isTotal(); + List bannerTitle = new ArrayList<>(); + List bannerConditions = new ArrayList<>(); + + if(total){ + bannerRuntimes.add(new BannerRuntime(bannerSpecs.get(0).title(), true, bannerConditions)); + } + else{ + for(BannerSpec s : bannerSpecs){ + if (s == null) continue; + + bannerTitle.add(s.title()); + bannerConditions.add(new BannerCondition(s.qid(), toIntArray(s.values()))); + } + + bannerRuntimes.add(new BannerRuntime(String.join("|", bannerTitle), false, bannerConditions)); + } + } + + request.getVariableIdMap().forEach((requestKey, variableId) -> { + VariableDto indexVariable = variableMap.get(variableId); + + if (indexVariable == null) { + statisticsDataMap.computeIfAbsent(requestKey, k -> new ArrayList<>()).addAll(new ArrayList<>()); + return; + } + + String indexQid = indexVariable.getTargetQid(); + Set denyIndexValueSet = getDenyIndexValueSet(indexVariable); + VariableType indexVariableType = indexVariable.getVariableType(); + + List variableData = filterDataByVariable(dataList, indexQid, denyIndexValueSet); + + VariableItemInfoDto[] indexScalar = filterVariableScalarInfo( + indexVariable.getScalarInfo(), variableData, indexQid + ); + + // year별 bucket을 1회 구성 (주의: YEAR_STR이 다중 값이면 한 row가 여러 year bucket에 들어갈 수 있게 OR 유지) + Map> byYear = bucketByYear(variableData, yearList); + + // categorical이면 code -> scalarMask(bitset)를 1회 준비 (scalar 평균 10개라 long 마스크로 충분) + Map codeToScalarMask = + (indexVariableType == VariableType.NUMERIC) ? Collections.emptyMap() : buildCodeToScalarMask(indexScalar); + + for (Integer year : yearList) { + List yearRows = byYear.getOrDefault(year, List.of()); + + List> statisticsData = + initializeStatisticsData(year, indexVariableType, indexScalar); + + // 연도 단위로 sid -> id 매핑을 만들어서 per-banner 중복 제거(=distinct sid) 비용을 배열로 처리 + YearSidIndex sidIndex = buildSidIndex(yearRows); + + // per-banner 스캔에 재사용할 워크 배열(배너마다 reset) + boolean[] inBanner = new boolean[sidIndex.sidCount]; + int[] touchedInBanner = new int[sidIndex.sidCount]; + int touchedInBannerN; + + long[] sidScalarMask = (indexVariableType == VariableType.NUMERIC) ? null : new long[sidIndex.sidCount]; + int[] touchedMask = (indexVariableType == VariableType.NUMERIC) ? null : new int[sidIndex.sidCount]; + int touchedMaskN; + + boolean[] numericSeen = (indexVariableType == VariableType.NUMERIC) ? new boolean[sidIndex.sidCount] : null; + int[] touchedNumeric = (indexVariableType == VariableType.NUMERIC) ? new int[sidIndex.sidCount] : null; + int touchedNumericN; + + for (BannerRuntime banner : bannerRuntimes) { + touchedInBannerN = 0; + touchedMaskN = 0; + touchedNumericN = 0; + + // 배너 1개당: yearRows를 1회 스캔하며 + // - 배너 분모(=distinct sid) + // - categorical: scalar별 distinct sid 카운트(전체 scalar를 동시에) + // - numeric: 기존 summarizeData의 "sid별 최초 값 1개" 규칙대로 stats + int bannerSidCount = 0; + + long[] scalarCounts = (indexVariableType == VariableType.NUMERIC) ? null : new long[indexScalar.length]; + DoubleSummaryStatistics numericStats = (indexVariableType == VariableType.NUMERIC) ? new DoubleSummaryStatistics() : null; + + for (DataDto row : yearRows) { + if (row == null) continue; + + // banner match (기존 filterBannerData + hasValue 의미와 동일) + if (!banner.total && !rowHasAnyRoundedValue(row, banner.conditions())) { + continue; + } + + String sid = row.getSid(); + if (sid == null) { + // 기존 distinct sid에서는 제외되므로 여기서도 제외 + continue; + } + + Integer sidId = sidIndex.sidToId.get(sid); + if (sidId == null) { + continue; + } + + // 분모 distinct sid + if (!inBanner[sidId]) { + inBanner[sidId] = true; + touchedInBanner[touchedInBannerN++] = sidId; + bannerSidCount++; + } + + if (indexVariableType == VariableType.NUMERIC) { + // 기존 summarizeData와 동일: sid별로 "최초로 발견되는 non-null s"만 반영 + // (값이 null인 row는 sid를 '소비'하지 않음: 나중 row에서 값이 발견되면 반영) + if (!numericSeen[sidId]) { + Double v = firstNonNullDoubleInRow(row, indexQid); + if (v != null) { + numericSeen[sidId] = true; + touchedNumeric[touchedNumericN++] = sidId; + numericStats.accept(v); + } + } + } else { + // categorical: row 내 indexQid의 모든 item을 읽어 scalarMask 누적(=hasValue OR 의미 유지) + List items = safeItems(row, indexQid); + if (items == null || items.isEmpty()) continue; + + for (DataItemDto it : items) { + if (it == null || it.getS() == null) continue; + int code = (int) Math.round(it.getS()); + + Long m = codeToScalarMask.get(code); + if (m == null || m == 0L) continue; + + long before = sidScalarMask[sidId]; + long add = m & ~before; + if (add == 0L) continue; + + if (before == 0L) { + touchedMask[touchedMaskN++] = sidId; + } + sidScalarMask[sidId] = before | m; + + // add에 포함된 bit(=scalar index)만 카운트 증가 + while (add != 0L) { + int bit = Long.numberOfTrailingZeros(add); + if (bit < scalarCounts.length) { + scalarCounts[bit]++; + } + add &= (add - 1); + } + } + } + } + + // row0: TOTAL 카운트(기존과 동일: countDistinctSid(bannerData)) + statisticsData.get(0).put(banner.title, String.valueOf(bannerSidCount)); + + if (indexVariableType == VariableType.NUMERIC) { + // 기존 calculateNumericStatistics와 동일: bannerData empty면 "0", 아니면 summarizeData 결과 출력 + if (bannerSidCount == 0) { + statisticsData.get(1).put(banner.title, "0"); + statisticsData.get(2).put(banner.title, "0"); + statisticsData.get(3).put(banner.title, "0"); + } else { + statisticsData.get(1).put(banner.title, toScaledString(numericStats.getAverage(), decimalPoint)); + statisticsData.get(2).put(banner.title, toScaledString(numericStats.getMax(), decimalPoint)); + statisticsData.get(3).put(banner.title, toScaledString(numericStats.getMin(), decimalPoint)); + } + } else { + // 기존 calculateCategoricalStatistics + calculateFrequency와 동일 + for (int i = 0; i < indexScalar.length; i++) { + int rowIdx = i + 1; + + BigDecimal freq; + long matchCount = scalarCounts[i]; + if (bannerSidCount == 0 || matchCount == 0L) { + freq = BigDecimal.ZERO; + } + else{ + freq = BigDecimal.valueOf(matchCount) + .multiply(BigDecimal.valueOf(100)) + .divide(BigDecimal.valueOf(bannerSidCount), decimalPoint + 4, RoundingMode.HALF_UP); + } + statisticsData.get(rowIdx).put(banner.title, toScaledString(freq, decimalPoint)); + } + } + + // reset arrays for next banner (touched만 초기화) + for (int i = 0; i < touchedInBannerN; i++) { + inBanner[touchedInBanner[i]] = false; + } + if (indexVariableType == VariableType.NUMERIC) { + for (int i = 0; i < touchedNumericN; i++) { + numericSeen[touchedNumeric[i]] = false; + } + } else { + for (int i = 0; i < touchedMaskN; i++) { + sidScalarMask[touchedMask[i]] = 0L; + } + } + } + + statisticsDataMap.computeIfAbsent(requestKey, k -> new ArrayList<>()) + .addAll(statisticsData); + } + }); + + return statisticsDataMap; + } + + private Map> bucketByYear(List variableData, List yearList) { + Map> out = new HashMap<>(); + for (Integer y : yearList) { + out.put(y, new ArrayList<>()); + } + + for (DataDto row : variableData) { + if (row == null) continue; + + // YEAR_STR item들 중 하나라도 해당 year면 그 year bucket에 포함(기존 hasValue 의미) + List items = safeItems(row, LgePenetrationConst.YEAR_STR); + if (items == null || items.isEmpty()) continue; + + for (Integer y : yearList) { + if (y == null) continue; + if (itemsContainRoundedInt(items, y)) { + out.get(y).add(row); + } + } + } + return out; + } + + private boolean itemsContainRoundedInt(List items, int target) { + for (DataItemDto it : items) { + if (it == null || it.getS() == null) continue; + int v = (int) Math.round(it.getS()); + if (v == target) return true; + } + return false; + } + + private boolean rowHasAnyRoundedValue(DataDto data, List bannerConditions) { + if (data == null || bannerConditions.isEmpty()) return false; + + for (BannerCondition bc : bannerConditions) { + List items = safeItems(data, bc.qid()); + if (items == null || items.isEmpty()) return false; + + boolean matchedThisCondition = false; + + for (DataItemDto it : items) { + if (it == null || it.getS() == null) continue; + + int v = (int) Math.round(it.getS()); + + for (int t : bc.values()) { + if (v == t) { + matchedThisCondition = true; + break; + } + } + if (matchedThisCondition) break; + } + + // 이 조건(bc)에서 한 번도 매칭이 안 됐으면 AND 실패 + if (!matchedThisCondition) return false; + } + + // 모든 조건을 통과 + return true; + } + + private Double firstNonNullDoubleInRow(DataDto row, String qid) { + List items = safeItems(row, qid); + if (items == null || items.isEmpty()) return null; + for (DataItemDto it : items) { + if (it != null && it.getS() != null) { + return it.getS(); // 기존 summarizeData는 첫 non-null s를 사용 + } + } + return null; + } + + private List safeItems(DataDto row, String qid) { + if (row == null || qid == null) return Collections.emptyList(); + Map> raw = row.getRawData(); + if (raw == null) return Collections.emptyList(); + return raw.get(qid); + } + + private int[] toIntArray(List list) { + if (list == null || list.isEmpty()) return new int[0]; + int[] out = new int[list.size()]; + int n = 0; + for (Integer v : list) { + if (v == null) continue; + out[n++] = v; + } + return (n == out.length) ? out : Arrays.copyOf(out, n); + } + + private YearSidIndex buildSidIndex(List rows) { + Map sidToId = new HashMap<>(); + + for (DataDto r : rows) { + if (r == null || r.getSid() == null) continue; + + sidToId.computeIfAbsent(r.getSid(), k -> sidToId.size()); + } + return new YearSidIndex(sidToId, sidToId.size()); + } + + private Map buildCodeToScalarMask(VariableItemInfoDto[] scalarInfo) { + if (scalarInfo == null || scalarInfo.length == 0) return Collections.emptyMap(); + if (scalarInfo.length > 62) { + // 현재 데이터(평균 10개)에서는 여기 안 탐. 필요하면 BitSet 버전으로 확장하면 됨. + throw new IllegalStateException("scalar size too large for long mask: " + scalarInfo.length); + } + + Map out = new HashMap<>(); + for (int i = 0; i < scalarInfo.length; i++) { + VariableItemInfoDto info = scalarInfo[i]; + if (info == null) continue; + + List codes = info.getValue(); + if (codes == null || codes.isEmpty()) continue; + + long bit = 1L << i; + for (Integer c : codes) { + if (c == null) continue; + out.merge(c, bit, (a, b) -> a | b); + } + } + return out; + } + + // ===== 기존 코드(일부는 그대로 재사용) ===== + private List filterDataByVariable(List dataList, String indexQid, Set denyIndexValueSet) { + return dataList.stream() + .filter(data -> data.getRawData() != null && data.getRawData().containsKey(indexQid)) + .filter(d -> { + List items = d.getRawData().get(indexQid); + if (items == null || items.isEmpty()) return false; // indexQid 값이 없으면 제외(원하면 true로 변경) + + // s(Double) -> int로 보고 비교 (예: 7.0) + List values = items.stream() + .map(DataItemDto::getS) + .filter(Objects::nonNull) + .map(Double::intValue) + .toList(); + + if (values.isEmpty()) return false; // 유효값 없으면 제외(원하면 true로 변경) + + boolean allDenied = denyIndexValueSet.containsAll(values); + return !allDenied; // 전부 deny면 제외, 하나라도 allow면 통과 + }) + .toList(); + } + + private Set getDenyIndexValueSet(VariableDto indexVariable){ + return Arrays.stream(indexVariable.getScalarInfo()) + .filter(VariableItemInfoDto::isUseDeny) + .map(VariableItemInfoDto::getValue) + .filter(Objects::nonNull) + .flatMap(List::stream) + .collect(Collectors.toSet()); + } + + private VariableItemInfoDto[] filterVariableScalarInfo( + VariableItemInfoDto[] scalarInfo, + List variableData, + String indexQid + ) { + if (scalarInfo == null || scalarInfo.length == 0) { + return new VariableItemInfoDto[0]; + } + + Set sValueSet = extractDistinctSValues(variableData, indexQid); + if (sValueSet.isEmpty()) { + return new VariableItemInfoDto[0]; + } + + return Arrays.stream(scalarInfo) + .filter(Objects::nonNull) + .filter(info -> containsAny(info.getValue(), sValueSet)) + .toArray(VariableItemInfoDto[]::new); + } + + private boolean containsAny(List values, Set sValueSet) { + if (values == null || values.isEmpty()) { + return false; + } + for (Integer v : values) { + if (v != null && sValueSet.contains(v)) { + return true; + } + } + return false; + } + + private Set extractDistinctSValues(List variableData, String indexQid) { + Set out = new HashSet<>(); + + for (DataDto d : variableData) { + if (d != null && d.getRawData() != null && d.getRawData().containsKey(indexQid)) { + for (DataItemDto item : d.getRawData().get(indexQid)) { + if (item != null && item.getS() != null) { + out.add(item.getS().intValue()); + } + } + } + } + + return out; + } + + private List> initializeStatisticsData( + Integer year, + VariableType variableType, + VariableItemInfoDto[] scalarInfo + ) { + + int listSize = resolveListSize(variableType, scalarInfo); + List> statisticsData = makeMapList(listSize + 1); + String yearStr = year.toString(); + + statisticsData.get(0).put(LgePenetrationConst.YEAR_LABEL_STR, yearStr); + statisticsData.get(0).put(LgePenetrationConst.LABEL_STR, LgePenetrationConst.TOTAL_LABEL_STR); + + if (variableType == VariableType.NUMERIC) { + initializeNumericLabels(statisticsData, yearStr); + } else { + initializeCategoricalLabels(statisticsData, yearStr, Objects.requireNonNull(scalarInfo)); + } + + return statisticsData; + } + + private int resolveListSize(VariableType type, VariableItemInfoDto[] scalarInfo) { + if (type == VariableType.NUMERIC) { + return 3; + } + return scalarInfo.length; + } + + private void initializeNumericLabels(List> statisticsData, String yearStr) { + statisticsData.get(1).put(LgePenetrationConst.YEAR_LABEL_STR, yearStr); + statisticsData.get(1).put(LgePenetrationConst.LABEL_STR, "MEAN"); + statisticsData.get(2).put(LgePenetrationConst.YEAR_LABEL_STR, yearStr); + statisticsData.get(2).put(LgePenetrationConst.LABEL_STR, "MAX"); + statisticsData.get(3).put(LgePenetrationConst.YEAR_LABEL_STR, yearStr); + statisticsData.get(3).put(LgePenetrationConst.LABEL_STR, "MIN"); + } + + private void initializeCategoricalLabels( + List> statisticsData, + String yearStr, + VariableItemInfoDto[] scalarInfo + ) { + for (int i = 0; i < scalarInfo.length; i++) { + int rowIdx = i + 1; + statisticsData.get(rowIdx).put(LgePenetrationConst.YEAR_LABEL_STR, yearStr); + statisticsData.get(rowIdx).put(LgePenetrationConst.LABEL_STR, scalarInfo[i].getLabel()); + } + } + + private List> makeMapList(int size) { + if (size < 0) { + throw new IllegalArgumentException("size must be >= 0: " + size); + } + + List> list = new ArrayList<>(size); + for (int i = 0; i < size; i++) { + list.add(new LinkedHashMap<>()); + } + return list; + } + + private static String toScaledString(BigDecimal v, int dp) { + return v.setScale(dp, RoundingMode.HALF_UP).toPlainString(); + } + + private static String toScaledString(double v, int scale) { + return BigDecimal.valueOf(v).setScale(scale, RoundingMode.HALF_UP).toPlainString(); + } + + private void validateCache(List yearList, Map variableMap) { + if (yearList == null || yearList.isEmpty()) { + throw BusinessException.internalError("NOT_LOAD_YEAR_LIST", "가용 연도가 로드 되지 못 했습니다."); + } + + if (variableMap == null || variableMap.isEmpty()) { + throw BusinessException.internalError("NOT_LOAD_VARIABLE_MAP", "변수 정보가 로드 되지 못 했습니다."); + } + } +} diff --git a/src/main/java/com/kri/lge/penetration/service/UploadService.java b/src/main/java/com/kri/lge/penetration/service/UploadService.java new file mode 100644 index 0000000..09b98fa --- /dev/null +++ b/src/main/java/com/kri/lge/penetration/service/UploadService.java @@ -0,0 +1,256 @@ +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.EXCEL_ID; + +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 java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +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.web.multipart.MultipartFile; + +@Log4j2 +@Service +@RequiredArgsConstructor +public class UploadService { + + @PersistenceContext + private EntityManager em; + private final ObjectMapper objectMapper; + private final DataRepository dataRepository; + + public ExcelUploadResultDto uploadData(MultipartFile file){ + try (InputStream in = file.getInputStream()) { + List buffer = new ArrayList<>(BATCH_SIZE); + List> failRows = new ArrayList<>(); + + AtomicInteger total = new AtomicInteger(); + AtomicInteger success = new AtomicInteger(); + AtomicInteger fail = new AtomicInteger(); + + final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + final String regUser = "system"; + + ExcelMapper.readStreaming(in, (row, rowIndex) -> { + total.incrementAndGet(); + + ParsedRow parsed = parseRowToEntity(row, regUser, now); + if (parsed.reason != null) { + fail.incrementAndGet(); + failRows.add(buildFailRow(row, rowIndex, parsed.reason)); + return; + } + + buffer.add(new RowContext(rowIndex, row, parsed.entity)); + + if (buffer.size() >= BATCH_SIZE) { + flushBuffer(buffer, success, fail, failRows); + } + }); + + if (!buffer.isEmpty()) { + 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()); + } + } + + private void flushBuffer( + List buffer, + AtomicInteger success, + AtomicInteger fail, + List> failRows + ) { + try { + List entities = buffer.stream().map(rc -> rc.entity).toList(); + + 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))); + } + } + } finally { + em.clear(); + buffer.clear(); + } + } + + private ParsedRow parseRowToEntity( + Map row, + String regUser, + LocalDateTime regDt + ) { + if (row == null || row.isEmpty()) { + 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) 누락"); + } + if (sid.length() > 32) { + 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에 안 넣음 + } + + Double s = parseDoubleLoose(v); + if (s == null) { + return ParsedRow.fail("숫자 파싱 실패: key=" + key + ", value=" + safe(v)); + } + + if(key.contains("#")){ + key = key.substring(0,key.indexOf("#")); + } + 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); + + return ParsedRow.ok(entity); + } + + private Map buildFailRow(Map row, int rowIndex, String reason) { + // 에러 엑셀에 행번호/사유를 앞에 고정 컬럼으로 넣고, 원본 컬럼들도 같이 싣는다 + Map m = new LinkedHashMap<>(); + m.put("rowIndex", String.valueOf(rowIndex)); + m.put("reason", reason); + if (row != null) { + m.putAll(row); + } + return m; + } + + private byte[] toXlsx(List> failRows) { + Workbook wb = ExcelMapper.writeFromMapList(failRows); + try (wb; ByteArrayOutputStream bos = new ByteArrayOutputStream()) { + wb.write(bos); + return bos.toByteArray(); + } catch (Exception e) { + throw new RuntimeException("에러 엑셀(byte[]) 생성 실패", e); + } + } + + 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); + } + } + + 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); + } catch (NumberFormatException e) { + return null; + } + } + + private static String firstNonBlank(String... values) { + if (values == null) return null; + for (String v : values) { + if (v != null && !v.isBlank()) return v.trim(); + } + return null; + } + + private static String safe(String s) { + return s == null ? "null" : s; + } + + private record RowContext( + int rowIndex, + Map rawRow, + TDataEntity entity + ) {} + + private record ParsedRow( + TDataEntity entity, + String reason + ) { + static ParsedRow ok(TDataEntity entity) { + return new ParsedRow(entity, null); + } + + static ParsedRow fail(String reason) { + return new ParsedRow(null, reason); + } + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 0000000..319848b --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,7 @@ +spring: + datasource: + #private 도메인 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true + username: kri_contact + password: contact#51304 + 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 new file mode 100644 index 0000000..35327f4 --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,25 @@ +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 + driver-class-name: com.mysql.cj.jdbc.Driver + + jpa: + hibernate: + ddl-auto: none # 필요에 따라 update / validate 등으로 변경 + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + format_sql: true + show_sql: false + generate_statistics: true + open-in-view: false + +logging: + level: + org.hibernate.SQL: DEBUG + 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-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 0000000..319848b --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,7 @@ +spring: + datasource: + #private 도메인 + url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_kri_contact?characterEncoding=UTF-8&rewriteBatchedStatements=true + username: kri_contact + password: contact#51304 + driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..87b0ec0 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,58 @@ +server: + port: 6101 + forward-headers-strategy: framework + tomcat: + max-http-form-post-size: 50MB + max-swallow-size: -1 + +spring: + application: + name: lge-penetration-back + jpa: + properties: + hibernate: + jdbc: + batch_size: 1000 + order_inserts: true + order_updates: true + + profiles: + # 아무 설정 없을 때 기본으로 쓸 프로파일 + default: local + + servlet: + multipart: + max-file-size: 50MB + max-request-size: 50MB + +logging: + file: + path: ./logs + +kri: + security: + enabled: true + public-paths: # 인증 없이 열어둘 URL + - /v3/api-docs/** + - /swagger-ui.html + - /swagger-ui/** + - /ping + - /api/v1/auth/login + - /api/v1/admin-cache/** + + swagger: + enabled: true + title: "LGE CX Dash" + description: "LGE 가전 보급률 Dashboard" + version: "v1.0.0" + base-package: "com.kri.lge.penetration" + +common: + web: + enabled: true # 공통 Web 구성 사용 여부 (기본 true) + webmvc: + enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true) + redis: + enabled: false # RedisQueueHelper 사용 시 true + scheduling: + enabled: true # @Scheduled 사용 시 true \ No newline at end of file diff --git a/src/test/java/com/kri/lge/penetration/LgePenetrationBackApplicationTests.java b/src/test/java/com/kri/lge/penetration/LgePenetrationBackApplicationTests.java new file mode 100644 index 0000000..fe10321 --- /dev/null +++ b/src/test/java/com/kri/lge/penetration/LgePenetrationBackApplicationTests.java @@ -0,0 +1,13 @@ +package com.kri.lge.penetration; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class LgePenetrationBackApplicationTests { + + @Test + void contextLoads() { + } + +}