Compare commits

..

5 Commits

15 changed files with 680 additions and 103 deletions

21
.agent/profile.yml Normal file
View File

@@ -0,0 +1,21 @@
schema_version: 1
project:
id: kfpa-cx-dash-back
name: KFPA CX Dashboard Backend
type: requested-project
layer: backend
legacy: false
stack:
- java-springboot
shared_contracts:
consumes:
- kri-common
databases:
- id: kfpa-cx
engine: mssql
role: primary-csi-dashboard-data
access: read-write

20
.agent/project.md Normal file
View File

@@ -0,0 +1,20 @@
## KFPA CX Dashboard Backend Repository Rules
### Deliverable and Domain
- This Spring Boot backend serves the KFPA CX dashboard for CSI summaries, ranks, object types, business divisions, comments, and related survey statistics.
- Treat approved requirements and acceptance criteria as the scope boundary. Preserve survey date, division, object type, rank, score, comment, and response semantics used by the frontend.
- Do not infer new aggregation, ranking, filtering, or comment-editing behavior from source names or planning-file dates alone.
### Statistics and Persistence Safety
- Preserve denominators, weighting, missing values, grouping, ranking ties, ordering, decimal precision, rounding, totals, and survey-date boundaries when changing statistics.
- Keep MSSQL/MyBatis parameter binding, result mappings, null behavior, and query ordering explicit.
- Treat division comments and administrative writes as auditable business changes with authorization, validation, and failure behavior.
- 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 MSSQL or modify customer comments during validation without separate approval.

5
.gitattributes vendored
View File

@@ -1,3 +1,8 @@
/.gitattributes text eol=lf
/gradlew text eol=lf /gradlew text eol=lf
*.bat text eol=crlf *.bat text eol=crlf
*.jar binary *.jar binary
/.agent/** text eol=lf
/AGENTS.md text eol=lf
/CLAUDE.md text eol=lf

283
AGENTS.md Normal file
View File

@@ -0,0 +1,283 @@
<!--
GENERATED BY KRI AGENT HARNESS. DO NOT EDIT DIRECTLY.
Project: kfpa-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.
## Microsoft SQL Server
- Use T-SQL syntax and behavior only for data sources whose declared engine is `mssql`.
- Preserve the configured SQL Server version, database and schema names, collation, naming, migration, and access conventions.
- Parameterize values. Do not build SQL by concatenating untrusted input.
- Preserve Unicode behavior and use the repository's established `nvarchar`/`nchar` and parameter conventions where Korean or other Unicode text is possible.
- Treat stored-procedure parameters, result sets, return values, transaction behavior, and error behavior as public contracts.
- Consider indexes and actual execution characteristics for changed filters, joins, ordering, grouping, and pagination.
- Do not introduce MySQL or other dialect syntax into MSSQL paths.
- Keep read-only legacy integrations read-only. A source-code change approval authorizes SQL analysis and script drafting only; execution requires 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.
## KFPA CX Dashboard Backend Repository Rules
### Deliverable and Domain
- This Spring Boot backend serves the KFPA CX dashboard for CSI summaries, ranks, object types, business divisions, comments, and related survey statistics.
- Treat approved requirements and acceptance criteria as the scope boundary. Preserve survey date, division, object type, rank, score, comment, and response semantics used by the frontend.
- Do not infer new aggregation, ranking, filtering, or comment-editing behavior from source names or planning-file dates alone.
### Statistics and Persistence Safety
- Preserve denominators, weighting, missing values, grouping, ranking ties, ordering, decimal precision, rounding, totals, and survey-date boundaries when changing statistics.
- Keep MSSQL/MyBatis parameter binding, result mappings, null behavior, and query ordering explicit.
- Treat division comments and administrative writes as auditable business changes with authorization, validation, and failure behavior.
- 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 MSSQL or modify customer comments during validation without separate approval.

1
CLAUDE.md Normal file
View File

@@ -0,0 +1 @@
@AGENTS.md

View File

@@ -36,7 +36,7 @@ repositories {
} }
} }
dependencies { dependencies {
implementation "com.kri.common:starter:beta.1.1.19" implementation "com.kri.common:starter:beta.1.6.4"
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-security'

View File

@@ -1,12 +1,21 @@
package com.kri.kfpa.dash.common.consts; package com.kri.kfpa.dash.common.consts;
import com.kri.kfpa.dash.dto.CsiDataDto; import com.kri.kfpa.dash.dto.CsiDataDto;
import java.util.List;
import java.util.Map; import java.util.Map;
public final class KfpaDashConstant { public final class KfpaDashConstant {
public static final String KFPA_DASH_PKEY = "2601009_A"; public static final String KFPA_DASH_PKEY = "2601009_A";
public static final String KFPA_COMMENT_PKEY = "2604005_F"; public static final String KFPA_COMMENT_PKEY = "2604005_F";
public static final String SAFETY_INSPECTION_PKEY = KFPA_DASH_PKEY;
public static final String UCSI_PKEY = "2604005_E";
public static final String BRIDGE_PLATFORM_PKEY = "2604005_D";
public static final String CONSULTING_PKEY = "2604005_C";
public static final String INSURANCE_OPERATIONS_PKEY = "2604005_A";
public static final String FIRE_INVESTIGATION_PKEY = "2604005_B";
public static final String TOTAL = "-1"; public static final String TOTAL = "-1";
public static final String SEOUL = "1"; public static final String SEOUL = "1";
public static final String GYEONGGI = "3"; public static final String GYEONGGI = "3";
@@ -14,27 +23,65 @@ public final class KfpaDashConstant {
public static final String DAEGU = "5"; public static final String DAEGU = "5";
public static final String DAEJEON = "6"; public static final String DAEJEON = "6";
public static final String GWANGJU = "4"; public static final String GWANGJU = "4";
public static final String RISK_MANAGEMENT = "11";
public static final String INSEUDATA = "21";
private static final String IDKEY_PREFIX = "Q1003_"; private static final String IDKEY_PREFIX = "Q1003_";
public static final List<String> QUERY_QIDS = List.of("q1", "q2", "q4", "q5");
public static final Map<String, List<String>> REAL_QIDS = Map.of(
SAFETY_INSPECTION_PKEY, List.of("Q1", "Q2", "Q7", "Q10"),
UCSI_PKEY, List.of("Q2", "Q5", "Q6", "Q11"),
BRIDGE_PLATFORM_PKEY, List.of("Q2", "Q4", "Q5", "Q6"),
CONSULTING_PKEY, List.of("Q10", "Q8", "Q12", "Q15"),
INSURANCE_OPERATIONS_PKEY, List.of("Q3", "Q4", "Q5", "Q6"),
FIRE_INVESTIGATION_PKEY, List.of("Q1", "Q3", "Q5", "Q4")
);
public static final Map<String, Map<String, Double>> WEIGHTS = Map.of(
SAFETY_INSPECTION_PKEY, Map.of("q1", 0.4,"q2", 0.4,"q4", 0.1,"q5", 0.1),
UCSI_PKEY, Map.of("q1", 0.4,"q2", 0.4,"q4", 0.1,"q5", 0.1),
BRIDGE_PLATFORM_PKEY, Map.of("q1", 0.4,"q2", 0.4,"q4", 0.1,"q5", 0.1),
CONSULTING_PKEY, Map.of("q1", 0.35,"q2", 0.35,"q4", 0.15,"q5", 0.15),
INSURANCE_OPERATIONS_PKEY, Map.of("q1", 0.35,"q2", 0.35,"q4", 0.15,"q5", 0.15),
FIRE_INVESTIGATION_PKEY, Map.of("q1", 0.35,"q2", 0.35,"q4", 0.15,"q5", 0.15)
);
public static final Map<String, String> IDKEY_MAP = Map.of( public static final Map<String, String> IDKEY_MAP = Map.of(
SEOUL, IDKEY_PREFIX + SEOUL, SEOUL, IDKEY_PREFIX + SEOUL,
GYEONGGI, IDKEY_PREFIX + GYEONGGI, GYEONGGI, IDKEY_PREFIX + GYEONGGI,
BUSAN, IDKEY_PREFIX + BUSAN, BUSAN, IDKEY_PREFIX + BUSAN,
DAEGU, IDKEY_PREFIX + DAEGU, DAEGU, IDKEY_PREFIX + DAEGU,
DAEJEON, IDKEY_PREFIX + DAEJEON, DAEJEON, IDKEY_PREFIX + DAEJEON,
GWANGJU, IDKEY_PREFIX + GWANGJU GWANGJU, IDKEY_PREFIX + GWANGJU,
RISK_MANAGEMENT, IDKEY_PREFIX + RISK_MANAGEMENT,
INSEUDATA, IDKEY_PREFIX + INSEUDATA
); );
public static final Map<String, CsiDataDto> DATA_2025 = Map.of( public static final Map<String, Map<String, CsiDataDto>> DATA_2025 = Map.of(
TOTAL, CsiDataDto.of(2025,4.47, 4.46, null, 4.43, 4.63), SAFETY_INSPECTION_PKEY, Map.of(
SEOUL, CsiDataDto.of(2025,4.39, 4.36, null, 4.37, 4.63), TOTAL, CsiDataDto.of(2025, null,4.47, 4.46, null, 4.43, 4.63),
GYEONGGI, CsiDataDto.of(2025,4.48, 4.46, null, 4.44, 4.65), SEOUL, CsiDataDto.of(2025, null,4.39, 4.36, null, 4.37, 4.63),
BUSAN, CsiDataDto.of(2025,4.43, 4.41, null, 4.39, 4.62), GYEONGGI, CsiDataDto.of(2025, null,4.48, 4.46, null, 4.44, 4.65),
DAEGU, CsiDataDto.of(2025,4.56, 4.55, null, 4.54, 4.66), BUSAN, CsiDataDto.of(2025, null,4.43, 4.41, null, 4.39, 4.62),
DAEJEON, CsiDataDto.of(2025,4.47, 4.47, null, 4.40, 4.57), DAEGU, CsiDataDto.of(2025, null,4.56, 4.55, null, 4.54, 4.66),
GWANGJU, CsiDataDto.of(2025,4.52, 4.51, null, 4.46, 4.67) DAEJEON, CsiDataDto.of(2025, null,4.47, 4.47, null, 4.40, 4.57),
GWANGJU, CsiDataDto.of(2025, null,4.52, 4.51, null, 4.46, 4.67)
),
UCSI_PKEY, Map.of(
TOTAL, CsiDataDto.of(2025, null,4.37, 4.40, 4.36, 4.33, null)
),
BRIDGE_PLATFORM_PKEY, Map.of(
TOTAL, CsiDataDto.of(2025, null,4.43, 4.44, null, 4.38, 4.41)
),
CONSULTING_PKEY, Map.of(
TOTAL, CsiDataDto.of(2025, null,4.82, 4.81, 4.76, 4.90, 4.90)
),
INSURANCE_OPERATIONS_PKEY, Map.of(
TOTAL, CsiDataDto.of(2025, null,4.89, 4.94, 4.84, 4.88, 4.94)
),
FIRE_INVESTIGATION_PKEY, Map.of(
TOTAL, CsiDataDto.of(2025, null,4.46, 4.50, null, 4.75, 4.00)
)
); );
private KfpaDashConstant() {} private KfpaDashConstant() {}
} }

View File

@@ -1,6 +1,7 @@
package com.kri.kfpa.dash.controller; package com.kri.kfpa.dash.controller;
import com.kri.kfpa.dash.dto.CsiDataDto; import com.kri.kfpa.dash.dto.CsiDataDto;
import com.kri.kfpa.dash.dto.CsiSummaryDto;
import com.kri.kfpa.dash.dto.DivDetailDataDto; import com.kri.kfpa.dash.dto.DivDetailDataDto;
import com.kri.kfpa.dash.service.StatisticsService; import com.kri.kfpa.dash.service.StatisticsService;
import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Operation;
@@ -11,6 +12,7 @@ import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@@ -21,18 +23,31 @@ public class StatisticsController {
private final StatisticsService statisticsService; private final StatisticsService statisticsService;
@Operation(summary = "전체 summary 조회")
@GetMapping("/csi-summary")
public Map<String, List<CsiSummaryDto>> getCsiSummary(
@RequestParam(name = "dt") String searchDateTime
) {
return statisticsService.getCsiSummary(searchDateTime);
}
@Operation(summary = "csi 데이터 조회") @Operation(summary = "csi 데이터 조회")
@GetMapping("/csi") @GetMapping("/csi")
public Map<String, List<CsiDataDto>> getCsiData() { public Map<String, List<CsiDataDto>> getCsiData(
return statisticsService.getCsiData(); @RequestParam(name = "pkey") String pkey,
@RequestParam(name = "dt") String searchDateTime
) {
return statisticsService.getCsiData(pkey, searchDateTime);
} }
@Operation(summary = "지역 본부 상세 조회") @Operation(summary = "지역 본부 상세 조회")
@GetMapping("/div-detail/{div}") @GetMapping("/div-detail/{div}")
public Map<String, DivDetailDataDto> getDivDetailData( public Map<String, DivDetailDataDto> getDivDetailData(
@PathVariable String div @PathVariable String div,
@RequestParam(name = "pkey") String pkey,
@RequestParam(name = "dt") String searchDateTime
) { ) {
return statisticsService.getDivDetailData(div); return statisticsService.getDivDetailData(div, pkey, searchDateTime);
} }
} }

View File

@@ -7,51 +7,47 @@ import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.experimental.SuperBuilder;
@Getter @Getter
@Setter @Setter
@Builder @SuperBuilder
@AllArgsConstructor
@Schema(description = "CSI 계산결과 Dto") @Schema(description = "CSI 계산결과 Dto")
public class CsiDataDto { public class CsiDataDto extends CsiSummaryDto {
@Schema(description = "연도") @Schema(description = "직접요소 1")
private Integer wave; private Double direct1;
@Schema(description = "CSI 점수") @Schema(description = "직접요소 2")
private Double csi; private Double direct2;
@Schema(description = "현장 안전점검 도움 정도") @Schema(description = "간접요소 1")
private Double safeHelp; private Double indirect1;
@Schema(description = "위험개선권고사항 도움 정도") @Schema(description = "간접요소 2")
private Double recHelp; private Double indirect2;
@Schema(description = "점검직원 전문성") public static CsiDataDto of(Integer wave, Integer sampleCount, Double csi, Double direct1, Double direct2, Double indirect1, Double indirect2) {
private Double staffProf;
@Schema(description = "점검직원 태도")
private Double staffAtt;
public static CsiDataDto of(Integer wave, Double csi, Double safeHelp, Double recHelp, Double staffProf, Double staffAtt) {
return CsiDataDto.builder() return CsiDataDto.builder()
.wave(wave) .wave(wave)
.sampleCount(sampleCount)
.csi(csi) .csi(csi)
.safeHelp(safeHelp) .direct1(direct1)
.recHelp(recHelp) .direct2(direct2)
.staffProf(staffProf) .indirect1(indirect1)
.staffAtt(staffAtt) .indirect2(indirect2)
.build(); .build();
} }
public static CsiDataDto from(Integer wave,CsiDataEntity entity) { public static CsiDataDto from(Integer wave,CsiDataEntity entity) {
return CsiDataDto.builder() return CsiDataDto.builder()
.wave(wave) .wave(wave)
.sampleCount(entity.getSampleCount())
.csi(entity.getCsi()) .csi(entity.getCsi())
.safeHelp(entity.getSafeHelp()) .direct1(entity.getDirect1())
.recHelp(entity.getRecHelp()) .direct2(entity.getDirect2())
.staffProf(entity.getStaffProf()) .indirect1(entity.getIndirect1())
.staffAtt(entity.getStaffAtt()) .indirect2(entity.getIndirect2())
.build(); .build();
} }
} }

View File

@@ -0,0 +1,33 @@
package com.kri.kfpa.dash.dto;
import com.kri.kfpa.dash.entity.CsiDataEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import lombok.experimental.SuperBuilder;
@Getter
@Setter
@SuperBuilder
@AllArgsConstructor
@Schema(description = "CSI Summary Dto")
public class CsiSummaryDto {
@Schema(description = "연도")
private Integer wave;
@Schema(description = "응답 건수")
private Integer sampleCount;
@Schema(description = "CSI 점수")
private Double csi;
public static CsiSummaryDto from(CsiDataDto dto) {
if (dto == null) {
return null;
}
return new CsiSummaryDto(dto.getWave(), dto.getSampleCount(), dto.getCsi());
}
}

View File

@@ -9,13 +9,15 @@ public class CsiDataEntity {
private String div; private String div;
private Integer sampleCount;
private Double csi; private Double csi;
private Double safeHelp; private Double direct1;
private Double recHelp; private Double direct2;
private Double staffProf; private Double indirect1;
private Double staffAtt; private Double indirect2;
} }

View File

@@ -12,10 +12,18 @@ import org.apache.ibatis.annotations.Param;
@Mapper @Mapper
public interface DataMapper { public interface DataMapper {
List<CsiDataEntity> selectDivCsiData(@Param("pkey") String pkey); List<CsiDataEntity> selectDivCsiData(
@Param("pkey") String pkey,
@Param("qids") List<Map<String, String>> qids,
@Param("weights") Map<String, Double> weights,
@Param("dt") String dt
);
List<ObjectTypeCsiRankEntity> selectDivObjectTypeCsiRank( List<ObjectTypeCsiRankEntity> selectDivObjectTypeCsiRank(
@Param("pkey") String pkey @Param("pkey") String pkey,
@Param("qids") List<Map<String, String>> qids,
@Param("weights") Map<String, Double> weights,
@Param("dt") String dt
); );
DivCommentEntity selectDivComment( DivCommentEntity selectDivComment(

View File

@@ -20,7 +20,7 @@ public class AdminService {
private static final List<String> REQUIRED_COMMENT_KEYS = List.of( private static final List<String> REQUIRED_COMMENT_KEYS = List.of(
"performance25", "performance25",
"plan26", //"plan26",
"performance26" "performance26"
); );

View File

@@ -3,16 +3,22 @@ package com.kri.kfpa.dash.service;
import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.DATA_2025; import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.DATA_2025;
import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.IDKEY_MAP; import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.IDKEY_MAP;
import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.KFPA_COMMENT_PKEY; import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.KFPA_COMMENT_PKEY;
import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.KFPA_DASH_PKEY; import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.QUERY_QIDS;
import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.REAL_QIDS;
import static com.kri.kfpa.dash.common.consts.KfpaDashConstant.WEIGHTS;
import com.kri.common.feature.web.BusinessException; import com.kri.common.feature.web.BusinessException;
import com.kri.kfpa.dash.dto.CsiDataDto; import com.kri.kfpa.dash.dto.CsiDataDto;
import com.kri.kfpa.dash.dto.CsiRankDto; import com.kri.kfpa.dash.dto.CsiRankDto;
import com.kri.kfpa.dash.dto.CsiSummaryDto;
import com.kri.kfpa.dash.dto.DivDetailDataDto; import com.kri.kfpa.dash.dto.DivDetailDataDto;
import com.kri.kfpa.dash.entity.CsiDataEntity; import com.kri.kfpa.dash.entity.CsiDataEntity;
import com.kri.kfpa.dash.entity.DivCommentEntity; import com.kri.kfpa.dash.entity.DivCommentEntity;
import com.kri.kfpa.dash.entity.ObjectTypeCsiRankEntity; import com.kri.kfpa.dash.entity.ObjectTypeCsiRankEntity;
import com.kri.kfpa.dash.mapper.DataMapper; import com.kri.kfpa.dash.mapper.DataMapper;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
@@ -27,14 +33,38 @@ import org.springframework.transaction.annotation.Transactional;
@RequiredArgsConstructor @RequiredArgsConstructor
@Transactional(readOnly = true) @Transactional(readOnly = true)
public class StatisticsService { public class StatisticsService {
private static final DateTimeFormatter SEARCH_DATE_TIME_FORMATTER =
DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
private static final DateTimeFormatter EDT_FORMATTER =
DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
private final DataMapper dataMapper; private final DataMapper dataMapper;
@Value("${kri.kfpa-comment-idkey-suffix:}") @Value("${kri.kfpa-comment-idkey-suffix:}")
private String kfpaCommentIdkeySuffix; private String kfpaCommentIdkeySuffix;
public Map<String, List<CsiDataDto>> getCsiData() { public Map<String, List<CsiSummaryDto>> getCsiSummary(String searchDateTime) {
List<CsiDataEntity> csiDataList = dataMapper.selectDivCsiData(KFPA_DASH_PKEY); Map<String, List<CsiSummaryDto>> mergedCsiSummary = new LinkedHashMap<>();
REAL_QIDS.keySet().forEach(pkey ->
getCsiData(pkey, searchDateTime).forEach((div, data) ->
mergedCsiSummary.put(
pkey + "_" + div,
data.stream().map(CsiSummaryDto::from).toList()
)
)
);
return mergedCsiSummary;
}
public Map<String, List<CsiDataDto>> getCsiData(String pkey, String searchDateTime) {
List<CsiDataEntity> csiDataList = dataMapper.selectDivCsiData(
pkey,
getQids(pkey),
getWeights(pkey),
getParsedSearchDateTime(searchDateTime)
);
Map<String, CsiDataDto> csiData = csiDataList.stream() Map<String, CsiDataDto> csiData = csiDataList.stream()
.collect(Collectors.toMap( .collect(Collectors.toMap(
@@ -43,7 +73,11 @@ public class StatisticsService {
)); ));
Map<String, List<CsiDataDto>> mergedCsiData = new LinkedHashMap<>(); Map<String, List<CsiDataDto>> mergedCsiData = new LinkedHashMap<>();
DATA_2025.forEach((div, data) -> mergedCsiData.put(div, new ArrayList<>(List.of(data))));
DATA_2025.get(pkey).forEach((div, data) ->
mergedCsiData.put(div, new ArrayList<>(List.of(data)))
);
csiData.forEach((div, data) -> mergedCsiData csiData.forEach((div, data) -> mergedCsiData
.computeIfAbsent(div, key -> new ArrayList<>()) .computeIfAbsent(div, key -> new ArrayList<>())
.add(data)); .add(data));
@@ -51,42 +85,92 @@ public class StatisticsService {
return mergedCsiData; return mergedCsiData;
} }
public Map<String, DivDetailDataDto> getDivDetailData(String div) { public Map<String, DivDetailDataDto> getDivDetailData(String div, String pkey, String searchDateTime) {
String idkey = IDKEY_MAP.get(div); String idkey = IDKEY_MAP.get(div);
if (idkey == null) { if (idkey == null) {
throw BusinessException.badRequest( throw BusinessException.badRequest(
"INVALID_DIVISION", "INVALID_DIVISION",
"유효하지 않은 지역 본부입니다." "유효하지 않은 지점본부입니다."
).with("div", div); ).with("div", div);
} }
String suffixedIdkey = idkey + kfpaCommentIdkeySuffix; String suffixedIdkey = idkey + kfpaCommentIdkeySuffix;
List<ObjectTypeCsiRankEntity> objectTypeCsiRankList = List<ObjectTypeCsiRankEntity> objectTypeCsiRankList =
dataMapper.selectDivObjectTypeCsiRank(KFPA_DASH_PKEY).stream() dataMapper.selectDivObjectTypeCsiRank(
pkey,
getQids(pkey),
getWeights(pkey),
getParsedSearchDateTime(searchDateTime)
).stream()
.filter(entity -> entity.getDiv().equals(div)) .filter(entity -> entity.getDiv().equals(div))
.toList(); .toList();
DivCommentEntity selectedComment = dataMapper.selectDivComment(KFPA_COMMENT_PKEY, suffixedIdkey);
DivCommentEntity divCommentEntity =
selectedComment == null ? DivCommentEntity.empty() : selectedComment;
Map<String, DivDetailDataDto> divDetailData = new LinkedHashMap<>(); Map<String, DivDetailDataDto> divDetailData = new LinkedHashMap<>();
Map<String, DivCommentEntity> divCommentCache = new LinkedHashMap<>(); DivDetailDataDto detailData =
DivDetailDataDto.of(new LinkedHashMap<>(), divCommentEntity.getCommentValues());
divDetailData.put(div, detailData);
for (ObjectTypeCsiRankEntity entity : objectTypeCsiRankList) { for (ObjectTypeCsiRankEntity entity : objectTypeCsiRankList) {
DivCommentEntity divCommentEntity = divCommentCache.computeIfAbsent(
div,
key -> {
DivCommentEntity selectedComment =
dataMapper.selectDivComment(KFPA_COMMENT_PKEY, suffixedIdkey);
return selectedComment == null ? DivCommentEntity.empty() : selectedComment;
}
);
DivDetailDataDto detailData = divDetailData.computeIfAbsent(
div,
key -> DivDetailDataDto.of(new LinkedHashMap<>(), divCommentEntity.getCommentValues())
);
detailData.getCsiRanks().put(entity.getObjectType(), CsiRankDto.from(entity)); detailData.getCsiRanks().put(entity.getObjectType(), CsiRankDto.from(entity));
} }
return divDetailData; return divDetailData;
} }
private String getParsedSearchDateTime(String searchDateTime) {
try {
LocalDateTime parsedSearchDateTime =
LocalDateTime.parse(searchDateTime, SEARCH_DATE_TIME_FORMATTER);
return parsedSearchDateTime
.withSecond(59)
.withNano(999_000_000)
.format(EDT_FORMATTER);
} catch (DateTimeParseException e) {
throw BusinessException.badRequest(
"INVALID_SEARCH_DATE",
"유효하지 않은 검색일시 형식입니다."
).with("searchDateTime", searchDateTime);
}
}
private List<Map<String, String>> getQids(String pkey) {
List<String> realQids = REAL_QIDS.get(pkey);
if (realQids == null) {
throw BusinessException.badRequest(
"INVALID_PKEY",
"유효하지 않은 pkey입니다."
).with("pkey", pkey);
}
if (realQids.size() != QUERY_QIDS.size()) {
throw BusinessException.badRequest(
"INVALID_QIDS",
"문항 ID 설정이 올바르지 않습니다."
).with("pkey", pkey);
}
List<Map<String, String>> qids = new ArrayList<>();
for (int i = 0; i < realQids.size(); i++) {
qids.add(Map.of(
"realQid", realQids.get(i),
"queryQid", QUERY_QIDS.get(i)
));
}
return qids;
}
private Map<String, Double> getWeights(String pkey) {
Map<String, Double> weights = WEIGHTS.get(pkey);
if (weights == null) {
throw BusinessException.badRequest(
"INVALID_PKEY",
"유효하지 않은 pkey입니다."
).with("pkey", pkey);
}
return weights;
}
} }

View File

@@ -4,11 +4,12 @@
<mapper namespace="com.kri.kfpa.dash.mapper.DataMapper"> <mapper namespace="com.kri.kfpa.dash.mapper.DataMapper">
<resultMap id="DivCsiDataResultMap" type="com.kri.kfpa.dash.entity.CsiDataEntity"> <resultMap id="DivCsiDataResultMap" type="com.kri.kfpa.dash.entity.CsiDataEntity">
<result property="div" column="div"/> <result property="div" column="div"/>
<result property="sampleCount" column="sample_count"/>
<result property="csi" column="csi"/> <result property="csi" column="csi"/>
<result property="safeHelp" column="safe_help"/> <result property="direct1" column="direct1"/>
<result property="recHelp" column="rec_help"/> <result property="direct2" column="direct2"/>
<result property="staffProf" column="staff_prof"/> <result property="indirect1" column="indirect1"/>
<result property="staffAtt" column="staff_att"/> <result property="indirect2" column="indirect2"/>
</resultMap> </resultMap>
<resultMap id="DivObjectTypeCsiRankResultMap" type="com.kri.kfpa.dash.entity.ObjectTypeCsiRankEntity"> <resultMap id="DivObjectTypeCsiRankResultMap" type="com.kri.kfpa.dash.entity.ObjectTypeCsiRankEntity">
@@ -30,23 +31,50 @@
<result property="performance26Capability" column="performance26_capability"/> <result property="performance26Capability" column="performance26_capability"/>
</resultMap> </resultMap>
<sql id="CsiScoreExpression">
q1 * #{weights.q1} + q2 * #{weights.q2} + q4 * #{weights.q4} + q5 * #{weights.q5}
</sql>
<sql id="BaseDataSelect"> <sql id="BaseDataSelect">
SELECT SELECT
IDKEY DA.IDKEY
, TRY_CAST(JSON_VALUE(DATJSON, '$.Q1.Q1') AS DECIMAL(18, 4)) AS q1 <foreach collection="qids" item="qid">
, TRY_CAST(JSON_VALUE(DATJSON, '$.Q2.Q2') AS DECIMAL(18, 4)) AS q2 , TRY_CAST(MAX(CASE WHEN DV.[KEY] = #{qid.realQid} THEN DV.[VALUE] END) AS DECIMAL(18, 4)) AS ${qid.queryQid}
, TRY_CAST(JSON_VALUE(DATJSON, '$.Q7.Q7') AS DECIMAL(18, 4)) AS q4 </foreach>
, TRY_CAST(JSON_VALUE(DATJSON, '$.Q10.Q10') AS DECIMAL(18, 4)) AS q5 <choose>
, CASE <when test="pkey == '2601009_A'">
WHEN JSON_VALUE(DATJSON, '$.Q16.Q14') IS NOT NULL , MAX(CASE WHEN DV.[KEY] = 'Q14' THEN DV.[VALUE] END) AS object_type_raw
THEN JSON_VALUE(DATJSON, '$.Q16.Q14') , MAX(CASE WHEN DV.[KEY] = 'Q16' THEN DV.[VALUE] END) AS div
ELSE JSON_VALUE(DATJSON, '$.Q14.Q14') </when>
END AS object_type_raw <otherwise>
, JSON_VALUE(DATJSON, '$.Q16.Q16') AS div , '0' AS object_type_raw
FROM Kon.dbo.DATA , '0' AS div
</otherwise>
</choose>
FROM Kon.dbo.DATA DA
CROSS APPLY OPENJSON(DA.DATJSON) DJ
CROSS APPLY OPENJSON(DJ.VALUE) DV
WHERE SURVEY_TYPE != 'TEST' WHERE SURVEY_TYPE != 'TEST'
AND Status = 10 AND Status = 10
AND PKEY = #{pkey} AND JSON_VALUE(DATJSON, '$.Q16.Q16') != '99' AND PKEY = #{pkey}
AND dbo.FN_LAST_TIME(survey_date) &lt;= #{dt}
AND (
DV.[KEY] IN
<foreach collection="qids" item="qid" open="(" separator="," close=")">
#{qid.realQid}
</foreach>
<if test="pkey == '2601009_A'">
OR DV.[KEY] IN ('Q14', 'Q16')
</if>
)
<if test="pkey == '2601009_A'">
AND JSON_VALUE(DATJSON, '$.Q16.Q16') != '99'
</if>
<if test="pkey == '2601009_A'">
AND JSON_VALUE(DATJSON, '$.Q20.Q20_1') != ''
AND JSON_VALUE(DATJSON, '$.Q20.Q20_1') IS NOT NULL
</if>
GROUP BY DA.IDKEY
</sql> </sql>
<select id="selectDivCsiData" resultMap="DivCsiDataResultMap"> <select id="selectDivCsiData" resultMap="DivCsiDataResultMap">
@@ -68,22 +96,24 @@
) )
SELECT SELECT
div div
, AVG(q1 * 0.4 + q2 * 0.4 + q4 * 0.1 + q5 * 0.1) AS csi , AVG(<include refid="CsiScoreExpression"/>) AS csi
, AVG(q1) AS safe_help , COUNT(1) AS sample_count
, AVG(q2) AS rec_help , AVG(q1) AS direct1
, AVG(q4) AS staff_prof , AVG(q2) AS direct2
, AVG(q5) AS staff_att , AVG(q4) AS indirect1
, AVG(q5) AS indirect2
, 1 AS sort_order , 1 AS sort_order
FROM Filtered FROM Filtered
GROUP BY div GROUP BY div
UNION ALL UNION ALL
SELECT SELECT
'-1' AS div '-1' AS div
, AVG(q1 * 0.4 + q2 * 0.4 + q4 * 0.1 + q5 * 0.1) AS csi , AVG(<include refid="CsiScoreExpression"/>) AS csi
, AVG(q1) AS safe_help , COUNT(1) AS sample_count
, AVG(q2) AS rec_help , AVG(q1) AS direct1
, AVG(q4) AS staff_prof , AVG(q2) AS direct2
, AVG(q5) AS staff_att , AVG(q4) AS indirect1
, AVG(q5) AS indirect2
, 0 AS sort_order , 0 AS sort_order
FROM Filtered FROM Filtered
ORDER BY sort_order, div ORDER BY sort_order, div
@@ -101,6 +131,7 @@
, q4 , q4
, q5 , q5
, div , div
, object_type_raw
, CASE , CASE
WHEN object_type_raw IN ('4', '12') THEN object_type_raw WHEN object_type_raw IN ('4', '12') THEN object_type_raw
ELSE '90' ELSE '90'
@@ -111,20 +142,51 @@
SELECT SELECT
div div
, object_type , object_type
, AVG(q1 * 0.4 + q2 * 0.4 + q4 * 0.1 + q5 * 0.1) AS csi , AVG(<include refid="CsiScoreExpression"/>) AS csi
FROM Recode FROM Recode
WHERE div IS NOT NULL WHERE div IS NOT NULL
AND div != '99'
AND object_type_raw IS NOT NULL
AND object_type_raw != '99'
GROUP BY div, object_type GROUP BY div, object_type
),
TotalCsiAgg AS (
SELECT
div
, AVG(<include refid="CsiScoreExpression"/>) AS csi
FROM Recode
WHERE div IS NOT NULL
AND div != '99'
AND object_type_raw IS NOT NULL
AND object_type_raw != '99'
GROUP BY div
),
Ranked AS (
SELECT
div
, object_type
, csi
, DENSE_RANK() OVER (
PARTITION BY object_type
ORDER BY csi DESC
) AS div_rank
FROM CsiAgg
UNION ALL
SELECT
div
, '-1' AS object_type
, csi
, DENSE_RANK() OVER (
ORDER BY csi DESC
) AS div_rank
FROM TotalCsiAgg
) )
SELECT SELECT
div div
, object_type , object_type
, CSI , csi
, DENSE_RANK() OVER ( , div_rank
PARTITION BY object_type FROM Ranked
ORDER BY CSI DESC
) AS div_rank
FROM CsiAgg
ORDER BY div, object_type, div_rank ORDER BY div, object_type, div_rank
</select> </select>