From a1d3ed44cc4110be78b7bcfcb7760ece4cede9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Thu, 18 Jan 2024 15:14:15 +0900 Subject: [PATCH] =?UTF-8?q?feat:=20=EC=9D=BC=EC=B6=9C=EC=9D=BC=EB=AA=B0=20?= =?UTF-8?q?List=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=EB=82=A0=EC=A7=9C=EC=97=90=20=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EB=8F=84=EC=8B=9C=EB=8A=94=20=EA=B0=80=EC=9E=A5=20?= =?UTF-8?q?=EA=B0=80=EA=B9=8C=EC=9A=B4=EB=8F=84=EC=8B=9C=20=EC=B6=94?= =?UTF-8?q?=EC=A0=81=ED=95=98=EC=97=AC=20=EB=8C=80=EC=8B=A0=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/comn/sunriseset/service/ComnSunrisesetService.java | 6 +++++- .../biz/jpa/repository/com/ComRiseSetBasRepository.java | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/comn/sunriseset/service/ComnSunrisesetService.java b/pav-server/src/main/java/com/palnet/biz/api/comn/sunriseset/service/ComnSunrisesetService.java index 7538e893..8263554c 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/comn/sunriseset/service/ComnSunrisesetService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/comn/sunriseset/service/ComnSunrisesetService.java @@ -3,6 +3,8 @@ package com.palnet.biz.api.comn.sunriseset.service; import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetCoordRq; import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetRq; import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetRs; +import com.palnet.biz.jpa.entity.ComRiseSetBas; +import com.palnet.biz.jpa.repository.com.ComRiseSetBasRepository; import com.palnet.biz.jpa.repository.com.ComRiseSetQueryRepository; import com.palnet.comn.code.ErrorCode; import com.palnet.comn.exception.CustomException; @@ -28,6 +30,7 @@ import java.util.List; @Service public class ComnSunrisesetService { + private final ComRiseSetBasRepository comRiseSetBasRepository; private final ComRiseSetQueryRepository comRiseSetQueryRepository; @@ -37,8 +40,9 @@ public class ComnSunrisesetService { * @return */ public List getSunRiseSetList(ComnSunrisesetRq rq) { - return comRiseSetQueryRepository.findAllBySearchTransform(rq); + List list = comRiseSetBasRepository.findByLocStDateAndLocEndDateNearLocation(rq.getLocStDate(), rq.getLocEndDate(), rq.getLocation()); + return ComnSunrisesetMapper.MAPPER.toRs(list); } /** diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComRiseSetBasRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComRiseSetBasRepository.java index c322ff9b..11e8d724 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComRiseSetBasRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/com/ComRiseSetBasRepository.java @@ -26,4 +26,7 @@ public interface ComRiseSetBasRepository extends JpaRepository findByLocStDateAndLocEndDate(@Param("locStDate") String locStDate, @Param("locEndDate") String locEndDate); + @Query(value = "SELECT NEAR.* FROM ( SELECT *, CAST( ST_DISTANCE_SPHERE( POINT(LON, LAT), POINT( (SELECT DISTINCT LON FROM COM_RISE_SET_BAS WHERE LOCATION = :location), (SELECT DISTINCT LAT FROM COM_RISE_SET_BAS WHERE LOCATION = :location) ) ) AS SIGNED ) AS DIST FROM COM_RISE_SET_BAS WHERE LOC_DATE BETWEEN :locStDate AND :locEndDate ORDER BY LOC_DATE ASC , DIST ASC ) AS NEAR GROUP BY NEAR.LOC_DATE", nativeQuery = true) + List findByLocStDateAndLocEndDateNearLocation(@Param("locStDate") String locStDate, @Param("locEndDate") String locEndDate, @Param("location") String location); + }