diff --git a/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.bin b/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.bin index 7481f50..890a38b 100644 Binary files a/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.bin and b/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.bin differ diff --git a/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.lock b/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.lock index 0a2b870..b58c0b0 100644 Binary files a/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.lock and b/gukyuin/status-update/.gradle/8.14/executionHistory/executionHistory.lock differ diff --git a/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.bin b/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.bin index a717d64..ed0eb6d 100644 Binary files a/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.bin and b/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.bin differ diff --git a/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.lock b/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.lock index 2097bb3..6cae21c 100644 Binary files a/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.lock and b/gukyuin/status-update/.gradle/8.14/fileHashes/fileHashes.lock differ diff --git a/gukyuin/status-update/.gradle/8.14/fileHashes/resourceHashesCache.bin b/gukyuin/status-update/.gradle/8.14/fileHashes/resourceHashesCache.bin index 3074fb1..e0b3c4d 100644 Binary files a/gukyuin/status-update/.gradle/8.14/fileHashes/resourceHashesCache.bin and b/gukyuin/status-update/.gradle/8.14/fileHashes/resourceHashesCache.bin differ diff --git a/gukyuin/status-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/gukyuin/status-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f9da996..bc3fc52 100644 Binary files a/gukyuin/status-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/gukyuin/status-update/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/gukyuin/status-update/.gradle/file-system.probe b/gukyuin/status-update/.gradle/file-system.probe index 10c140f..e996b58 100644 Binary files a/gukyuin/status-update/.gradle/file-system.probe and b/gukyuin/status-update/.gradle/file-system.probe differ diff --git a/gukyuin/status-update/.idea/misc.xml b/gukyuin/status-update/.idea/misc.xml index c6d45de..aa56ca5 100644 --- a/gukyuin/status-update/.idea/misc.xml +++ b/gukyuin/status-update/.idea/misc.xml @@ -1,6 +1,9 @@ + + + \ No newline at end of file diff --git a/gukyuin/status-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class b/gukyuin/status-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class index d2e40f7..07803ba 100644 Binary files a/gukyuin/status-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class and b/gukyuin/status-update/build/classes/java/main/com/kamco/cd/kamcoback/service/GukYuinApiService.class differ diff --git a/gukyuin/status-update/build/libs/status-update.jar b/gukyuin/status-update/build/libs/status-update.jar index 30622ad..e0b2fc0 100644 Binary files a/gukyuin/status-update/build/libs/status-update.jar and b/gukyuin/status-update/build/libs/status-update.jar differ diff --git a/gukyuin/status-update/build/resources/main/application-dev.yml b/gukyuin/status-update/build/resources/main/application-dev.yml index 2081606..afe173e 100644 --- a/gukyuin/status-update/build/resources/main/application-dev.yml +++ b/gukyuin/status-update/build/resources/main/application-dev.yml @@ -23,7 +23,6 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - #url: jdbc:postgresql://localhost:15432/kamco_cds username: kamco_cds password: kamco_cds_Q!W@E#R$ hikari: @@ -37,23 +36,14 @@ spring: transaction: default-timeout: 300 # 5분 트랜잭션 타임아웃 - data: - redis: - host: 192.168.2.109 - port: 6379 - password: kamco - logging: level: root: INFO org.springframework.web: DEBUG org.springframework.security: DEBUG - # 헬스체크 노이즈 핵심만 다운 - org.springframework.security.web.FilterChainProxy: INFO - org.springframework.security.web.authentication.AnonymousAuthenticationFilter: INFO - org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO - org.springframework.web.servlet.DispatcherServlet: INFO +file: + dataset-dir: /kamco-nfs/model_output/export/ gukyuin: url: http://192.168.2.129:5301 diff --git a/gukyuin/status-update/build/resources/main/application-local.yml b/gukyuin/status-update/build/resources/main/application-local.yml index cb09429..9473891 100644 --- a/gukyuin/status-update/build/resources/main/application-local.yml +++ b/gukyuin/status-update/build/resources/main/application-local.yml @@ -16,99 +16,22 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - # url: jdbc:postgresql://localhost:5432/local_0128 username: kamco_cds password: kamco_cds_Q!W@E#R$ - # username: postgres - # password: 1234 hikari: minimum-idle: 1 maximum-pool-size: 5 - data: - redis: - host: 192.168.2.109 - port: 6379 - password: kamco - - servlet: - multipart: - enabled: true - max-file-size: 4GB - max-request-size: 4GB - file-size-threshold: 10MB - -server: - tomcat: - max-swallow-size: 4GB - max-http-form-post-size: 4GB - -jwt: - secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b" - access-token-validity-in-ms: 86400000 # 1일 - refresh-token-validity-in-ms: 604800000 # 7일 - -token: - refresh-cookie-name: kamco-local # 개발용 쿠키 이름 - refresh-cookie-secure: false # 로컬 http 테스트면 false - -springdoc: - swagger-ui: - persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 - logging: level: org.hibernate.SQL: debug org.hibernate.orm.jdbc.bind: trace -mapsheet: - upload: - skipGdalValidation: true - shp: - baseurl: /Users/bokmin/detect/result - - - file: - sync-root-dir: C:/Users/gypark/kamco-nfs/images/ - #sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: ${file.sync-root-dir}/tmp/ - sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2025 - sync-auto-exception-before-year-cnt: 3 - - dataset-dir: C:/Users/gypark/kamco-nfs/dataset/ - #dataset-dir: /kamco-nfs/dataset/export/ - dataset-tmp-dir: ${file.dataset-dir}tmp/ - - model-dir: C:/Users/gypark/kamco-nfs/ckpt/model/ - #model-dir: /kamco-nfs/ckpt/model/ - model-tmp-dir: ${file.model-dir}tmp/ - model-file-extention: pth,json,py - - pt-path: /kamco-nfs/ckpt/classification/ - pt-FileName: v5-best.pt - - dataset-response: /kamco-nfs/dataset/response/ - -inference: - url: http://10.100.0.11:8000/jobs - batch-url: http://10.100.0.11:8000/batches - geojson-dir: /kamco-nfs/requests/ - jar-path: jar/makeshp-1.0.0.jar - inference-server-name: server1,server2,server3,server4 + dataset-dir: /kamco-nfs/model_output/export/ gukyuin: #url: http://localhost:8080 url: http://192.168.2.129:5301 cdi: ${gukyuin.url}/api/kcd/cdi -training-data: - geojson-dir: /kamco-nfs/model_output/labeling/ - -layer: - geoserver-url: https://kamco.geo-dev.gs.dabeeo.com - wms-path: geoserver/cd - wmts-path: geoserver/cd/gwc/service - workspace: cd - diff --git a/gukyuin/status-update/build/resources/main/application-prod.yml b/gukyuin/status-update/build/resources/main/application-prod.yml index bcdba91..3fd7e43 100644 --- a/gukyuin/status-update/build/resources/main/application-prod.yml +++ b/gukyuin/status-update/build/resources/main/application-prod.yml @@ -42,6 +42,9 @@ logging: org.springframework.web: DEBUG org.springframework.security: DEBUG +file: + dataset-dir: /data/model_output/export/ + gukyuin: url: http://172.16.4.56:15432 cdi: ${gukyuin.url}/api/kcd/cdi diff --git a/gukyuin/status-update/build/tmp/compileJava/previous-compilation-data.bin b/gukyuin/status-update/build/tmp/compileJava/previous-compilation-data.bin index 4387dc7..1cf55a6 100644 Binary files a/gukyuin/status-update/build/tmp/compileJava/previous-compilation-data.bin and b/gukyuin/status-update/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/gukyuin/status-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java b/gukyuin/status-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java index 48c0a7d..ce35e91 100644 --- a/gukyuin/status-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java +++ b/gukyuin/status-update/src/main/java/com/kamco/cd/kamcoback/service/GukYuinApiService.java @@ -3,8 +3,6 @@ package com.kamco.cd.kamcoback.service; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.kamco.cd.kamcoback.common.utils.NetUtils; -import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ApiResponseCode; -import com.kamco.cd.kamcoback.config.api.ApiResponseDto.ResponseObj; import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient; import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult; import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectContDto; @@ -20,13 +18,9 @@ import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.ResultDto; import com.kamco.cd.kamcoback.gukyuin.dto.ChngDetectMastDto.RlbDtctDto; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFacts; import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.GukYuinLinkFailCode; -import com.kamco.cd.kamcoback.gukyuin.dto.GukYuinDto.LearnInfo; import com.kamco.cd.kamcoback.postgres.core.GukYuinCoreService; -import java.nio.file.Files; -import java.nio.file.Path; import java.time.LocalDate; import java.util.List; -import java.util.UUID; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -285,49 +279,6 @@ public class GukYuinApiService { return result.body(); } - public ResponseObj connectChnMastRegist(UUID uuid) { - // uuid로 추론 회차 조회 - LearnInfo info = gukyuinCoreService.findMapSheetLearnInfo(uuid); - if (info.getApplyYn() != null && info.getApplyYn()) { - return new ResponseObj(ApiResponseCode.DUPLICATE_DATA, "이미 국유인 연동을 한 회차입니다."); - } - - if (!Files.isDirectory(Path.of("/kamco-nfs/dataset/export/" + info.getUid()))) { - return new ResponseObj( - ApiResponseCode.NOT_FOUND_DATA, "파일 경로에 회차 실행 파일이 생성되지 않았습니다. 확인 부탁드립니다."); - } - - // 비교년도,기준년도로 전송한 데이터 있는지 확인 후 회차 번호 생성 - Integer maxStage = - gukyuinCoreService.findMapSheetLearnYearStage(info.getCompareYyyy(), info.getTargetYyyy()); - - // reqDto 셋팅 - ChnDetectMastReqDto reqDto = new ChnDetectMastReqDto(); - reqDto.setCprsYr(String.valueOf(info.getCompareYyyy())); - reqDto.setCrtrYr(String.valueOf(info.getTargetYyyy())); - reqDto.setChnDtctSno(String.valueOf(maxStage + 1)); - reqDto.setChnDtctId(info.getUid()); - reqDto.setPathNm("/kamco-nfs/dataset/export/" + info.getUid()); - - // 1회차를 종료 상태로 처리하고 2회차를 보내야 함 - // 추론(learn), 학습데이터(inference) 둘 다 종료 처리 - if (maxStage > 0) { - Long learnId = - gukyuinCoreService.findMapSheetLearnInfoByYyyy( - info.getCompareYyyy(), info.getTargetYyyy(), maxStage); - gukyuinCoreService.updateMapSheetLearnGukyuinEndStatus(learnId); - gukyuinCoreService.updateMapSheetInferenceLabelEndStatus(learnId); - } - - // 국유인 /chn/mast/regist 전송 - ChngDetectMastDto.RegistResDto result = this.regist(reqDto); - if (result.getSuccess()) { - return new ResponseObj(ApiResponseCode.OK, "연동되었습니다."); - } else { - return new ResponseObj(ApiResponseCode.INTERNAL_SERVER_ERROR, result.getMessage()); - } - } - public List findLabelingCompleteSendList(LocalDate yesterday) { return gukyuinCoreService.findLabelingCompleteSendList(yesterday); } diff --git a/gukyuin/status-update/src/main/resources/application-dev.yml b/gukyuin/status-update/src/main/resources/application-dev.yml index 2081606..afe173e 100644 --- a/gukyuin/status-update/src/main/resources/application-dev.yml +++ b/gukyuin/status-update/src/main/resources/application-dev.yml @@ -23,7 +23,6 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - #url: jdbc:postgresql://localhost:15432/kamco_cds username: kamco_cds password: kamco_cds_Q!W@E#R$ hikari: @@ -37,23 +36,14 @@ spring: transaction: default-timeout: 300 # 5분 트랜잭션 타임아웃 - data: - redis: - host: 192.168.2.109 - port: 6379 - password: kamco - logging: level: root: INFO org.springframework.web: DEBUG org.springframework.security: DEBUG - # 헬스체크 노이즈 핵심만 다운 - org.springframework.security.web.FilterChainProxy: INFO - org.springframework.security.web.authentication.AnonymousAuthenticationFilter: INFO - org.springframework.security.web.authentication.Http403ForbiddenEntryPoint: INFO - org.springframework.web.servlet.DispatcherServlet: INFO +file: + dataset-dir: /kamco-nfs/model_output/export/ gukyuin: url: http://192.168.2.129:5301 diff --git a/gukyuin/status-update/src/main/resources/application-local.yml b/gukyuin/status-update/src/main/resources/application-local.yml index cb09429..9473891 100644 --- a/gukyuin/status-update/src/main/resources/application-local.yml +++ b/gukyuin/status-update/src/main/resources/application-local.yml @@ -16,99 +16,22 @@ spring: datasource: url: jdbc:postgresql://192.168.2.127:15432/kamco_cds - # url: jdbc:postgresql://localhost:5432/local_0128 username: kamco_cds password: kamco_cds_Q!W@E#R$ - # username: postgres - # password: 1234 hikari: minimum-idle: 1 maximum-pool-size: 5 - data: - redis: - host: 192.168.2.109 - port: 6379 - password: kamco - - servlet: - multipart: - enabled: true - max-file-size: 4GB - max-request-size: 4GB - file-size-threshold: 10MB - -server: - tomcat: - max-swallow-size: 4GB - max-http-form-post-size: 4GB - -jwt: - secret: "kamco_token_9b71e778-19a3-4c1d-97bf-2d687de17d5b" - access-token-validity-in-ms: 86400000 # 1일 - refresh-token-validity-in-ms: 604800000 # 7일 - -token: - refresh-cookie-name: kamco-local # 개발용 쿠키 이름 - refresh-cookie-secure: false # 로컬 http 테스트면 false - -springdoc: - swagger-ui: - persist-authorization: true # 스웨거 새로고침해도 토큰 유지, 로컬스토리지에 저장 - logging: level: org.hibernate.SQL: debug org.hibernate.orm.jdbc.bind: trace -mapsheet: - upload: - skipGdalValidation: true - shp: - baseurl: /Users/bokmin/detect/result - - - file: - sync-root-dir: C:/Users/gypark/kamco-nfs/images/ - #sync-root-dir: /kamco-nfs/images/ - sync-tmp-dir: ${file.sync-root-dir}/tmp/ - sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2025 - sync-auto-exception-before-year-cnt: 3 - - dataset-dir: C:/Users/gypark/kamco-nfs/dataset/ - #dataset-dir: /kamco-nfs/dataset/export/ - dataset-tmp-dir: ${file.dataset-dir}tmp/ - - model-dir: C:/Users/gypark/kamco-nfs/ckpt/model/ - #model-dir: /kamco-nfs/ckpt/model/ - model-tmp-dir: ${file.model-dir}tmp/ - model-file-extention: pth,json,py - - pt-path: /kamco-nfs/ckpt/classification/ - pt-FileName: v5-best.pt - - dataset-response: /kamco-nfs/dataset/response/ - -inference: - url: http://10.100.0.11:8000/jobs - batch-url: http://10.100.0.11:8000/batches - geojson-dir: /kamco-nfs/requests/ - jar-path: jar/makeshp-1.0.0.jar - inference-server-name: server1,server2,server3,server4 + dataset-dir: /kamco-nfs/model_output/export/ gukyuin: #url: http://localhost:8080 url: http://192.168.2.129:5301 cdi: ${gukyuin.url}/api/kcd/cdi -training-data: - geojson-dir: /kamco-nfs/model_output/labeling/ - -layer: - geoserver-url: https://kamco.geo-dev.gs.dabeeo.com - wms-path: geoserver/cd - wmts-path: geoserver/cd/gwc/service - workspace: cd - diff --git a/gukyuin/status-update/src/main/resources/application-prod.yml b/gukyuin/status-update/src/main/resources/application-prod.yml index bcdba91..3fd7e43 100644 --- a/gukyuin/status-update/src/main/resources/application-prod.yml +++ b/gukyuin/status-update/src/main/resources/application-prod.yml @@ -42,6 +42,9 @@ logging: org.springframework.web: DEBUG org.springframework.security: DEBUG +file: + dataset-dir: /data/model_output/export/ + gukyuin: url: http://172.16.4.56:15432 cdi: ${gukyuin.url}/api/kcd/cdi diff --git a/shp-exporter/.idea/vcs.xml b/shp-exporter/.idea/vcs.xml new file mode 100644 index 0000000..6c0b863 --- /dev/null +++ b/shp-exporter/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/shp-exporter/build/reports/problems/problems-report.html b/shp-exporter/build/reports/problems/problems-report.html index dabd93c..8b9c943 100644 --- a/shp-exporter/build/reports/problems/problems-report.html +++ b/shp-exporter/build/reports/problems/problems-report.html @@ -650,7 +650,7 @@ code + .copy-button {