diff --git a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java index 04f0255..d1f94eb 100644 --- a/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java +++ b/src/main/java/com/palnet/biz/api/ctr/cntrl/service/CtrCntrlService.java @@ -270,7 +270,9 @@ public class CtrCntrlService { String idntfNum = cntrlBasRepository.getIdntfNum(cntrlId); CtrCntrlHstry hisControl = query.getWarnHstryList(cntrlId); - int planSno = relRepository.getPlanSno(idntfNum); + int planSno = relRepository.getPlanSno(idntfNum).orElse(0); + if(query.checkPlanSno(planSno) < 1) return null; + FltPlanArea planAreaData = query.getPlanData(planSno); List coordList = planCoordRepository.getCoordinate(planAreaData.getPlanAreaSno()); diff --git a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index b1b9665..0dac8d4 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1222,7 +1222,30 @@ public List listCntrlHstry(String id){ .fetchFirst(); return result; + } + + public long checkPlanSno(int planSno) { + QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + BooleanBuilder builder = new BooleanBuilder(); + Calendar end = Calendar.getInstance(); + Date now = DateUtils.nowDate(); + end.setTime(now); + Date endDate = end.getTime(); + builder.and(qFltPlanBas.schFltStDt.loe(now)); + builder.and(qFltPlanBas.schFltEndDt.goe(now)); + + builder.and(qFltPlanBas.planSno.eq(planSno)); + + long result = + query.select(Projections.bean(FltPlanBas.class, + qFltPlanBas.planSno + )) + .from(qFltPlanBas) + .where(builder) + .fetchCount(); + + return result; } /** diff --git a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java index 460ff04..f32cc5c 100644 --- a/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java +++ b/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanCtrCntrlRelRepository.java @@ -1,6 +1,8 @@ package com.palnet.biz.jpa.repository.flt; +import java.util.Optional; + import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -12,5 +14,5 @@ public interface FltPlanCtrCntrlRelRepository extends JpaRepository getPlanSno(@Param("idntfNum") String idntfNum); }