Compare commits
17 Commits
ad1c445f5b
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
| 2a684bf401 | |||
| 324ba3a1ca | |||
| 8a889c71af | |||
| 7b30f4161a | |||
| 4361a42aca | |||
| 0aff805596 | |||
| 4b080ec725 | |||
| 0a6246964b | |||
| d643295441 | |||
| 801bc61783 | |||
| 84551d22de | |||
| a60cf5efd9 | |||
| 0904804036 | |||
| 4e977e5f49 | |||
| 70a6538378 | |||
| 844d098f8a | |||
| a30f7d09d4 |
21
.agent/profile.yml
Normal file
21
.agent/profile.yml
Normal file
@@ -0,0 +1,21 @@
|
||||
schema_version: 1
|
||||
|
||||
project:
|
||||
id: lge-cx-dash-back
|
||||
name: LGE CX Dashboard Backend
|
||||
type: requested-project
|
||||
layer: backend
|
||||
legacy: false
|
||||
|
||||
stack:
|
||||
- java-springboot
|
||||
|
||||
shared_contracts:
|
||||
consumes:
|
||||
- kri-common
|
||||
|
||||
databases:
|
||||
- id: lge-cx
|
||||
engine: mysql
|
||||
role: primary-survey-statistics-data
|
||||
access: read-write
|
||||
21
.agent/project.md
Normal file
21
.agent/project.md
Normal file
@@ -0,0 +1,21 @@
|
||||
## LGE CX Dashboard Backend Repository Rules
|
||||
|
||||
### Deliverable and Domain
|
||||
|
||||
- This Spring Boot backend serves the LGE appliance penetration, purchase, category, profile, and trend dashboard.
|
||||
- Treat approved planning material and acceptance criteria as the scope boundary. Preserve year, category, variable, filter, calculation, and response semantics used by the frontend.
|
||||
- Statistics endpoints, Excel upload, persisted survey data, variable/year metadata, and statistics cache behavior form one coordinated data contract.
|
||||
- Do not infer a new statistic, category mapping, aggregation rule, or visualization requirement from source names alone.
|
||||
|
||||
### Statistics, Upload, and Cache Safety
|
||||
|
||||
- Preserve denominators, weighting, missing values, category membership, ordering, decimal precision, rounding, totals, and cache-key semantics when changing a statistic.
|
||||
- Validate Excel structure, headers, cell types, file size, and partial-failure behavior at the upload boundary. Never use customer source data as an unrestricted test fixture.
|
||||
- Keep cache invalidation explicit when uploaded data, variables, years, or calculation behavior changes.
|
||||
- Preserve backward-compatible request and response shapes so frontend and backend can deploy independently.
|
||||
|
||||
### Shared Library and Verification
|
||||
|
||||
- Consume `com.kri.common:starter:beta.1.6.3` and use public `com.kri.common.feature.*` APIs. Do not duplicate a KriCommon feature locally.
|
||||
- `AGENTS.md` and `CLAUDE.md` are generated. Edit `.agent/profile.yml` or `.agent/project.md`, then recompose instead of editing generated files.
|
||||
- Use the Gradle Wrapper and the narrowest safe compile and tests. Do not connect to real MySQL, upload customer workbooks, or call production integrations without separate approval.
|
||||
5
.gitattributes
vendored
5
.gitattributes
vendored
@@ -1,3 +1,8 @@
|
||||
/.gitattributes text eol=lf
|
||||
/gradlew text eol=lf
|
||||
*.bat text eol=crlf
|
||||
*.jar binary
|
||||
|
||||
/.agent/** text eol=lf
|
||||
/AGENTS.md text eol=lf
|
||||
/CLAUDE.md text eol=lf
|
||||
|
||||
3
.gitignore
vendored
3
.gitignore
vendored
@@ -35,3 +35,6 @@ out/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
logs
|
||||
upload-file
|
||||
283
AGENTS.md
Normal file
283
AGENTS.md
Normal file
@@ -0,0 +1,283 @@
|
||||
<!--
|
||||
GENERATED BY KRI AGENT HARNESS. DO NOT EDIT DIRECTLY.
|
||||
Project: lge-cx-dash-back
|
||||
Schema version: 1
|
||||
Edit the source fragments or repository .agent files, then recompose.
|
||||
-->
|
||||
|
||||
# KRI Development Base Instructions
|
||||
|
||||
This document defines the shared working rules for KRI development repositories.
|
||||
Keep project-specific facts and commands in the project profile and project rules.
|
||||
|
||||
## Instruction Resolution
|
||||
|
||||
Apply repository instructions in this order:
|
||||
|
||||
1. Base rules
|
||||
2. Project-type rules
|
||||
3. Technology-stack rules
|
||||
4. Shared consumer contracts
|
||||
5. Project-specific rules
|
||||
6. The explicitly approved task scope
|
||||
|
||||
Later and more specific instructions may override earlier general instructions only within their stated scope.
|
||||
|
||||
- Apply a shared consumer contract only when `.agent/profile.yml` declares it.
|
||||
- Do not silently resolve a material instruction conflict. Report the conflicting rules and request a decision before changing files.
|
||||
- Rules involving destructive actions, credentials, external systems, production, deployment, databases, or Git publication require explicit authorization even when a later rule is less restrictive.
|
||||
|
||||
## Communication
|
||||
|
||||
- Respond to the user in Korean unless the user requests another language.
|
||||
- Keep code identifiers, commands, paths, protocol names, and external API terms in their original form.
|
||||
- Follow the repository's existing language conventions for code comments and user-facing messages.
|
||||
- Lead with the result or decision, then provide only the detail needed to verify it.
|
||||
- Do not create or retain a full session transcript.
|
||||
|
||||
## Work Authorization
|
||||
|
||||
- The default workflow is discussion first and explicit execution approval second.
|
||||
- During discussion, perform only read-only investigation needed to understand the task and propose a concrete plan, unless the user prohibits inspection.
|
||||
- Read-only investigation may include file inspection, code search, encoding checks, `git status`, `git diff`, `git log`, and sanitized official-documentation lookup.
|
||||
- Before execution approval, do not edit files, install dependencies, run builds or tests, start services, connect to databases, or change local or external state.
|
||||
- Before requesting approval, describe the intended scope, affected areas, validation plan, and material risks.
|
||||
- Treat approval as limited to the presented scope. Pause and discuss again if the work materially expands.
|
||||
- If the user explicitly requests immediate execution without prior discussion, the discussion gate may be skipped for the stated scope.
|
||||
- Fast-track authorization does not implicitly authorize protected operations such as destructive commands, production changes, deployments, database mutations, Git publication, or external messages.
|
||||
|
||||
## Local Development Environment
|
||||
|
||||
- Primary OS: Windows 11.
|
||||
- Primary shell: PowerShell.
|
||||
- Use Git Bash only when the repository already depends on Bash or POSIX shell behavior.
|
||||
- Prefer repository-provided wrappers and scripts over globally installed commands.
|
||||
- Do not assume that GNU utilities, WSL, Docker, or a Unix-compatible shell are available unless the project profile confirms them.
|
||||
- Detect Java, Node.js, .NET, Python, package-manager, and database-tool versions from repository configuration.
|
||||
- Do not install or modify global toolchains as part of a project task.
|
||||
|
||||
Preferred human-facing tools:
|
||||
|
||||
- Classic ASP: Visual Studio Code
|
||||
- Java and Spring Boot: IntelliJ IDEA
|
||||
- C# and .NET: JetBrains Rider
|
||||
- JavaScript, TypeScript, and Next.js: JetBrains WebStorm
|
||||
- Python: JetBrains PyCharm
|
||||
- Microsoft SQL Server: SQL Server Management Studio
|
||||
- Other databases: JetBrains DataGrip
|
||||
|
||||
- These preferences do not authorize launching or controlling a GUI application.
|
||||
- Prefer IDE-independent commands that can also run in CI.
|
||||
- Do not modify global IDE settings.
|
||||
- Do not create or modify `.idea`, `.vscode`, workspace, or run-configuration files unless the approved task requires it.
|
||||
- Preserve existing shared IDE configuration when it is already tracked.
|
||||
|
||||
## PowerShell and Path Safety
|
||||
|
||||
- Quote paths containing spaces, brackets, parentheses, Korean characters, or PowerShell metacharacters.
|
||||
- Prefer `-LiteralPath` when operating on an exact filesystem path.
|
||||
- Use project-relative paths in committed configuration and documentation. Do not commit machine-specific paths such as `D:\_____Dev\...`.
|
||||
- Do not pass filesystem targets between PowerShell, `cmd.exe`, and Bash for destructive or recursive operations.
|
||||
- Keep a filesystem operation within one shell from target resolution through execution.
|
||||
- Before a recursive delete or move, resolve and verify every absolute target.
|
||||
- Never use a drive root, workspace root, user profile, unresolved variable, wildcard, or broad glob as a recursive delete target.
|
||||
- Prefer recoverable operations when practical.
|
||||
|
||||
## Change Discipline
|
||||
|
||||
- Preserve all existing user changes, including uncommitted and untracked work.
|
||||
- Keep changes minimal but complete for the approved objective.
|
||||
- Avoid unrelated cleanup, formatting, renaming, dependency upgrades, and architectural refactoring.
|
||||
- Do not overwrite or revert unrelated changes.
|
||||
- Stop and report when the requested change overlaps existing work in a way that cannot be handled safely.
|
||||
- Prefer changing an authoritative source over editing generated output.
|
||||
- Treat files marked as generated as read-only unless regeneration is part of the approved plan.
|
||||
- Do not edit vendored dependencies, build outputs, caches, or generated clients unless explicitly required.
|
||||
- Do not regenerate a broad set of files for a narrow change without first explaining the expected output scope.
|
||||
|
||||
## Text Encoding and Korean Content Safety
|
||||
|
||||
- Treat the existing file encoding, BOM state, and line-ending style as part of the file's contract.
|
||||
- Preserve Korean comments, user-facing messages, error messages, identifiers, and documentation exactly unless the task explicitly requires changing them.
|
||||
- Do not assume that garbled terminal output means the file itself is corrupted. Verify bytes and encoding before modifying suspicious text.
|
||||
- Before editing an existing text file, determine its current encoding and BOM state when repository configuration does not already guarantee them.
|
||||
- Do not convert encoding, add or remove a BOM, or normalize line endings as a side effect of an unrelated change.
|
||||
- Avoid whole-file rewrites for small changes.
|
||||
- Do not rewrite source files through `Get-Content | Set-Content`, `Out-File`, shell redirection, or another method whose encoding behavior is implicit.
|
||||
- Do not use a patching or formatting tool on a non-UTF-8 file unless it is known to preserve that file's encoding.
|
||||
- Treat a console display problem and an on-disk encoding problem as separate issues.
|
||||
- After editing Korean text, inspect the diff for replacement characters (`<60>`), mojibake, unexpected escapes, BOM changes, and unrelated line-ending changes.
|
||||
- Run `.agent/tools/check-encoding.ps1` when it is available and the change touches Korean text or a non-default encoding.
|
||||
- If encoding cannot be identified confidently, stop before writing and report the affected file and evidence.
|
||||
- For a new text file, follow repository configuration. If no rule exists, use UTF-8 without BOM.
|
||||
|
||||
## Git Safety
|
||||
|
||||
- Use `git status`, `git diff`, and `git log` for read-only investigation.
|
||||
- Do not run `commit`, `push`, `pull`, `fetch`, `merge`, `rebase`, `reset`, `checkout`, `switch`, `stash`, `clean`, `tag`, or force operations unless that specific operation is explicitly approved.
|
||||
- Source-edit approval does not include commit or push approval.
|
||||
- Never amend an existing commit unless explicitly requested.
|
||||
- Before an approved commit, show the intended files, validation results, and proposed commit message.
|
||||
- Never push directly to a protected branch unless the user names the target branch and explicitly authorizes the push.
|
||||
|
||||
## Dependencies and External Actions
|
||||
|
||||
- Use the package manager, lockfile, and toolchain already selected by the repository.
|
||||
- Do not install global packages.
|
||||
- Do not add, remove, or upgrade a dependency unless it was included in the approved plan.
|
||||
- Pause for approval if an unplanned dependency becomes necessary.
|
||||
- Keep lockfiles synchronized with approved dependency changes.
|
||||
- Do not deploy, publish packages, create releases, send messages or email, call business APIs, or modify external services unless explicitly requested.
|
||||
- Never upload proprietary source code, internal documents, credentials, customer data, or database contents to an external service.
|
||||
- Remove secrets and unnecessary internal identifiers from external search queries.
|
||||
|
||||
## Database Safety
|
||||
|
||||
- Treat writing or reviewing SQL as source code separately from executing SQL against a database.
|
||||
- SQL files, migrations, schema proposals, and query drafts may be created within an approved source-change scope.
|
||||
- Do not connect to a shared, staging, or production database without explicit authorization for that environment.
|
||||
- Read-only queries against a non-local database also require authorization because results may contain sensitive data.
|
||||
- Do not execute DDL, DML, stored procedures, migrations, administrative commands, or data-correction scripts against a non-disposable database without separate authorization for the exact target and operation.
|
||||
- Source-change approval does not authorize migration execution.
|
||||
- Use a disposable local or test database for approved validation only after verifying its identity and disposable nature.
|
||||
- Never place credentials, connection strings, or sensitive query results in source files, logs, generated documents, or chat output.
|
||||
|
||||
## Secrets and Sensitive Data
|
||||
|
||||
- Never add credentials, tokens, passwords, private keys, connection strings, session identifiers, or production data to source control.
|
||||
- Read sensitive files only when the approved task requires it and no safer source exists.
|
||||
- Prefer inspecting configuration keys and schemas without displaying secret values.
|
||||
- Never echo secrets into terminal output, chat responses, logs, diffs, generated documents, test fixtures, or screenshots.
|
||||
- Redact sensitive values when reporting errors or command output.
|
||||
- If a possible secret is discovered, do not repeat it. Report only its location, type, and recommended containment action.
|
||||
- Do not rotate, revoke, copy, or otherwise modify credentials unless that exact action is explicitly authorized.
|
||||
|
||||
## Validation
|
||||
|
||||
- Discover supported build, test, lint, type-check, and formatting commands from repository files and project instructions. Do not invent commands.
|
||||
- Include intended validation in the discussion-phase plan.
|
||||
- After approved changes, run the narrowest relevant validation first, then broader checks when appropriate.
|
||||
- Limit formatting to files within the approved scope.
|
||||
- Do not run tests that require a shared database, production service, paid external API, or sensitive data unless separately authorized.
|
||||
- Do not claim that a check passed unless it was executed successfully.
|
||||
- If a check cannot be run, state the exact reason.
|
||||
- Distinguish a current-change failure from a pre-existing failure or an undetermined failure.
|
||||
- Do not fix unrelated failures without expanding the approved scope.
|
||||
- Inspect the worktree after validation for unexpected generated files, formatting churn, encoding changes, or lockfile changes.
|
||||
|
||||
## Artifacts and Session Records
|
||||
|
||||
- Do not create full-session transcripts, automatic HTML copies, analysis reports, or extra documentation unless explicitly requested.
|
||||
- Store durable information in the repository's existing documentation structure.
|
||||
- Do not place generated reports or temporary analysis files in the repository root.
|
||||
- Remove task-specific temporary files created by the current task after validation when removal is safe.
|
||||
|
||||
## Completion Report
|
||||
|
||||
When implementation is complete, report in Korean:
|
||||
|
||||
- what changed and why;
|
||||
- the main affected files or components;
|
||||
- validation commands actually executed and their results;
|
||||
- checks not executed and the reason;
|
||||
- remaining risks, assumptions, or follow-up work;
|
||||
- database, deployment, dependency, encoding, and compatibility impact when applicable.
|
||||
|
||||
- Do not report completion while required validation is failing or known encoding corruption is unresolved.
|
||||
- Keep the report concise and do not include a full session transcript.
|
||||
|
||||
## Requested Project Rules
|
||||
|
||||
- Treat the approved requirements, acceptance criteria, and recorded decisions as the primary scope boundary.
|
||||
- Do not infer a requirement solely from a file name, folder date, or apparently newer document.
|
||||
- When requirements conflict, report the exact sources and request a decision.
|
||||
- Preserve original customer, partner, and planning documents as read-only evidence unless document editing is explicitly approved.
|
||||
- Summarize durable implementation requirements inside the repository rather than relying only on files outside the repository.
|
||||
- Do not expand the deliverable with speculative features, infrastructure, or architectural changes.
|
||||
- Record material assumptions and unresolved decisions in the project-specific rules or existing project documentation.
|
||||
- Define observable acceptance criteria before implementation.
|
||||
- Treat separately managed Frontend and Backend repositories as independent deliverables with a coordinated contract.
|
||||
- Protect customer, partner, survey, and field data as sensitive information.
|
||||
- Keep handoff, operation, configuration, and validation instructions usable by the requesting team.
|
||||
- Report deviations from the requested scope and obtain approval before proceeding.
|
||||
|
||||
## Java and Spring Boot
|
||||
|
||||
- Treat the configured JDK, Spring Boot, Gradle, plugin, dependency, and package versions as authoritative.
|
||||
- Use the repository's Gradle Wrapper. Do not substitute a machine-global Gradle installation.
|
||||
- Preserve the established package layout and controller, application/service, domain, and persistence boundaries.
|
||||
- Keep controllers thin, place business rules in the established service/domain layer, and prefer constructor injection.
|
||||
- Apply request and configuration validation at boundaries and preserve the project's exception and response conventions.
|
||||
- Make transaction boundaries explicit and narrow; do not add broad transactions to hide lifecycle or query problems.
|
||||
- Preserve authentication, authorization, auditing, logging, and secret-management conventions.
|
||||
- Do not edit generated QueryDSL or other generated sources. Change their source definitions and regenerate only when the repository workflow requires it.
|
||||
- Use the approved KriCommon contract when the project profile includes it; do not duplicate shared backend behavior locally.
|
||||
- Run the narrowest relevant Gradle compile, test, static-analysis, and build tasks.
|
||||
|
||||
## MySQL
|
||||
|
||||
- Use MySQL syntax and behavior only for data sources whose declared engine is `mysql`.
|
||||
- Preserve the configured version, schema, character set, collation, time zone, naming, migration, and access conventions.
|
||||
- Parameterize values. Do not build SQL by concatenating untrusted input.
|
||||
- Consider indexes and execution plans for changed filters, joins, ordering, grouping, and pagination without guessing from small data sets.
|
||||
- Preserve transaction, locking, null, date/time, decimal, and generated-key semantics.
|
||||
- Do not introduce MSSQL or other dialect syntax into MySQL paths.
|
||||
- A source-code change approval authorizes SQL analysis and migration drafting only. Execute DDL, DML, procedures, or migrations only with separate explicit approval and the declared data-source access level.
|
||||
|
||||
## KriCommon Consumer Contract
|
||||
|
||||
### Dependency and API Boundary
|
||||
|
||||
- Consume KriCommon as `com.kri.common:starter:<approved-version>` using the consumer repository's established Gradle dependency and version-management conventions.
|
||||
- Import service-facing APIs from `com.kri.common.feature.*`. Treat `com.kri.common.runtime.*` as internal and do not bind application code to it unless no public API exists and the exception is explicitly documented.
|
||||
- Include the matching Spring starter for any optional Web, Security, JPA, Redis, AOP, or Swagger integration the service enables; KriCommon intentionally declares many integrations as compile-only.
|
||||
- Prefer the shared feature or an approved extension point over duplicating authentication, HTTP, error, enum, Excel, Redis, JSON, date/time, JPA, or utility behavior locally.
|
||||
|
||||
### Configuration and Overrides
|
||||
|
||||
- KriCommon configuration uses only `kri.*`. Established groups include `kri.auth.jwt`, `kri.auth.apikey`, `kri.security`, `kri.swagger`, `kri.web`, `kri.web.mdc`, `kri.http.bypass`, `kri.redis`, `kri.scheduling`, and `kri.error.expose`.
|
||||
- Read the version-matched README and configuration-property classes before setting a property; do not infer a property name or default from an older service.
|
||||
- Supply production JWT secrets, API keys, credentials, allowlists, and service URLs through the consumer's approved secret and configuration system. Never rely on library example or default secrets in production.
|
||||
- Preserve consumer override points. KriCommon's default security chain is created only when the consumer does not provide one, and overridable beans should remain explicit.
|
||||
- Adding a path to API-key allowed paths scopes where API-key authentication is attempted; it does not make the path public or grant authorization.
|
||||
|
||||
### Major Optional Capabilities
|
||||
|
||||
- JWT and API-key authentication integrate with Spring Security. API-key JPA preload requires Spring Data JPA; a consumer-provided claims provider can be used without JPA.
|
||||
- Common Web may register error handling, tracing/MDC, request-user resolution, enum conversion, and CORS behavior. Check for overlap before defining consumer-local equivalents.
|
||||
- Swagger support requires springdoc and defines the shared Bearer/API-key schemes and grouped paths.
|
||||
- Redis and scheduling are opt-in through their `kri.*.enabled` settings and matching runtime dependencies.
|
||||
- HTTP bypass targets are server-configured. Never accept an arbitrary full target URL from a frontend; retain allowed-path checks and do not forward hop-by-hop headers.
|
||||
- The external API client returns response bodies as documented, while bypass responses preserve raw bytes and target `Content-Type`.
|
||||
- `ExternalApiClient` multipart requests generate their own boundary and ignore a caller-supplied `Content-Type`. Multipart headers and `formField` values use UTF-8, while file bodies preserve the supplied bytes.
|
||||
- Multipart filenames, including non-ASCII names, are sent unchanged in the quoted `filename` parameter as raw UTF-8. No ASCII fallback or `filename*` parameter is added; CR/LF rejection and quote/backslash escaping still apply.
|
||||
- `JsonUtil` requires the consumer's explicit `ObjectMapper`; shared date/time helpers define KST as `Asia/Seoul` and also expose UTC semantics.
|
||||
|
||||
### Upgrade and Verification
|
||||
|
||||
- Review KriCommon release notes, README changes, configuration defaults, auto-configuration conditions, and affected public APIs before upgrading.
|
||||
- Commit dependency-lock or resolved-version changes according to the consumer repository's policy.
|
||||
- Run the consumer's focused compile and tests after an upgrade, including application-context startup tests when auto-configuration or security behavior is affected.
|
||||
- Do not modify KriCommon or another consumer repository unless it is explicitly included in the approved task scope.
|
||||
|
||||
## LGE CX Dashboard Backend Repository Rules
|
||||
|
||||
### Deliverable and Domain
|
||||
|
||||
- This Spring Boot backend serves the LGE appliance penetration, purchase, category, profile, and trend dashboard.
|
||||
- Treat approved planning material and acceptance criteria as the scope boundary. Preserve year, category, variable, filter, calculation, and response semantics used by the frontend.
|
||||
- Statistics endpoints, Excel upload, persisted survey data, variable/year metadata, and statistics cache behavior form one coordinated data contract.
|
||||
- Do not infer a new statistic, category mapping, aggregation rule, or visualization requirement from source names alone.
|
||||
|
||||
### Statistics, Upload, and Cache Safety
|
||||
|
||||
- Preserve denominators, weighting, missing values, category membership, ordering, decimal precision, rounding, totals, and cache-key semantics when changing a statistic.
|
||||
- Validate Excel structure, headers, cell types, file size, and partial-failure behavior at the upload boundary. Never use customer source data as an unrestricted test fixture.
|
||||
- Keep cache invalidation explicit when uploaded data, variables, years, or calculation behavior changes.
|
||||
- Preserve backward-compatible request and response shapes so frontend and backend can deploy independently.
|
||||
|
||||
### Shared Library and Verification
|
||||
|
||||
- Consume `com.kri.common:starter:beta.1.6.3` and use public `com.kri.common.feature.*` APIs. Do not duplicate a KriCommon feature locally.
|
||||
- `AGENTS.md` and `CLAUDE.md` are generated. Edit `.agent/profile.yml` or `.agent/project.md`, then recompose instead of editing generated files.
|
||||
- Use the Gradle Wrapper and the narrowest safe compile and tests. Do not connect to real MySQL, upload customer workbooks, or call production integrations without separate approval.
|
||||
@@ -32,7 +32,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "com.kri.common:starter:beta.1.0.66"
|
||||
implementation "com.kri.common:starter:beta.1.6.4"
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-security'
|
||||
@@ -50,7 +50,7 @@ dependencies {
|
||||
compileOnly 'org.projectlombok:lombok'
|
||||
annotationProcessor 'org.projectlombok:lombok'
|
||||
|
||||
implementation 'org.apache.poi:poi-ooxml:5.2.5'
|
||||
implementation 'org.apache.poi:poi-ooxml:5.5.1'
|
||||
|
||||
developmentOnly 'org.springframework.boot:spring-boot-devtools'
|
||||
|
||||
|
||||
@@ -4,11 +4,13 @@ import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.boot.ApplicationRunner;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
|
||||
import org.springframework.context.ApplicationContext;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
|
||||
@Slf4j
|
||||
@SpringBootApplication
|
||||
@ConfigurationPropertiesScan
|
||||
public class LgePenetrationBackApplication {
|
||||
|
||||
public static void main(String[] args) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.lge.penetration.common.cache;
|
||||
|
||||
import com.kri.common.cache.AbstractMapCache;
|
||||
import com.kri.common.feature.cache.AbstractMapCache;
|
||||
import com.kri.lge.penetration.dto.VariableDto;
|
||||
import com.kri.lge.penetration.persistence.entity.TVariableEntity;
|
||||
import com.kri.lge.penetration.persistence.repository.VariableRepository;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.lge.penetration.common.cache;
|
||||
|
||||
import com.kri.common.cache.AbstractListCache;
|
||||
import com.kri.common.feature.cache.AbstractListCache;
|
||||
import com.kri.lge.penetration.persistence.repository.YearRepository;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -2,7 +2,7 @@ package com.kri.lge.penetration.common.enums;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonCreator;
|
||||
import com.fasterxml.jackson.annotation.JsonValue;
|
||||
import com.kri.common.enums.CodeEnum;
|
||||
import com.kri.common.feature.enums.CodeEnum;
|
||||
import java.util.Objects;
|
||||
import lombok.Getter;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.kri.lge.penetration.config;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.springframework.boot.context.properties.ConfigurationProperties;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@ConfigurationProperties(prefix = "kri.file")
|
||||
public class FileStorageProperties {
|
||||
private String dataBaseDir;
|
||||
}
|
||||
15
src/main/java/com/kri/lge/penetration/config/JdbcConfig.java
Normal file
15
src/main/java/com/kri/lge/penetration/config/JdbcConfig.java
Normal file
@@ -0,0 +1,15 @@
|
||||
package com.kri.lge.penetration.config;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
|
||||
@Configuration
|
||||
public class JdbcConfig {
|
||||
|
||||
@Bean
|
||||
public JdbcTemplate jdbcTemplate(DataSource dataSource) {
|
||||
return new JdbcTemplate(dataSource);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.lge.penetration.controller;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.webmvc.RequestUserContext;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.web.RequestUserContext;
|
||||
import com.kri.lge.penetration.dto.LoginRequestDto;
|
||||
import com.kri.lge.penetration.dto.LoginResponseDto;
|
||||
import com.kri.lge.penetration.service.AuthService;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.lge.penetration.controller;
|
||||
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.lge.penetration.common.cache.StatisticsDbCache;
|
||||
import com.kri.lge.penetration.common.cache.VariableCache;
|
||||
import com.kri.lge.penetration.common.cache.YearCache;
|
||||
@@ -25,6 +25,7 @@ public class CacheAdminController {
|
||||
|
||||
private final YearCache yearCache;
|
||||
private final VariableCache variableCache;
|
||||
private final StatisticsDbCache statisticsDbCache;
|
||||
private final AuthService authService;
|
||||
|
||||
@Operation(summary = "가용 연도 리스트 캐시 조회")
|
||||
@@ -56,4 +57,14 @@ public class CacheAdminController {
|
||||
|
||||
return variableCache.reload();
|
||||
}
|
||||
|
||||
@Operation(summary = "통계처리 캐시 클리어")
|
||||
@PostMapping("/statistics-db/clear/{adminPw}")
|
||||
public void clearStatisticsDbCache(@PathVariable String adminPw) {
|
||||
if (!authService.isAdmin(adminPw)) {
|
||||
throw BusinessException.unauthorized("IS_NOT_ADMIN", "권한이 없습니다.");
|
||||
}
|
||||
|
||||
statisticsDbCache.clearStatisticsCache();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,8 +9,8 @@ import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.media.Content;
|
||||
import io.swagger.v3.oas.annotations.media.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.net.URLEncoder;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpHeaders;
|
||||
@@ -29,6 +29,7 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
public class UploadController {
|
||||
|
||||
private static final String XLSX = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
private static final MediaType XLSX_MEDIA_TYPE = MediaType.valueOf(XLSX);
|
||||
|
||||
private final StatisticsDbCache statisticsDbCache;
|
||||
private final UploadService uploadService;
|
||||
@@ -39,7 +40,6 @@ public class UploadController {
|
||||
produces = {MediaType.APPLICATION_JSON_VALUE, XLSX}
|
||||
)
|
||||
@Operation(summary = "파일 업로드", description = "성공이면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환")
|
||||
@ApiResponses({
|
||||
@ApiResponse(
|
||||
responseCode = "200",
|
||||
description = "성공(JSON) 또는 실패 엑셀(xlsx)",
|
||||
@@ -54,8 +54,7 @@ public class UploadController {
|
||||
)
|
||||
}
|
||||
)
|
||||
})
|
||||
public ResponseEntity<?> importData(
|
||||
public ResponseEntity<Object> importData(
|
||||
@Parameter(description = "업로드 파일", required = true)
|
||||
@RequestPart("file") MultipartFile file
|
||||
) {
|
||||
@@ -64,15 +63,14 @@ public class UploadController {
|
||||
ExcelUploadResultDto result = uploadService.uploadData(file);
|
||||
if (result.isHasErrorFile()) {
|
||||
String contentDisposition = "attachment; filename*=UTF-8''" +
|
||||
java.net.URLEncoder.encode(result.getErrorFileName(), StandardCharsets.UTF_8);
|
||||
URLEncoder.encode(result.getErrorFileName(), StandardCharsets.UTF_8);
|
||||
|
||||
return ResponseEntity.ok()
|
||||
.header(HttpHeaders.CONTENT_DISPOSITION, contentDisposition)
|
||||
.contentType(MediaType.parseMediaType(XLSX))
|
||||
.contentType(XLSX_MEDIA_TYPE)
|
||||
.body(result.getErrorFile());
|
||||
}
|
||||
|
||||
} else {
|
||||
return ResponseEntity.ok(ExcelUploadSuccessDto.from(result));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.lge.penetration.dto;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.lge.penetration.dto;
|
||||
|
||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
||||
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import lombok.Builder;
|
||||
import lombok.Getter;
|
||||
|
||||
@@ -0,0 +1,178 @@
|
||||
package com.kri.lge.penetration.persistence.jdbc;
|
||||
|
||||
import java.sql.BatchUpdateException;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.SQLException;
|
||||
import java.sql.Statement;
|
||||
import java.sql.Timestamp;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.dao.DataAccessException;
|
||||
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
|
||||
import org.springframework.jdbc.core.JdbcTemplate;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
public class DataJdbcRepository {
|
||||
|
||||
private final JdbcTemplate jdbcTemplate;
|
||||
private static final String INSERT_SQL = """
|
||||
insert into t_data (
|
||||
data_idx,
|
||||
sid,
|
||||
raw_data,
|
||||
reg_user,
|
||||
reg_dt
|
||||
) values (?, ?, ?, ?, ?)
|
||||
""";
|
||||
|
||||
public record TDataInsertRow(
|
||||
String dataIdx,
|
||||
String sid,
|
||||
String rawDataJson,
|
||||
String regUser,
|
||||
LocalDateTime regDt
|
||||
) {
|
||||
}
|
||||
|
||||
public record TDataInsertFailure(
|
||||
int index,
|
||||
String reason
|
||||
) {
|
||||
}
|
||||
|
||||
public record TDataBatchInsertResult(
|
||||
List<Integer> successIndexes,
|
||||
List<TDataInsertFailure> failures
|
||||
) {
|
||||
public int successCount() {
|
||||
return successIndexes == null ? 0 : successIndexes.size();
|
||||
}
|
||||
|
||||
public int failCount() {
|
||||
return failures == null ? 0 : failures.size();
|
||||
}
|
||||
}
|
||||
|
||||
public TDataBatchInsertResult bulkInsert(List<TDataInsertRow> rows) {
|
||||
if (rows == null || rows.isEmpty()) {
|
||||
return new TDataBatchInsertResult(List.of(), List.of());
|
||||
}
|
||||
|
||||
try {
|
||||
jdbcTemplate.batchUpdate(INSERT_SQL, new BatchPreparedStatementSetter() {
|
||||
@Override
|
||||
public void setValues(PreparedStatement ps, int i) throws SQLException {
|
||||
TDataInsertRow row = rows.get(i);
|
||||
ps.setString(1, row.dataIdx());
|
||||
ps.setString(2, row.sid());
|
||||
ps.setString(3, row.rawDataJson());
|
||||
ps.setString(4, row.regUser());
|
||||
ps.setTimestamp(5, Timestamp.valueOf(row.regDt()));
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getBatchSize() {
|
||||
return rows.size();
|
||||
}
|
||||
});
|
||||
|
||||
List<Integer> successIndexes = new ArrayList<>(rows.size());
|
||||
for (int i = 0; i < rows.size(); i++) {
|
||||
successIndexes.add(i);
|
||||
}
|
||||
return new TDataBatchInsertResult(successIndexes, List.of());
|
||||
|
||||
} catch (DataAccessException e) {
|
||||
return handleBatchFailure(rows, e);
|
||||
}
|
||||
}
|
||||
|
||||
private TDataBatchInsertResult handleBatchFailure(List<TDataInsertRow> rows, DataAccessException e) {
|
||||
BatchUpdateException batchEx = findBatchUpdateException(e);
|
||||
|
||||
List<Integer> successIndexes = new ArrayList<>();
|
||||
List<TDataInsertFailure> failures = new ArrayList<>();
|
||||
|
||||
if (batchEx == null) {
|
||||
for (int i = 0; i < rows.size(); i++) {
|
||||
retryOne(rows.get(i), i, successIndexes, failures);
|
||||
}
|
||||
return new TDataBatchInsertResult(successIndexes, failures);
|
||||
}
|
||||
|
||||
int[] counts = batchEx.getUpdateCounts();
|
||||
boolean[] needsRetry = new boolean[rows.size()];
|
||||
for (int i = 0; i < rows.size(); i++) {
|
||||
needsRetry[i] = true;
|
||||
}
|
||||
|
||||
if (counts != null) {
|
||||
int limit = Math.min(counts.length, rows.size());
|
||||
for (int i = 0; i < limit; i++) {
|
||||
int c = counts[i];
|
||||
if (isBatchSuccess(c)) {
|
||||
successIndexes.add(i);
|
||||
needsRetry[i] = false;
|
||||
} else if (c == Statement.EXECUTE_FAILED) {
|
||||
needsRetry[i] = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (int i = 0; i < rows.size(); i++) {
|
||||
if (needsRetry[i]) {
|
||||
retryOne(rows.get(i), i, successIndexes, failures);
|
||||
}
|
||||
}
|
||||
|
||||
return new TDataBatchInsertResult(successIndexes, failures);
|
||||
}
|
||||
|
||||
private void retryOne(
|
||||
TDataInsertRow row,
|
||||
int index,
|
||||
List<Integer> successIndexes,
|
||||
List<TDataInsertFailure> failures
|
||||
) {
|
||||
try {
|
||||
jdbcTemplate.update(
|
||||
INSERT_SQL,
|
||||
row.dataIdx(),
|
||||
row.sid(),
|
||||
row.rawDataJson(),
|
||||
row.regUser(),
|
||||
Timestamp.valueOf(row.regDt())
|
||||
);
|
||||
successIndexes.add(index);
|
||||
} catch (DataAccessException ex) {
|
||||
failures.add(new TDataInsertFailure(index, rootMessage(ex)));
|
||||
}
|
||||
}
|
||||
|
||||
private static BatchUpdateException findBatchUpdateException(Throwable t) {
|
||||
Throwable cur = t;
|
||||
while (cur != null) {
|
||||
if (cur instanceof BatchUpdateException bue) {
|
||||
return bue;
|
||||
}
|
||||
cur = cur.getCause();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static boolean isBatchSuccess(int count) {
|
||||
return count >= 0 || count == Statement.SUCCESS_NO_INFO;
|
||||
}
|
||||
|
||||
private static String rootMessage(Throwable t) {
|
||||
Throwable cur = t;
|
||||
while (cur.getCause() != null) {
|
||||
cur = cur.getCause();
|
||||
}
|
||||
return cur.getMessage();
|
||||
}
|
||||
}
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.kri.lge.penetration.service;
|
||||
|
||||
import com.kri.common.auth.dto.JwtUserClaimsDto;
|
||||
import com.kri.common.auth.jwt.JwtService;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.auth.dto.JwtUserClaimsDto;
|
||||
import com.kri.common.feature.auth.jwt.JwtService;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.lge.penetration.common.consts.LgePenetrationConst;
|
||||
import com.kri.lge.penetration.dto.LoginRequestDto;
|
||||
import com.kri.lge.penetration.dto.LoginResponseDto;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package com.kri.lge.penetration.service;
|
||||
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.lge.penetration.common.cache.StatisticsDbCache;
|
||||
import com.kri.lge.penetration.common.cache.VariableCache;
|
||||
import com.kri.lge.penetration.common.cache.YearCache;
|
||||
@@ -21,6 +21,7 @@ import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Comparator;
|
||||
import java.util.DoubleSummaryStatistics;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
@@ -200,7 +201,9 @@ public class StatisticsService {
|
||||
String qid = v.getTargetQid();
|
||||
List<BannerSpec> choices = new ArrayList<>();
|
||||
|
||||
for (VariableItemInfoDto scalar : v.getScalarInfo()) {
|
||||
VariableItemInfoDto[] bannerScalarList =filterVariableScalarInfo(v.getScalarInfo(), null);
|
||||
|
||||
for (VariableItemInfoDto scalar : bannerScalarList) {
|
||||
if (scalar == null) continue;
|
||||
List<Integer> vals = scalar.getValue();
|
||||
if (vals == null || vals.isEmpty()) continue;
|
||||
@@ -666,9 +669,18 @@ public class StatisticsService {
|
||||
return new VariableItemInfoDto[0];
|
||||
}
|
||||
|
||||
return filterVariableScalarInfo(scalarInfo, sValueSet);
|
||||
}
|
||||
|
||||
private VariableItemInfoDto[] filterVariableScalarInfo(VariableItemInfoDto[] scalarInfo, Set<Integer> sValueSet) {
|
||||
//sValueSet 이 없을 수도 있음 없으면 filter를 하지 말아야 함
|
||||
return Arrays.stream(scalarInfo)
|
||||
.filter(Objects::nonNull)
|
||||
.filter(info -> containsAny(info.getValue(), sValueSet))
|
||||
.filter(info -> sValueSet == null || sValueSet.isEmpty() || containsAny(info.getValue(), sValueSet))
|
||||
.sorted(Comparator.comparing(
|
||||
VariableItemInfoDto::getOrder,
|
||||
Comparator.nullsLast(Integer::compareTo)
|
||||
))
|
||||
.toArray(VariableItemInfoDto[]::new);
|
||||
}
|
||||
|
||||
|
||||
@@ -1,33 +1,33 @@
|
||||
package com.kri.lge.penetration.service;
|
||||
|
||||
import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_CHUNK_SIZE;
|
||||
import static com.kri.lge.penetration.common.consts.LgePenetrationConst.EXCEL_ID;
|
||||
import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_CHUNK_SIZE;
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.excel.ExcelMapper;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.excel.ExcelMapper;
|
||||
import com.kri.lge.penetration.dto.DataItemDto;
|
||||
import com.kri.lge.penetration.dto.ExcelUploadResultDto;
|
||||
import com.kri.lge.penetration.persistence.entity.TDataEntity;
|
||||
import com.kri.lge.penetration.persistence.repository.DataRepository;
|
||||
import jakarta.persistence.EntityManager;
|
||||
import jakarta.persistence.PersistenceContext;
|
||||
import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository;
|
||||
import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository.TDataBatchInsertResult;
|
||||
import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository.TDataInsertFailure;
|
||||
import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository.TDataInsertRow;
|
||||
import com.kri.lge.penetration.service.file.DataFileService;
|
||||
import java.io.ByteArrayOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.nio.file.Path;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.UUID;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.log4j.Log4j2;
|
||||
import org.apache.poi.ss.usermodel.Workbook;
|
||||
import org.springframework.dao.DataAccessException;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@Log4j2
|
||||
@@ -35,13 +35,14 @@ import org.springframework.web.multipart.MultipartFile;
|
||||
@RequiredArgsConstructor
|
||||
public class UploadService {
|
||||
|
||||
@PersistenceContext
|
||||
private EntityManager em;
|
||||
private final DataFileService dataFileService;
|
||||
private final ObjectMapper objectMapper;
|
||||
private final DataRepository dataRepository;
|
||||
private final DataJdbcRepository tDataJdbcRepository;
|
||||
|
||||
@Transactional
|
||||
public ExcelUploadResultDto uploadData(MultipartFile file) {
|
||||
try (InputStream in = file.getInputStream()) {
|
||||
Path dataFilePath = dataFileService.saveListFile(file);
|
||||
|
||||
List<RowContext> buffer = new ArrayList<>(INSERT_CHUNK_SIZE);
|
||||
List<Map<String, String>> failRows = new ArrayList<>();
|
||||
|
||||
@@ -52,17 +53,17 @@ public class UploadService {
|
||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||
final String regUser = "system";
|
||||
|
||||
ExcelMapper.readStreaming(in, (row, rowIndex) -> {
|
||||
ExcelMapper.readStreaming(dataFilePath, (row, rowIndex) -> {
|
||||
total.incrementAndGet();
|
||||
|
||||
ParsedRow parsed = parseRowToEntity(row, regUser, now);
|
||||
ParsedRow parsed = parseRow(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));
|
||||
buffer.add(new RowContext(rowIndex, row, parsed.insertRow));
|
||||
|
||||
if (buffer.size() >= INSERT_CHUNK_SIZE) {
|
||||
flushBuffer(buffer, success, fail, failRows);
|
||||
@@ -74,19 +75,13 @@ public class UploadService {
|
||||
}
|
||||
|
||||
byte[] errorFile = null;
|
||||
boolean hasErrorFile = !failRows.isEmpty();
|
||||
|
||||
if (hasErrorFile) {
|
||||
if (!failRows.isEmpty()) {
|
||||
errorFile = toXlsx(failRows);
|
||||
}
|
||||
|
||||
return ExcelUploadResultDto.of(total.get(), success.get(), fail.get(), errorFile);
|
||||
dataFileService.deleteListFile(dataFilePath.getFileName().toString());
|
||||
|
||||
} catch (IOException ex){
|
||||
throw BusinessException.badRequest("CAN_NOT_OPEN", "파일 스트림을 열 수 없습니다.")
|
||||
.with("fileName",file.getOriginalFilename())
|
||||
.with("errorMessage",ex.getMessage());
|
||||
}
|
||||
return ExcelUploadResultDto.of(total.get(), success.get(), fail.get(), errorFile);
|
||||
}
|
||||
|
||||
private void flushBuffer(
|
||||
@@ -95,29 +90,30 @@ public class UploadService {
|
||||
AtomicInteger fail,
|
||||
List<Map<String, String>> failRows
|
||||
) {
|
||||
try {
|
||||
List<TDataEntity> 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)));
|
||||
if (buffer.isEmpty()) {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
List<TDataInsertRow> rows = buffer.stream()
|
||||
.map(RowContext::insertRow)
|
||||
.toList();
|
||||
|
||||
TDataBatchInsertResult result = tDataJdbcRepository.bulkInsert(rows);
|
||||
|
||||
success.addAndGet(result.successCount());
|
||||
|
||||
for (TDataInsertFailure failure : result.failures()) {
|
||||
RowContext rc = buffer.get(failure.index());
|
||||
fail.incrementAndGet();
|
||||
failRows.add(buildFailRow(rc.rawRow(), rc.rowIndex(), "DB 저장 실패: " + failure.reason()));
|
||||
}
|
||||
} finally {
|
||||
em.clear();
|
||||
buffer.clear();
|
||||
}
|
||||
}
|
||||
|
||||
private ParsedRow parseRowToEntity(
|
||||
private ParsedRow parseRow(
|
||||
Map<String, String> row,
|
||||
String regUser,
|
||||
LocalDateTime regDt
|
||||
@@ -126,7 +122,6 @@ public class UploadService {
|
||||
return ParsedRow.fail("빈 행");
|
||||
}
|
||||
|
||||
// sid
|
||||
String sid = firstNonBlank(row.get(EXCEL_ID), row.get("sid"), row.get("SID"));
|
||||
if (sid == null) {
|
||||
return ParsedRow.fail("ID(sid) 누락");
|
||||
@@ -135,21 +130,16 @@ public class UploadService {
|
||||
return ParsedRow.fail("ID(sid) 길이 초과(>32): " + sid);
|
||||
}
|
||||
|
||||
// rawData 구성
|
||||
Map<String, List<DataItemDto>> rawData = new LinkedHashMap<>();
|
||||
|
||||
for (Map.Entry<String, String> 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에 안 넣음
|
||||
if (v == null || v.isBlank() || "#NULL!".equals(v.trim())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Double s = parseDoubleLoose(v);
|
||||
@@ -160,20 +150,30 @@ public class UploadService {
|
||||
if (key.contains("#")) {
|
||||
key = key.substring(0, key.indexOf("#"));
|
||||
}
|
||||
rawData.computeIfAbsent(key, k -> new ArrayList<>()).add(DataItemDto.from(null, null, s));
|
||||
|
||||
rawData.computeIfAbsent(key, k -> new ArrayList<>())
|
||||
.add(DataItemDto.from(null, null, s));
|
||||
}
|
||||
|
||||
TDataEntity entity = new TDataEntity();
|
||||
entity.setSid(sid);
|
||||
entity.setRawData(rawData);
|
||||
entity.setRegUser(regUser);
|
||||
entity.setRegDt(regDt);
|
||||
String rawDataJson;
|
||||
try {
|
||||
rawDataJson = objectMapper.writeValueAsString(rawData);
|
||||
} catch (JsonProcessingException e) {
|
||||
return ParsedRow.fail("rawData JSON 직렬화 실패: " + rootMessage(e));
|
||||
}
|
||||
|
||||
return ParsedRow.ok(entity);
|
||||
TDataInsertRow insertRow = new TDataInsertRow(
|
||||
UUID.randomUUID().toString(),
|
||||
sid,
|
||||
rawDataJson,
|
||||
regUser,
|
||||
regDt
|
||||
);
|
||||
|
||||
return ParsedRow.ok(insertRow);
|
||||
}
|
||||
|
||||
private Map<String, String> buildFailRow(Map<String, String> row, int rowIndex, String reason) {
|
||||
// 에러 엑셀에 행번호/사유를 앞에 고정 컬럼으로 넣고, 원본 컬럼들도 같이 싣는다
|
||||
Map<String, String> m = new LinkedHashMap<>();
|
||||
m.put("rowIndex", String.valueOf(rowIndex));
|
||||
m.put("reason", reason);
|
||||
@@ -195,26 +195,16 @@ public class UploadService {
|
||||
|
||||
private static String rootMessage(Throwable t) {
|
||||
Throwable cur = t;
|
||||
while (cur.getCause() != null) cur = cur.getCause();
|
||||
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);
|
||||
@@ -238,15 +228,15 @@ public class UploadService {
|
||||
private record RowContext(
|
||||
int rowIndex,
|
||||
Map<String, String> rawRow,
|
||||
TDataEntity entity
|
||||
TDataInsertRow insertRow
|
||||
) {}
|
||||
|
||||
private record ParsedRow(
|
||||
TDataEntity entity,
|
||||
TDataInsertRow insertRow,
|
||||
String reason
|
||||
) {
|
||||
static ParsedRow ok(TDataEntity entity) {
|
||||
return new ParsedRow(entity, null);
|
||||
static ParsedRow ok(TDataInsertRow insertRow) {
|
||||
return new ParsedRow(insertRow, null);
|
||||
}
|
||||
|
||||
static ParsedRow fail(String reason) {
|
||||
|
||||
@@ -0,0 +1,131 @@
|
||||
package com.kri.lge.penetration.service.file;
|
||||
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Optional;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
public abstract class AbstractFileService {
|
||||
|
||||
protected abstract Path getBaseDir();
|
||||
|
||||
protected String extractExtension(String originalFileName) {
|
||||
if (originalFileName == null || originalFileName.isBlank()) {
|
||||
return "";
|
||||
}
|
||||
|
||||
int dot = originalFileName.lastIndexOf('.');
|
||||
if (dot > -1 && dot < originalFileName.length() - 1) {
|
||||
return originalFileName.substring(dot);
|
||||
}
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
protected String extractBaseName(String originalFileName) {
|
||||
if (originalFileName == null || originalFileName.isBlank()) {
|
||||
return "file";
|
||||
}
|
||||
|
||||
String fileName = java.nio.file.Paths.get(originalFileName).getFileName().toString();
|
||||
int dot = fileName.lastIndexOf('.');
|
||||
|
||||
if (dot > 0) {
|
||||
return fileName.substring(0, dot);
|
||||
}
|
||||
|
||||
return fileName;
|
||||
}
|
||||
|
||||
protected String buildFileName(MultipartFile file) {
|
||||
String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file");
|
||||
return CommonUtil.uuid32() + extractExtension(original);
|
||||
}
|
||||
|
||||
protected String buildFileNameWithTime(MultipartFile file, String prefix) {
|
||||
String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file");
|
||||
String baseName = extractBaseName(original);
|
||||
String ext = extractExtension(original);
|
||||
|
||||
String timestamp = DateTimeUtil.nowKstLocalDateTime()
|
||||
.format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss"));
|
||||
|
||||
return prefix + "_" + timestamp + "_" + baseName + ext;
|
||||
}
|
||||
|
||||
protected Path createDirectories(Path dir) throws IOException {
|
||||
return Files.createDirectories(dir.toAbsolutePath().normalize());
|
||||
}
|
||||
|
||||
protected String saveFile(Path dir, MultipartFile file) throws IOException {
|
||||
if (file == null || file.isEmpty()) {
|
||||
throw new IllegalArgumentException("업로드할 파일이 없습니다.");
|
||||
}
|
||||
|
||||
Path normalizedDir = createDirectories(dir);
|
||||
String fileName = buildFileName(file);
|
||||
Path target = normalizedDir.resolve(fileName).normalize();
|
||||
|
||||
if (!target.startsWith(normalizedDir)) {
|
||||
throw new IllegalStateException("잘못된 파일 경로입니다.");
|
||||
}
|
||||
|
||||
file.transferTo(target.toFile());
|
||||
return fileName;
|
||||
}
|
||||
|
||||
protected void saveFile(Path dir, MultipartFile file, String fileName) throws IOException {
|
||||
if (file == null || file.isEmpty()) {
|
||||
throw new IllegalArgumentException("업로드할 파일이 없습니다.");
|
||||
}
|
||||
|
||||
Path normalizedDir = createDirectories(dir);
|
||||
Path target = normalizedDir.resolve(fileName).normalize();
|
||||
|
||||
if (!target.startsWith(normalizedDir)) {
|
||||
throw new IllegalStateException("잘못된 파일 경로입니다.");
|
||||
}
|
||||
|
||||
file.transferTo(target.toFile());
|
||||
}
|
||||
|
||||
protected void moveFile(Path sourceDir, Path targetDir, String fileName) throws IOException {
|
||||
if (fileName == null || fileName.isBlank()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Path normalizedSourceDir = sourceDir.toAbsolutePath().normalize();
|
||||
Path normalizedTargetDir = createDirectories(targetDir);
|
||||
|
||||
Path source = normalizedSourceDir.resolve(fileName).normalize();
|
||||
Path target = normalizedTargetDir.resolve(fileName).normalize();
|
||||
|
||||
if (!source.startsWith(normalizedSourceDir) || !target.startsWith(normalizedTargetDir)) {
|
||||
throw new IllegalStateException("잘못된 파일 경로입니다.");
|
||||
}
|
||||
if (!Files.exists(source)) {
|
||||
return;
|
||||
}
|
||||
|
||||
Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
|
||||
}
|
||||
|
||||
protected void deleteFile(Path dir, String fileName) throws IOException {
|
||||
if (fileName == null || fileName.isBlank()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Path normalizedDir = dir.toAbsolutePath().normalize();
|
||||
Path target = normalizedDir.resolve(fileName).normalize();
|
||||
|
||||
if (!target.startsWith(normalizedDir)) {
|
||||
throw new IllegalStateException("잘못된 파일 경로입니다.");
|
||||
}
|
||||
|
||||
Files.deleteIfExists(target);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
package com.kri.lge.penetration.service.file;
|
||||
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.lge.penetration.config.FileStorageProperties;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.web.multipart.MultipartFile;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
public class DataFileService extends AbstractFileService {
|
||||
|
||||
private final FileStorageProperties properties;
|
||||
|
||||
@Override
|
||||
protected Path getBaseDir() {
|
||||
return Paths.get(properties.getDataBaseDir()).toAbsolutePath().normalize();
|
||||
}
|
||||
|
||||
public Path saveListFile(MultipartFile file) {
|
||||
String newFileName = buildFileNameWithTime(file, CommonUtil.uuid32());
|
||||
Path dir = getBaseDir().toAbsolutePath().normalize();
|
||||
Path savedPath = dir.resolve(newFileName).toAbsolutePath().normalize();
|
||||
|
||||
try {
|
||||
saveFile(dir, file, newFileName);
|
||||
return savedPath;
|
||||
} catch (IOException e) {
|
||||
throw BusinessException.internalError("FAIL_DATA_UPLOAD", e.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
public void deleteListFile(String fileName) {
|
||||
Path dir = getBaseDir().toAbsolutePath().normalize();
|
||||
|
||||
try {
|
||||
deleteFile(dir, fileName);
|
||||
} catch (IOException e) {
|
||||
throw BusinessException.internalError("FAIL_DATA_DELETE", e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,6 @@ spring:
|
||||
datasource:
|
||||
#private 도메인
|
||||
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: kriit
|
||||
password: it#51304
|
||||
username: prjct_lge_cx
|
||||
password: lge#260324
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
@@ -2,8 +2,8 @@ spring:
|
||||
datasource:
|
||||
#public 도메인
|
||||
url: jdbc:mysql://db-md87m-kr.vpc-pub-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: kriit
|
||||
password: it#51304
|
||||
username: prjct_lge_cx
|
||||
password: lge#260324
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
|
||||
jpa:
|
||||
@@ -20,6 +20,6 @@ spring:
|
||||
logging:
|
||||
level:
|
||||
org.hibernate.SQL: DEBUG
|
||||
org.hibernate.orm.jdbc.bind: TRACE
|
||||
#org.hibernate.orm.jdbc.bind: TRACE
|
||||
#org.hibernate.orm.jdbc.extract: TRACE
|
||||
org.hibernate.engine.jdbc.batch.internal: DEBUG
|
||||
@@ -1,7 +1,7 @@
|
||||
spring:
|
||||
datasource:
|
||||
#private 도메인
|
||||
url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: kriit
|
||||
password: it#51304
|
||||
url: jdbc:mysql://db-40h0ul.vpc-cdb.ntruss.com:3306/prjct_lge_cx_dash?characterEncoding=UTF-8&rewriteBatchedStatements=true
|
||||
username: prjct_lge_cx
|
||||
password: lge#260324
|
||||
driver-class-name: com.mysql.cj.jdbc.Driver
|
||||
@@ -2,7 +2,7 @@ server:
|
||||
port: 6101
|
||||
forward-headers-strategy: framework
|
||||
tomcat:
|
||||
max-http-form-post-size: 50MB
|
||||
max-http-form-post-size: 100MB
|
||||
max-swallow-size: -1
|
||||
|
||||
spring:
|
||||
@@ -22,8 +22,8 @@ spring:
|
||||
|
||||
servlet:
|
||||
multipart:
|
||||
max-file-size: 50MB
|
||||
max-request-size: 50MB
|
||||
max-file-size: 100MB
|
||||
max-request-size: 100MB
|
||||
|
||||
logging:
|
||||
file:
|
||||
@@ -42,17 +42,19 @@ kri:
|
||||
|
||||
swagger:
|
||||
enabled: true
|
||||
allowed-ips:
|
||||
- 211.254.145.130
|
||||
title: "LGE CX Dash"
|
||||
description: "LGE 가전 보급률 Dashboard"
|
||||
version: "v1.0.0"
|
||||
base-package: "com.kri.lge.penetration"
|
||||
|
||||
common:
|
||||
file:
|
||||
data-base-dir: ./upload-file/data
|
||||
|
||||
web:
|
||||
enabled: true # 공통 Web 구성 사용 여부 (기본 true)
|
||||
webmvc:
|
||||
enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true)
|
||||
redis:
|
||||
enabled: false # RedisQueueHelper 사용 시 true
|
||||
scheduling:
|
||||
enabled: true # @Scheduled 사용 시 true
|
||||
enabled: false # @Scheduled 사용 시 true
|
||||
Reference in New Issue
Block a user