From d72ceca0d8004179c4f15b675fac474baa5eaa09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?leehagjoon=28=EC=9D=B4=ED=95=99=EC=A4=80=29?= Date: Wed, 15 Nov 2023 15:04:43 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/api/main/dash/service/MainDashService.java | 12 ------------ 1 file changed, 12 deletions(-) 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 8c597f2e..4223d7a4 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 @@ -304,27 +304,18 @@ public class MainDashService { // 2. 비행계획서 승인 항목 : 비행계획서 제출기준(승인된 건수로봐도 동일) long yesterdayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", yesterdayStart, yesterdayEnd); - log.info("yesterdayCount: {}", yesterdayCount); long todayCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", todayStart, todayEnd); - log.info("todayCount: {}", todayCount); long tomorrowCount = fltPlanBasRepository.countByAprvlYnAndAprvlDtBetween("Y", tomorrowStart, tomorrowEnd); - log.info("tomorrowCount: {}", tomorrowCount); // 3. 비행 완료 항목 : 실제 비행이 완료된 건수 long yesterdayCompleteCount = query.completeFlight(yesterdayStart,yesterdayEnd).size(); - log.info("yesterdayCompleteCount: {}", yesterdayCompleteCount); long todayCompleteCount = query.completeFlight(todayStart,todayEnd).size(); - log.info("todayCompleteCount: {}", todayCompleteCount); long tomorrowCompleteCount = query.completeFlight(tomorrowStart,tomorrowEnd).size(); - log.info("tomorrowCompleteCount: {}", tomorrowCompleteCount); // 4. 미 비행 항목 : 비행계획서는 제출했으나,실제 비행안한 건수 long yesterdayNotFlight = query.notFlight(yesterdayStart,yesterdayEnd).size(); - log.info("yesterdayNotFlight : {} ", yesterdayNotFlight); long todayNotFlight = query.notFlight(todayStart, todayEnd).size(); - log.info("todayNotFlight : {} ", todayNotFlight); long tomorrowNotFlight = query.notFlight(tomorrowStart,tomorrowEnd).size(); - log.info("tomorrowNotFlight : {} ", tomorrowNotFlight); // 5. 비고 : 비행 완료 건수를 기준으로 상승 또는 하락폭 적용 // ex) 오늘 기준 오늘은 어제의 비행 완료 건수를 비교해서 적용 @@ -332,11 +323,8 @@ public class MainDashService { // 명일(내일)은 오늘 비행 완료 건수를 비교해서 적용 long yesterdayNote = yesterdayCompleteCount - query.completeFlight(yesterdayStart.minus(1, ChronoUnit.DAYS), yesterdayEnd.minus(1, ChronoUnit.DAYS)).size(); double yesterdayNotePercent = yesterdayCompleteCount != 0 ? ((double) yesterdayNote / yesterdayCompleteCount) * 100.0 : 0.0; - log.info("yesterdayNotePercent: {} ", yesterdayNotePercent); double todayNotePercent = yesterdayCompleteCount != 0 ? ((double)(todayCompleteCount - yesterdayCompleteCount) / yesterdayCompleteCount) * 100.0 : 0.0; - log.info("todayNotePercent: {} ", todayNotePercent); double tomorrowNotePercent = todayCompleteCount != 0 ? ((double) (tomorrowCompleteCount - todayCompleteCount) / todayCompleteCount) * 100.0 : 0.0; - log.info("tomorrowNotePercent: {} ", tomorrowNotePercent);