Browse Source

fix: 드론원스톱 비행계획 목록 검색조건 수정

feature/address-coordinate
지대한 5 months ago
parent
commit
6e78b1d505
  1. 12
      pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java
  2. 1
      pav-server/src/main/resources/log4jdbc.log4j2.properties

12
pav-server/src/main/java/com/palnet/biz/api/bas/dos/service/BasDosService.java

@ -14,13 +14,16 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Coordinate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@Slf4j
@RequiredArgsConstructor
@Transactional
@Service
public class BasDosService {
@ -36,11 +39,18 @@ public class BasDosService {
* @param rq
* @return
*/
@Transactional(readOnly = true)
public List<BasDosPlanRs> getDosPlan(BasDosPlanRq rq) {
List<DosFltPlanBas> planBasList = dosFltPlanBasRepository.findBySchFltStDtLessThanEqualAndSchFltEndDtGreaterThanEqualOrderByApplyDtAscCreateDtAsc(rq.getSearchEndDt(), rq.getSearchEndDt());
List<DosFltPlanBas> planBasList = dosFltPlanBasRepository.findBySchFltStDtLessThanEqualAndSchFltEndDtGreaterThanEqualOrderByApplyDtAscCreateDtAsc(rq.getSearchEndDt(), rq.getSearchStDt());
if(planBasList.isEmpty()) {
return new ArrayList<>();
}
List<Long> planSnoList = planBasList.stream().map(DosFltPlanBas::getPlanSno).collect(Collectors.toList());
List<DosFltPlanArea> areaList = dosFltPlanAreaRepository.findByPlanSnoInOrderByZoneNoAsc(planSnoList);
List<DosFltPlanResult> resultList = dosFltPlanResultRepository.findByPlanSnoIn(planSnoList);

1
pav-server/src/main/resources/log4jdbc.log4j2.properties

@ -0,0 +1 @@
log4jdbc.spylogdelegator.name=net.sf.log4jdbc.log.slf4j.Slf4jSpyLogDelegator
Loading…
Cancel
Save