feat/infer_dev_260107 #29
@@ -17,6 +17,7 @@ import com.kamco.cd.kamcoback.postgres.core.MapLayerCoreService;
|
||||
import java.util.List;
|
||||
import java.util.UUID;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
@@ -30,6 +31,12 @@ public class LayerService {
|
||||
private final WmtsService wmtsService;
|
||||
private final WmsService wmsService;
|
||||
|
||||
@Value("${layer.geoserver-url}")
|
||||
private String geoserverUrl;
|
||||
|
||||
@Value("${layer.path}")
|
||||
private String geoserverPath;
|
||||
|
||||
/**
|
||||
* 지도 레이어 관리 목록
|
||||
*
|
||||
@@ -175,7 +182,26 @@ public class LayerService {
|
||||
}
|
||||
|
||||
public List<LayerMapDto> findLayerMapList(String type) {
|
||||
return mapLayerCoreService.findLayerMapList(type);
|
||||
List<LayerMapDto> layerMapDtoList = mapLayerCoreService.findLayerMapList(type);
|
||||
layerMapDtoList.forEach(
|
||||
dto -> {
|
||||
if (dto.getLayerType().equals("WMS") || dto.getLayerType().equals("WMTS")) {
|
||||
dto.setUrl(
|
||||
String.format(
|
||||
"%s/%s/%s",
|
||||
trimSlash(geoserverUrl),
|
||||
trimSlash(geoserverPath),
|
||||
dto.getLayerType().toLowerCase()));
|
||||
}
|
||||
});
|
||||
return layerMapDtoList;
|
||||
}
|
||||
|
||||
private String trimSlash(String s) {
|
||||
if (s == null) {
|
||||
return "";
|
||||
}
|
||||
return s.replaceAll("/+$", "").replaceAll("^/+", "");
|
||||
}
|
||||
|
||||
public LayerDto.YearTileDto getChangeDetectionTileUrl(Integer beforeYear, Integer afterYear) {
|
||||
|
||||
@@ -124,4 +124,5 @@ training-data:
|
||||
|
||||
layer:
|
||||
geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
|
||||
path: geoserver/cd/gwc/service
|
||||
workspace: cd
|
||||
|
||||
@@ -6,7 +6,7 @@ spring:
|
||||
jpa:
|
||||
show-sql: false
|
||||
hibernate:
|
||||
ddl-auto: update # 로컬만 완화(시킬려면 update으로 변경)
|
||||
ddl-auto: validate # 로컬만 완화(시킬려면 update으로 변경)
|
||||
properties:
|
||||
hibernate:
|
||||
default_batch_fetch_size: 100 # ✅ 성능 - N+1 쿼리 방지
|
||||
@@ -16,9 +16,11 @@ spring:
|
||||
|
||||
datasource:
|
||||
url: jdbc:postgresql://192.168.2.127:15432/kamco_cds
|
||||
#url: jdbc:postgresql://localhost:5432/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
|
||||
@@ -68,30 +70,30 @@ mapsheet:
|
||||
|
||||
|
||||
file:
|
||||
sync-root-dir: /Users/bokmin/kamco-nfs/images/
|
||||
sync-root-dir: C:/Users/gypark/kamco-nfs/images/
|
||||
#sync-root-dir: /kamco-nfs/images/
|
||||
sync-tmp-dir: ${file.sync-root-dir}/tmp
|
||||
sync-tmp-dir: ${file.sync-root-dir}/tmp/
|
||||
sync-file-extention: tfw,tif
|
||||
sync-auto-exception-start-year: 2024
|
||||
sync-auto-exception-start-year: 2025
|
||||
sync-auto-exception-before-year-cnt: 3
|
||||
|
||||
dataset-dir: /Users/bokmin/kamco-nfs/dataset/export/
|
||||
dataset-dir: C:/Users/gypark/kamco-nfs/dataset/
|
||||
#dataset-dir: /kamco-nfs/dataset/export/
|
||||
dataset-tmp-dir: ${file.dataset-dir}tmp/
|
||||
|
||||
model-dir: /Users/bokmin/kamco-nfs/ckpt/model/
|
||||
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/model/v6-cls-checkpoints/
|
||||
pt-FileName: yolov8_6th-6m.pt
|
||||
pt-path: /kamco-nfs/ckpt/classification/
|
||||
pt-FileName: v5-best.pt
|
||||
|
||||
inference:
|
||||
url: http://192.168.2.183:8000/jobs
|
||||
batch-url: http://192.168.2.183:8000/batches
|
||||
geojson-dir: /Users/bokmin/kamco-nfs/requests/
|
||||
jar-path: /Users/bokmin/kamco-nfs/dataset/shp/shp-exporter.jar
|
||||
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
|
||||
|
||||
gukyuin:
|
||||
@@ -100,8 +102,9 @@ gukyuin:
|
||||
cdi: ${gukyuin.url}/api/kcd/cdi
|
||||
|
||||
training-data:
|
||||
geojson-dir: /Users/bokmin/kamco-nfs/model_output/labeling/
|
||||
geojson-dir: /kamco-nfs/model_output/labeling/
|
||||
|
||||
layer:
|
||||
geoserver-url: http://localhost:9080
|
||||
geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
|
||||
path: /geoserver/cd/gwc/service/
|
||||
workspace: cd
|
||||
|
||||
@@ -79,4 +79,5 @@ training-data:
|
||||
|
||||
layer:
|
||||
geoserver-url: https://kamco.geo-dev.gs.dabeeo.com
|
||||
path: /geoserver/cd/gwc/service/
|
||||
workspace: cd
|
||||
|
||||
Reference in New Issue
Block a user