|
|
|
@ -1,18 +1,18 @@
|
|
|
|
|
package com.palnet.biz.api.main.dash.service; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Arrays; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
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.MainCurrentStcsModel; |
|
|
|
|
import com.palnet.biz.api.main.statistics.service.MainStatisticsService; |
|
|
|
|
import com.palnet.biz.jpa.entity.FltPlanBas; |
|
|
|
|
import com.palnet.biz.jpa.repository.pty.*; |
|
|
|
|
import com.querydsl.core.Tuple; |
|
|
|
|
|
|
|
|
|
import com.querydsl.core.BooleanBuilder; |
|
|
|
|
import lombok.extern.slf4j.Slf4j; |
|
|
|
|
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
@ -20,13 +20,10 @@ import org.slf4j.LoggerFactory;
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.main.dash.model.MainCurrentStcsModel; |
|
|
|
|
import com.palnet.biz.api.main.dash.model.MainDashFlightListModel; |
|
|
|
|
import com.palnet.biz.api.main.dash.model.MainDashListModel; |
|
|
|
|
import com.palnet.biz.api.main.dash.model.MainDashStcsModel; |
|
|
|
|
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; |
|
|
|
@ -55,14 +52,13 @@ public class MainDashService {
|
|
|
|
|
private CtrCntrlQueryRepository query; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private FltPlanArcrftRepository fltPlanArcrftRepository; |
|
|
|
|
private MainStatisticsService mainStatisticsService; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private JwtTokenUtil token; |
|
|
|
|
private FltPlanArcrftRepository fltPlanArcrftRepository; |
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
|
private MainStatisticsService mainStatisticsService; |
|
|
|
|
|
|
|
|
|
private JwtTokenUtil token; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* 일별 비행횟수 통계 |
|
|
|
@ -287,6 +283,54 @@ public class MainDashService {
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<MainCurrentStcsModel> currentFlightPlan(String groupId){ |
|
|
|
|
final int sumCount = 2; // 2번은 합계
|
|
|
|
|
|
|
|
|
|
boolean authCheck = mainStatisticsService.authCheck(groupId); |
|
|
|
|
|
|
|
|
|
String[] dateCate = {"-2", "-1", "0", "1"}; // 2일전, 전일, 금일, 명일
|
|
|
|
|
|
|
|
|
|
List<MainCurrentStcsModel> result = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
for(String cate : dateCate){ |
|
|
|
|
List<FltPlanBas> fltPlanBas = fltPlanQueryRepository.currentFlightStcs(groupId, authCheck, cate); |
|
|
|
|
|
|
|
|
|
int count = fltPlanBas.size(); |
|
|
|
|
int aprvnCount = (int)fltPlanBas.stream().filter(value -> value.getAprvlYn().equals("Y")).count(); |
|
|
|
|
|
|
|
|
|
List<Integer> stcsValues = Arrays.asList(count, aprvnCount, aprvnCount); |
|
|
|
|
|
|
|
|
|
MainCurrentStcsModel node = new MainCurrentStcsModel(); |
|
|
|
|
node.setStcsValues(stcsValues); |
|
|
|
|
|
|
|
|
|
result.add(node); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
for(int i = 0; i < result.size(); i++){ |
|
|
|
|
|
|
|
|
|
if(i == 0) continue;; |
|
|
|
|
|
|
|
|
|
int prevSum = result.get(i-1).getStcsValues().get(sumCount); // 전날 합계 [기준]
|
|
|
|
|
int sum = result.get(i).getStcsValues().get(sumCount); // 합계
|
|
|
|
|
|
|
|
|
|
double percent = 0; |
|
|
|
|
|
|
|
|
|
if(prevSum != 0){ |
|
|
|
|
percent = ((sum - prevSum) / (double) prevSum) * 100; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
result.get(i).setPercent(percent); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
result.remove(0); |
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<MainCurrentStcsModel> currentFlightWarn(String groupId){ |
|
|
|
|
final int sumCount = 3; // 3번은 합계
|
|
|
|
|
|
|
|
|
|