diff --git a/src/main/java/com/kamco/cd/kamcoback/auth/MenuAuthorizationManager.java b/src/main/java/com/kamco/cd/kamcoback/auth/MenuAuthorizationManager.java index 021332e9..a9e8b11c 100644 --- a/src/main/java/com/kamco/cd/kamcoback/auth/MenuAuthorizationManager.java +++ b/src/main/java/com/kamco/cd/kamcoback/auth/MenuAuthorizationManager.java @@ -1,13 +1,12 @@ package com.kamco.cd.kamcoback.auth; +import com.kamco.cd.kamcoback.common.enums.RoleType; import com.kamco.cd.kamcoback.postgres.entity.MenuEntity; import com.kamco.cd.kamcoback.postgres.repository.menu.MenuRepository; import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.function.Supplier; import lombok.RequiredArgsConstructor; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; import org.springframework.security.authorization.AuthorizationDecision; import org.springframework.security.authorization.AuthorizationManager; import org.springframework.security.core.Authentication; @@ -24,8 +23,6 @@ import org.springframework.stereotype.Component; @RequiredArgsConstructor public class MenuAuthorizationManager implements AuthorizationManager { - private static final Logger log = LogManager.getLogger(MenuAuthorizationManager.class); - private final MenuRepository menuAuthQueryRepository; @Override @@ -45,7 +42,7 @@ public class MenuAuthorizationManager implements AuthorizationManager matchedMenus = menuAuthQueryRepository.findMenusByRequestPath(requestPath); @@ -72,12 +69,12 @@ public class MenuAuthorizationManager implements AuthorizationManager allowedMenus = menuAuthQueryRepository.findAllowedMenuUrlsByRole(role); if (allowedMenus == null || allowedMenus.isEmpty()) { return new AuthorizationDecision(false); diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java index 6a578e32..980a5a22 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultShpService.java @@ -5,6 +5,7 @@ import com.kamco.cd.kamcoback.inference.dto.WriteCnt; import com.kamco.cd.kamcoback.postgres.core.InferenceResultShpCoreService; import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,6 +17,9 @@ public class InferenceResultShpService { private final InferenceResultShpCoreService coreService; private final ShpWriter shpWriter; + @Value("${mapsheet.shp.baseurl}") + private String baseDir; + /** inference_results 테이블을 기준으로 분석 결과 테이블과 도형 테이블을 최신 상태로 반영한다. */ @Transactional public InferenceResultShpDto.InferenceCntDto saveInferenceResultData() { @@ -33,9 +37,6 @@ public class InferenceResultShpService { @Transactional public InferenceResultShpDto.FileCntDto createShpFile() { - // TODO 파일 경로는 정해지면 수정, properties 사용 - String baseDir = "/app/detect/result"; - // TODO 배치 실행으로 변경 필요 int batchSize = 100; int geomLimit = 500_000; diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java index 7ce986d6..f41d8191 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataInferenceGeomEntity.java @@ -146,4 +146,10 @@ public class MapSheetAnalDataInferenceGeomEntity { @Column(name = "file_created_dttm") private ZonedDateTime fileCreatedDttm; + + @Column(name = "pass_yn") + private Boolean passYn; + + @Column(name = "pass_yn_dttm") + private ZonedDateTime passYnDttm; } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 6c7b17f0..4a00ed71 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -73,4 +73,6 @@ logging: mapsheet: upload: skipGdalValidation: true + shp: + baseurl: /app/detect/result diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index 0889d7ff..37250f1e 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -53,3 +53,9 @@ token: springdoc: swagger-ui: persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 + +mapsheet: + upload: + skipGdalValidation: true + shp: + baseurl: /Users/bokmin/detect/result diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index e989c2b4..7c633ecd 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -30,5 +30,9 @@ token: refresh-cookie-name: kamco # 개발용 쿠키 이름 refresh-cookie-secure: true # 로컬 http 테스트면 false - +mapsheet: + upload: + skipGdalValidation: true + shp: + baseurl: /app/detect/result