diff --git a/src/main/java/com/kamco/cd/kamcoback/layer/dto/WmtsDto.java b/src/main/java/com/kamco/cd/kamcoback/layer/dto/WmtsDto.java index 966d0a77..9092c607 100644 --- a/src/main/java/com/kamco/cd/kamcoback/layer/dto/WmtsDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/layer/dto/WmtsDto.java @@ -22,6 +22,7 @@ public class WmtsDto { @NoArgsConstructor public static class WmtsAddDto { private WmtsLayerInfo wmtsLayerInfo; + private String title; private String description; } } diff --git a/src/main/java/com/kamco/cd/kamcoback/layer/service/WmtsService.java b/src/main/java/com/kamco/cd/kamcoback/layer/service/WmtsService.java index 57a84307..d39d77cf 100644 --- a/src/main/java/com/kamco/cd/kamcoback/layer/service/WmtsService.java +++ b/src/main/java/com/kamco/cd/kamcoback/layer/service/WmtsService.java @@ -3,6 +3,7 @@ package com.kamco.cd.kamcoback.layer.service; import com.kamco.cd.kamcoback.layer.dto.WmtsDto.WmtsAddDto; import com.kamco.cd.kamcoback.layer.dto.WmtsDto.WmtsAddReqDto; import com.kamco.cd.kamcoback.layer.dto.WmtsLayerInfo; +import com.kamco.cd.kamcoback.postgres.core.MapLayerCoreService; import java.net.URL; import java.util.ArrayList; import java.util.List; @@ -26,6 +27,8 @@ import org.w3c.dom.NodeList; @Transactional(readOnly = true) public class WmtsService { + private final MapLayerCoreService mapLayerCoreService; + @Value("${layer.geoserver-url}") private String geoserverUrl; @@ -62,11 +65,12 @@ public class WmtsService { WmtsAddDto addDto = new WmtsAddDto(); addDto.setWmtsLayerInfo(info); addDto.setDescription(dto.getDescription()); + addDto.setTitle(dto.getTitle()); + mapLayerCoreService.save(addDto); } public WmtsLayerInfo getDetail(String tile) { - WmtsService wmtsService = new WmtsService(); - return wmtsService.getLayerInfoByTitle(geoserverUrl, workspace, tile); + return getLayerInfoByTitle(geoserverUrl, workspace, tile); } private List getAllLayers(String geoserverUrl, String workspace) { diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapLayerCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapLayerCoreService.java new file mode 100644 index 00000000..a96dabf6 --- /dev/null +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapLayerCoreService.java @@ -0,0 +1,28 @@ +package com.kamco.cd.kamcoback.postgres.core; + +import com.kamco.cd.kamcoback.common.utils.UserUtil; +import com.kamco.cd.kamcoback.layer.dto.WmtsDto.WmtsAddDto; +import com.kamco.cd.kamcoback.postgres.entity.MapLayerEntity; +import com.kamco.cd.kamcoback.postgres.repository.layer.MapLayerRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MapLayerCoreService { + private final MapLayerRepository mapLayerRepository; + private final UserUtil userUtil; + + /** + * wmts 저장 + * + * @param addDto + */ + public void save(WmtsAddDto addDto) { + + MapLayerEntity mapLayerEntity = new MapLayerEntity(); + mapLayerEntity.setTitle(addDto.getTitle()); + mapLayerEntity.setDescription(addDto.getDescription()); + mapLayerEntity.setCreatedUid(userUtil.getId()); + } +} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapLayerEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapLayerEntity.java index af56348b..b5db7fba 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapLayerEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapLayerEntity.java @@ -10,8 +10,9 @@ import jakarta.persistence.Table; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; import java.math.BigDecimal; -import java.time.Instant; +import java.time.ZonedDateTime; import java.util.Map; +import java.util.UUID; import lombok.Getter; import lombok.Setter; import org.hibernate.annotations.ColumnDefault; @@ -72,9 +73,18 @@ public class MapLayerEntity { @NotNull @ColumnDefault("now()") - @Column(name = "created_at", nullable = false) - private Instant createdAt; + @Column(name = "created_dttm", nullable = false) + private ZonedDateTime createdAt = ZonedDateTime.now(); - @Column(name = "updated_at") - private Instant updatedAt; + @Column(name = "updated_dttm") + private ZonedDateTime updatedAt; + + @Column(name = "uuid") + private UUID uuid = UUID.randomUUID(); + + @Column(name = "created_uid") + private Long createdUid; + + @Column(name = "updated_uid") + private Long updatedUid; } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepository.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepository.java similarity index 61% rename from src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepository.java rename to src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepository.java index b74cb32a..16c78915 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepository.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepository.java @@ -3,5 +3,5 @@ package com.kamco.cd.kamcoback.postgres.repository.layer; import com.kamco.cd.kamcoback.postgres.entity.MapLayerEntity; import org.springframework.data.jpa.repository.JpaRepository; -public interface LayerRepository - extends JpaRepository, LayerRepositoryCustom {} +public interface MapLayerRepository + extends JpaRepository, MapLayerRepositoryCustom {} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryCustom.java similarity index 56% rename from src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepositoryCustom.java rename to src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryCustom.java index c8c199f6..fd964cca 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryCustom.java @@ -1,3 +1,3 @@ package com.kamco.cd.kamcoback.postgres.repository.layer; -public interface LayerRepositoryCustom {} +public interface MapLayerRepositoryCustom {} diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryImpl.java similarity index 63% rename from src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepositoryImpl.java rename to src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryImpl.java index a4543798..ad4f5306 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/LayerRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/layer/MapLayerRepositoryImpl.java @@ -3,4 +3,4 @@ package com.kamco.cd.kamcoback.postgres.repository.layer; import org.springframework.stereotype.Repository; @Repository -public class LayerRepositoryImpl implements LayerRepositoryCustom {} +public class MapLayerRepositoryImpl {}