diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java index 06a39e3..6444eef 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java @@ -1,37 +1,34 @@ package com.palnet.biz.api.main.dash.service; -import java.time.Instant; -import java.time.temporal.ChronoUnit; -import java.util.*; -import java.util.stream.Collectors; - -import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil; import com.palnet.biz.api.bas.group.model.BasGroupModel; import com.palnet.biz.api.main.dash.model.*; import com.palnet.biz.api.main.statistics.service.MainStatisticsService; +import com.palnet.biz.jpa.entity.CtrCntrlWarnLog; import com.palnet.biz.jpa.entity.FltPlanBas; +import com.palnet.biz.jpa.entity.type.WarnType; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; +import com.palnet.biz.jpa.repository.ctr.CtrCntrlWarnLogQueryRepository; +import com.palnet.biz.jpa.repository.flt.FltPlanArcrftRepository; import com.palnet.biz.jpa.repository.flt.FltPlanBasRepository; -import com.palnet.biz.jpa.repository.pty.*; +import com.palnet.biz.jpa.repository.flt.FltPlanQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyDronQueryRepository; +import com.palnet.biz.jpa.repository.pty.PtyGroupQueryRepository; import com.palnet.comn.code.ErrorCode; import com.palnet.comn.exception.CustomException; -import com.querydsl.core.Tuple; - -import com.querydsl.core.BooleanBuilder; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.palnet.biz.jpa.entity.CtrCntrlWarnLog; -import com.palnet.biz.jpa.entity.type.WarnType; -import com.palnet.biz.jpa.repository.ctr.CtrCntrlQueryRepository; -import com.palnet.biz.jpa.repository.ctr.CtrCntrlWarnLogQueryRepository; -import com.palnet.biz.jpa.repository.flt.FltPlanArcrftRepository; -import com.palnet.biz.jpa.repository.flt.FltPlanQueryRepository; +import java.time.Instant; +import java.time.temporal.ChronoUnit; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Slf4j @Service @@ -40,15 +37,15 @@ public class MainDashService { private Logger logger = LoggerFactory.getLogger(getClass()); - private PtyDronQueryRepository ptyDronQueryRepository; - private PtyGroupQueryRepository ptyGroupQueryRepository; - private FltPlanQueryRepository fltPlanQueryRepository; - private CtrCntrlWarnLogQueryRepository ctrCntrlWarnLogQueryRepository; - private CtrCntrlQueryRepository query; - private MainStatisticsService mainStatisticsService; - private FltPlanArcrftRepository fltPlanArcrftRepository; - private FltPlanBasRepository fltPlanBasRepository; - private JwtTokenUtil token; + private final PtyDronQueryRepository ptyDronQueryRepository; + private final PtyGroupQueryRepository ptyGroupQueryRepository; + private final FltPlanQueryRepository fltPlanQueryRepository; + private final CtrCntrlWarnLogQueryRepository ctrCntrlWarnLogQueryRepository; + private final CtrCntrlQueryRepository query; + private final MainStatisticsService mainStatisticsService; + private final FltPlanArcrftRepository fltPlanArcrftRepository; + private final FltPlanBasRepository fltPlanBasRepository; + private final JwtTokenUtil token; /** * 일별 비행건수 통계