Compare commits
15 Commits
844d098f8a
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| b99b964bfe | |||
| 324ba3a1ca | |||
| 8a889c71af | |||
| 7b30f4161a | |||
| 4361a42aca | |||
| 0aff805596 | |||
| 4b080ec725 | |||
| 0a6246964b | |||
| d643295441 | |||
| 801bc61783 | |||
| 84551d22de | |||
| a60cf5efd9 | |||
| 0904804036 | |||
| 4e977e5f49 | |||
| 70a6538378 |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -35,3 +35,6 @@ out/
|
||||
|
||||
### VS Code ###
|
||||
.vscode/
|
||||
|
||||
logs
|
||||
upload-file
|
||||
@@ -32,7 +32,7 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "com.kri.common:starter:beta.1.0.69"
|
||||
implementation "com.kri.common:starter:beta.1.1.17"
|
||||
|
||||
implementation 'org.springframework.boot:spring-boot-starter-web'
|
||||
implementation 'org.springframework.boot:spring-boot-starter-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'
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,23 +40,21 @@ public class UploadController {
|
||||
produces = {MediaType.APPLICATION_JSON_VALUE, XLSX}
|
||||
)
|
||||
@Operation(summary = "파일 업로드", description = "성공이면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환")
|
||||
@ApiResponses({
|
||||
@ApiResponse(
|
||||
responseCode = "200",
|
||||
description = "성공(JSON) 또는 실패 엑셀(xlsx)",
|
||||
content = {
|
||||
@Content(
|
||||
mediaType = MediaType.APPLICATION_JSON_VALUE,
|
||||
schema = @Schema(implementation = ExcelUploadSuccessDto.class)
|
||||
),
|
||||
@Content(
|
||||
mediaType = XLSX,
|
||||
schema = @Schema(type = "string", format = "binary")
|
||||
)
|
||||
}
|
||||
@ApiResponse(
|
||||
responseCode = "200",
|
||||
description = "성공(JSON) 또는 실패 엑셀(xlsx)",
|
||||
content = {
|
||||
@Content(
|
||||
mediaType = MediaType.APPLICATION_JSON_VALUE,
|
||||
schema = @Schema(implementation = ExcelUploadSuccessDto.class)
|
||||
),
|
||||
@Content(
|
||||
mediaType = XLSX,
|
||||
schema = @Schema(type = "string", format = "binary")
|
||||
)
|
||||
})
|
||||
public ResponseEntity<?> importData(
|
||||
}
|
||||
)
|
||||
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));
|
||||
}
|
||||
|
||||
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;
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import static com.kri.lge.penetration.common.consts.LgePenetrationConst.INSERT_C
|
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.excel.ExcelMapper;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.excel.ExcelMapper;
|
||||
import com.kri.lge.penetration.dto.DataItemDto;
|
||||
import com.kri.lge.penetration.dto.ExcelUploadResultDto;
|
||||
import com.kri.lge.penetration.persistence.jdbc.DataJdbcRepository;
|
||||
@@ -138,7 +138,7 @@ public class UploadService {
|
||||
if (EXCEL_ID.equals(key)) continue;
|
||||
|
||||
String v = e.getValue();
|
||||
if (v == null || v.isBlank()) {
|
||||
if (v == null || v.isBlank() || "#NULL!".equals(v.trim())) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -243,4 +243,4 @@ public class UploadService {
|
||||
return new ParsedRow(null, reason);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.lge.penetration.service.file;
|
||||
|
||||
import com.kri.common.datetime.DateTimeUtil;
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.feature.datetime.DateTimeUtil;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
@@ -128,4 +128,4 @@ public abstract class AbstractFileService {
|
||||
|
||||
Files.deleteIfExists(target);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package com.kri.lge.penetration.service.file;
|
||||
|
||||
import com.kri.common.util.CommonUtil;
|
||||
import com.kri.common.web.BusinessException;
|
||||
import com.kri.common.feature.util.CommonUtil;
|
||||
import com.kri.common.feature.web.BusinessException;
|
||||
import com.kri.lge.penetration.config.FileStorageProperties;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
@@ -43,4 +43,4 @@ public class DataFileService extends AbstractFileService {
|
||||
throw BusinessException.internalError("FAIL_DATA_DELETE", e.getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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,6 +42,8 @@ kri:
|
||||
|
||||
swagger:
|
||||
enabled: true
|
||||
allowed-ips:
|
||||
- 211.254.145.130
|
||||
title: "LGE CX Dash"
|
||||
description: "LGE 가전 보급률 Dashboard"
|
||||
version: "v1.0.0"
|
||||
@@ -50,12 +52,9 @@ kri:
|
||||
file:
|
||||
data-base-dir: ./upload-file/data
|
||||
|
||||
common:
|
||||
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