From 089ac26b5614c8404a39c7c5e23dffc8a9f21e03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?lkd9125=28=EC=9D=B4=EA=B2=BD=EB=8F=84=29?= Date: Thu, 16 Nov 2023 10:49:44 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B9=84=ED=96=89,=20=EC=8B=A4=EC=A0=81,=20?= =?UTF-8?q?=EB=B9=84=EC=A0=95=EC=83=81=EC=83=81=ED=99=A9=20=ED=86=B5?= =?UTF-8?q?=EA=B3=84=20serviceType=EC=9C=BC=EB=A1=9C=20=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/MainStatisticsController.java | 20 ++-- .../main/statistics/model/FlightStcsRQ.java | 2 +- .../service/MainStatisticsService.java | 84 ++++++++-------- .../ctr/CtrCntrlQueryRepository.java | 96 +++++++++---------- .../ctr/CtrCntrlWarnLogQueryRepository.java | 30 +++--- .../flt/FltPlanQueryRepository.java | 68 ++++++------- 6 files changed, 151 insertions(+), 149 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java index b819c5d..4316f54 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java @@ -38,14 +38,14 @@ public class MainStatisticsController { @GetMapping("/flight-static") @ApiOperation(value = "비행통계 상단 데이터[DB전체 통계데이터]") @Tag(name = "통계 컨트롤러", description = "통계 관련 API") - public ResponseEntity fltStcsStatic(String groupId){ + public ResponseEntity fltStcsStatic(String serviceType){ - log.warn("GroupNm => {}", groupId); + log.warn("ServiceType => {}", serviceType); List result = null; try { - result = service.getFlightStaticStcs(groupId); + result = service.getFlightStaticStcs(serviceType); log.warn("result => {}", result); } catch (Exception e) { @@ -66,7 +66,7 @@ public class MainStatisticsController { @ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class) }) public ResponseEntity fltStcs(FlightStcsRQ rq, @PathVariable String type){ - log.warn("cate => {}, groupId => {}, date => {}, type => {}", rq.getCate(), rq.getGroupId(), rq.getDate(), type); + log.warn("cate => {}, serviceType => {}, date => {}, type => {}", rq.getCate(), rq.getServiceType(), rq.getDate(), type); FlightStcsModel result = new FlightStcsModel(); @@ -97,12 +97,12 @@ public class MainStatisticsController { @GetMapping("/warn-static") @ApiOperation(value = "비정상 상황 상단 데이터[DB전체 통계데이터]") @Tag(name = "통계 컨트롤러", description = "통계 관련 API") - public ResponseEntity warnStcsStatic(String groupId){ + public ResponseEntity warnStcsStatic(String serviceType){ List result = null; try { - result = service.getWarnStaticStcs(groupId); + result = service.getWarnStaticStcs(serviceType); log.warn("result => {}", result); } catch (Exception e) { @@ -152,14 +152,14 @@ public class MainStatisticsController { @GetMapping("/flight/result-static") @ApiOperation(value = "비행실적 상단데이터 통계 [DB전체 통계데이터]") @Tag(name = "통계 컨트롤러", description = "통계 관련 API") - public ResponseEntity fltResultStcs(String groupId){ + public ResponseEntity fltResultStcs(String serviceType){ - log.warn("Group => {}", groupId); + log.warn("Group => {}", serviceType); List result = null; try { - result = service.getFltResultStaticStcs(groupId); + result = service.getFltResultStaticStcs(serviceType); log.warn("result => {}", result); } catch (Exception e) { @@ -180,7 +180,7 @@ public class MainStatisticsController { @ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class) }) public ResponseEntity fltResultStcs(FlightStcsRQ rq, @PathVariable String type){ - log.warn("cate => {}, group => {}, date => {}, type => {}", rq.getCate(), rq.getGroupId(), rq.getDate(), type); + log.warn("cate => {}, ServiceType => {}, date => {}, type => {}", rq.getCate(), rq.getServiceType(), rq.getDate(), type); FlightStcsModel result = new FlightStcsModel(); diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsRQ.java b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsRQ.java index c0c05bd..af46895 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsRQ.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsRQ.java @@ -7,7 +7,7 @@ public class FlightStcsRQ { private String cate; - private String groupId; + private String serviceType; private String date; diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java index c89d9e1..47bfada 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java @@ -143,14 +143,14 @@ public class MainStatisticsService { * 비행관련 고정 통계, 항상 DB 전체값에서 통계진행할것임 * @return */ - public List getFlightStaticStcs(String groupId){ - - // 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false; - boolean authCheck = authCheck(groupId); + public List getFlightStaticStcs(String serviceType){ + + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); - FlightStcsValueModel time = cntrlQueryRepository.getFlightTimeStcs(authCheck, groupId); - FlightStcsValueModel distance = cntrlQueryRepository.getFlightDistanceStcs(authCheck, groupId); - FlightStcsValueModel fltCount = cntrlQueryRepository.getFlightCountStcs(authCheck, groupId); + FlightStcsValueModel time = cntrlQueryRepository.getFlightTimeStcs(authCheck, serviceType); + FlightStcsValueModel distance = cntrlQueryRepository.getFlightDistanceStcs(authCheck, serviceType); + FlightStcsValueModel fltCount = cntrlQueryRepository.getFlightCountStcs(authCheck, serviceType); List result = Arrays.asList(time, distance, fltCount); @@ -166,22 +166,22 @@ public class MainStatisticsService { */ public List fltStatics(FlightStcsRQ rq, String[] formatParam){ - // 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false; - boolean authCheck = authCheck(rq.getGroupId()); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); List resultList = new ArrayList<>(); switch (rq.getCate()) { case "TIME": - resultList = cntrlQueryRepository.fltTimeStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = cntrlQueryRepository.fltTimeStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "DISTANCE": - resultList = cntrlQueryRepository.fltDistanceStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = cntrlQueryRepository.fltDistanceStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "FLT_COUNT": - resultList = cntrlQueryRepository.fltCountStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = cntrlQueryRepository.fltCountStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; default : @@ -205,21 +205,22 @@ public class MainStatisticsService { */ public List fltTopStatics(FlightStcsRQ rq, String[] formatParam){ - boolean authCheck = authCheck(rq.getGroupId()); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); List resultList = new ArrayList<>(); switch (rq.getCate()) { case "TIME": - resultList = cntrlQueryRepository.fltTopTimeStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = cntrlQueryRepository.fltTopTimeStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "DISTANCE": - resultList = cntrlQueryRepository.fltTopDistanceStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = cntrlQueryRepository.fltTopDistanceStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "FLT_COUNT": - resultList = cntrlQueryRepository.fltTopCountStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = cntrlQueryRepository.fltTopCountStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; default : @@ -238,9 +239,10 @@ public class MainStatisticsService { * 비행관련 고정 통계, 항상 DB 전체값에서 통계진행할것임 * @return */ - public List getWarnStaticStcs(String groupId){ + public List getWarnStaticStcs(String serviceType){ - boolean authCheck = authCheck(groupId); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); // TODO:: 비행경로이탈, 고도이탈, 충돌위험 임시코드 String[] cate = {"PLAN" ,"ALTITUDE", "CRASH"}; @@ -249,7 +251,7 @@ public class MainStatisticsService { List result = new ArrayList<>(); for(int i = 0; i < cate.length; i ++){ - FlightStcsValueModel node = ctrCntrlWarnLogQueryRepository.getWarnStaticStcs(cate[i], authCheck, groupId); + FlightStcsValueModel node = ctrCntrlWarnLogQueryRepository.getWarnStaticStcs(cate[i], authCheck, serviceType); result.add(node); } @@ -269,9 +271,10 @@ public class MainStatisticsService { */ public List warnStatics(FlightStcsRQ rq, String[] formatParam){ - boolean authCheck = authCheck(rq.getGroupId()); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); - List resultList = ctrCntrlWarnLogQueryRepository.warnStcs(rq.getCate(), rq.getDate(), rq.getGroupId(), authCheck, formatParam); + List resultList = ctrCntrlWarnLogQueryRepository.warnStcs(rq.getCate(), rq.getDate(), rq.getServiceType(), authCheck, formatParam); for(FlightStcsValueModel node : resultList){ if(node.getName() == null || node.getName().equals("")) node.setName(" "); @@ -289,9 +292,10 @@ public class MainStatisticsService { */ public List warnTopStatics(FlightStcsRQ rq, String[] formatParam){ - boolean authCheck = authCheck(rq.getGroupId()); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); - List resultList = ctrCntrlWarnLogQueryRepository.warnTopStcs(rq.getCate(), rq.getDate(), rq.getGroupId(), authCheck, formatParam); + List resultList = ctrCntrlWarnLogQueryRepository.warnTopStcs(rq.getCate(), rq.getDate(), rq.getServiceType(), authCheck, formatParam); return resultList; } @@ -300,14 +304,14 @@ public class MainStatisticsService { * 비행실적, 비행계획서 기용, 비행승인이 많이 된 기체 데이터, 상단 고정 데이터 * @return */ - public List getFltResultStaticStcs(String groupId){ - - // 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false; - boolean authCheck = authCheck(groupId); + public List getFltResultStaticStcs(String serviceType){ + + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); - FlightStcsValueModel fltResult = fltPlanQueryRepository.getFltResultStaticStcs(authCheck, groupId); - FlightStcsValueModel fltPlan = fltPlanQueryRepository.getFltPlanStaticStcs(authCheck, groupId); - FlightStcsValueModel fltPlanAprvn = fltPlanQueryRepository.getFltPlanAprvnStaticStcs(authCheck, groupId); + FlightStcsValueModel fltResult = fltPlanQueryRepository.getFltResultStaticStcs(authCheck, serviceType); + FlightStcsValueModel fltPlan = fltPlanQueryRepository.getFltPlanStaticStcs(authCheck, serviceType); + FlightStcsValueModel fltPlanAprvn = fltPlanQueryRepository.getFltPlanAprvnStaticStcs(authCheck, serviceType); List result = Arrays.asList(fltResult,fltPlan, fltPlanAprvn); @@ -324,20 +328,20 @@ public class MainStatisticsService { List resultList = null; - // 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false; - boolean authCheck = authCheck(rq.getGroupId()); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); switch (rq.getCate()) { case "FLT_RESULT": - resultList = fltPlanQueryRepository.fltResultStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = fltPlanQueryRepository.fltResultStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "FLT_PLAN": - resultList = fltPlanQueryRepository.fltPlanStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = fltPlanQueryRepository.fltPlanStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "FLT_PLAN_APRVN": - resultList = fltPlanQueryRepository.fltPlanAprvnStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = fltPlanQueryRepository.fltPlanAprvnStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; default : @@ -356,20 +360,20 @@ public class MainStatisticsService { List resultList = null; - // 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false; - boolean authCheck = authCheck(rq.getGroupId()); + // 권한이 유저권한이 user면 true, user가 아닐 경우 false; + boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER"); switch (rq.getCate()) { case "FLT_RESULT": - resultList = fltPlanQueryRepository.fltTopResultStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = fltPlanQueryRepository.fltTopResultStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "FLT_PLAN": - resultList = fltPlanQueryRepository.fltTopPlanStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = fltPlanQueryRepository.fltTopPlanStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; case "FLT_PLAN_APRVN": - resultList = fltPlanQueryRepository.fltTopPlanAprvnStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam); + resultList = fltPlanQueryRepository.fltTopPlanAprvnStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam); break; default : diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 56f71b3..148521a 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1835,7 +1835,7 @@ public List listCntrlHstry(String id){ * DB 데이터내에 가장 많은 비행시간을 가진 기체, 비행시간 SELECT * @return */ - public FlightStcsValueModel getFlightTimeStcs(boolean authCheck, String groupId){ + public FlightStcsValueModel getFlightTimeStcs(boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; @@ -1843,7 +1843,7 @@ public List listCntrlHstry(String id){ QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List queryResult = query @@ -1872,9 +1872,9 @@ public List listCntrlHstry(String id){ String idntfNum = result.getName(); - String day = getFltTimeDay(idntfNum, authCheck, groupId); - String month = getFltTimeMonth(idntfNum, authCheck, groupId); - String year = getFltTimeYear(idntfNum, authCheck, groupId); + String day = getFltTimeDay(idntfNum, authCheck, serviceType); + String month = getFltTimeMonth(idntfNum, authCheck, serviceType); + String year = getFltTimeYear(idntfNum, authCheck, serviceType); day = day == null | day.equals("null") ? "00:00:00" : day; month = month == null | month.equals("null") ? "00:00:00" : month; @@ -1903,7 +1903,7 @@ public List listCntrlHstry(String id){ return result; } - private String getFltTimeDay(String idntfNum, boolean authCheck, String groupId){ + private String getFltTimeDay(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1911,7 +1911,7 @@ public List listCntrlHstry(String id){ String dateFormat = "%Y-%m-%d"; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlBas.createDt, dateFormat) @@ -1934,18 +1934,16 @@ public List listCntrlHstry(String id){ .fetchOne()); } - private String getFltTimeMonth(String idntfNum, boolean authCheck, String groupId){ + private String getFltTimeMonth(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; - QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; - - String dateFormat = "%Y-%m-%d"; + QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; BooleanBuilder builder = new BooleanBuilder(); builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return String.valueOf(query @@ -1965,7 +1963,7 @@ public List listCntrlHstry(String id){ .fetchOne()); } - private String getFltTimeYear(String idntfNum, boolean authCheck, String groupId){ + private String getFltTimeYear(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1974,7 +1972,7 @@ public List listCntrlHstry(String id){ builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return String.valueOf(query @@ -1998,7 +1996,7 @@ public List listCntrlHstry(String id){ * 가장 많이 이동한 기체 * @return */ - public FlightStcsValueModel getFlightDistanceStcs(boolean authCheck, String groupId){ + public FlightStcsValueModel getFlightDistanceStcs(boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; @@ -2006,7 +2004,7 @@ public List listCntrlHstry(String id){ QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); @@ -2032,10 +2030,10 @@ public List listCntrlHstry(String id){ String idntfNum = result.getName(); - Double year = getFltDistanceYear(idntfNum, authCheck, groupId); - Double month = getFltDistanceMonth(idntfNum, authCheck, groupId); - Double day =getFltDistanceDay(idntfNum, authCheck, groupId); - + Double year = getFltDistanceYear(idntfNum, authCheck, serviceType); + Double month = getFltDistanceMonth(idntfNum, authCheck, serviceType); + Double day =getFltDistanceDay(idntfNum, authCheck, serviceType); + year = year == null ? 0.0 : year; month = month == null ? 0.0 : month; day = day == null ? 0.0 : day; @@ -2057,7 +2055,7 @@ public List listCntrlHstry(String id){ return result; } - private Double getFltDistanceDay(String idntfNum, boolean authCheck, String groupId){ + private Double getFltDistanceDay(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -2065,7 +2063,7 @@ public List listCntrlHstry(String id){ String dateFormat = "%Y-%m-%d"; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlBas.createDt, dateFormat) @@ -2084,7 +2082,7 @@ public List listCntrlHstry(String id){ .fetchOne(); } - private Double getFltDistanceMonth(String idntfNum, boolean authCheck, String groupId){ + private Double getFltDistanceMonth(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -2093,7 +2091,7 @@ public List listCntrlHstry(String id){ builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -2110,7 +2108,7 @@ public List listCntrlHstry(String id){ .fetchOne(); } - private Double getFltDistanceYear(String idntfNum, boolean authCheck, String groupId){ + private Double getFltDistanceYear(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -2119,7 +2117,7 @@ public List listCntrlHstry(String id){ builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -2139,7 +2137,7 @@ public List listCntrlHstry(String id){ * 가장 많이 비행한 기체 * @return */ - public FlightStcsValueModel getFlightCountStcs(boolean authCheck, String groupId){ + public FlightStcsValueModel getFlightCountStcs(boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; @@ -2147,7 +2145,7 @@ public List listCntrlHstry(String id){ QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List queryResult = query @@ -2173,9 +2171,9 @@ public List listCntrlHstry(String id){ String idntfNum = result.getName(); - result.setYear(getFltCountYear(idntfNum, authCheck, groupId)); - result.setMonth(getFltCountMonth(idntfNum, authCheck, groupId)); - result.setDay(getFltCountDay(idntfNum, authCheck, groupId)); + result.setYear(getFltCountYear(idntfNum, authCheck, serviceType)); + result.setMonth(getFltCountMonth(idntfNum, authCheck, serviceType)); + result.setDay(getFltCountDay(idntfNum, authCheck, serviceType)); } else { FlightStcsValueModel node = new FlightStcsValueModel(); node.setName("-"); @@ -2189,7 +2187,7 @@ public List listCntrlHstry(String id){ return result; } - private Long getFltCountDay(String idntfNum, boolean authCheck, String groupId){ + private Long getFltCountDay(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -2204,7 +2202,7 @@ public List listCntrlHstry(String id){ log.warn("LocalDate.now().atStartOfDay() => {}", LocalDate.now().atStartOfDay()); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -2220,7 +2218,7 @@ public List listCntrlHstry(String id){ .fetchOne(); } - private Long getFltCountMonth(String idntfNum, boolean authCheck, String groupId){ + private Long getFltCountMonth(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -2229,7 +2227,7 @@ public List listCntrlHstry(String id){ builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -2245,7 +2243,7 @@ public List listCntrlHstry(String id){ .fetchOne(); } - private Long getFltCountYear(String idntfNum, boolean authCheck, String groupId){ + private Long getFltCountYear(String idntfNum, boolean authCheck, String serviceType){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -2254,7 +2252,7 @@ public List listCntrlHstry(String id){ builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -2279,7 +2277,7 @@ public List listCntrlHstry(String id){ * @param formatParam * @return */ - public List fltTimeStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTimeStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -2297,7 +2295,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -2339,7 +2337,7 @@ public List listCntrlHstry(String id){ * @param formatParam * @return */ - public List fltDistanceStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltDistanceStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -2357,7 +2355,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -2395,7 +2393,7 @@ public List listCntrlHstry(String id){ * @param formatParam * @return */ - public List fltCountStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltCountStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -2413,7 +2411,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -2451,7 +2449,7 @@ public List listCntrlHstry(String id){ * @param formatParam * @return */ - public List fltTopTimeStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTopTimeStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -2464,7 +2462,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -2511,7 +2509,7 @@ public List listCntrlHstry(String id){ * @param formatParam * @return */ - public List fltTopDistanceStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTopDistanceStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -2524,7 +2522,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); @@ -2564,7 +2562,7 @@ public List listCntrlHstry(String id){ * @param formatParam * @return */ - public List fltTopCountStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTopCountStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -2577,7 +2575,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java index d7964dd..a3cd6d8 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java @@ -38,7 +38,7 @@ public class CtrCntrlWarnLogQueryRepository { * 비정상상황 고정 데이터, 카테고리별 집계[PLAN, ALTITUDE, CRASH] * @return */ - public FlightStcsValueModel getWarnStaticStcs(String cate, boolean authCheck, String groupId){ + public FlightStcsValueModel getWarnStaticStcs(String cate, boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QCtrCntrlWarnLog qCtrCntrlWarnLog = QCtrCntrlWarnLog.ctrCntrlWarnLog; @@ -47,7 +47,7 @@ public class CtrCntrlWarnLogQueryRepository { BooleanBuilder builder = new BooleanBuilder(); builder.and(qCtrCntrlWarnLog.warnType.eq(cate)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List queryResult = query @@ -73,9 +73,9 @@ public class CtrCntrlWarnLogQueryRepository { String idntfNum = result.getName(); - result.setYear(getWarnYear(idntfNum, cate, authCheck, groupId)); - result.setMonth(getWarnMonth(idntfNum, cate, authCheck, groupId)); - result.setDay(getWarnDay(idntfNum, cate, authCheck, groupId)); + result.setYear(getWarnYear(idntfNum, cate, authCheck, serviceType)); + result.setMonth(getWarnMonth(idntfNum, cate, authCheck, serviceType)); + result.setDay(getWarnDay(idntfNum, cate, authCheck, serviceType)); } else { @@ -92,7 +92,7 @@ public class CtrCntrlWarnLogQueryRepository { } - private String getWarnDay(String idntfNum, String cate, boolean authCheck, String groupId){ + private String getWarnDay(String idntfNum, String cate, boolean authCheck, String serviceType){ QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -100,7 +100,7 @@ public class CtrCntrlWarnLogQueryRepository { String dateFormat = "%Y-%m-%d"; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); builder.and(bas.idntfNum.eq(idntfNum)); builder.and(bas.warnType.eq(cate)); @@ -122,7 +122,7 @@ public class CtrCntrlWarnLogQueryRepository { .fetchOne(); } - private String getWarnMonth(String idntfNum, String cate, boolean authCheck, String groupId){ + private String getWarnMonth(String idntfNum, String cate, boolean authCheck, String serviceType){ QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -132,7 +132,7 @@ public class CtrCntrlWarnLogQueryRepository { builder.and(bas.warnType.eq(cate)); builder.and(bas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(bas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -150,7 +150,7 @@ public class CtrCntrlWarnLogQueryRepository { .fetchOne(); } - private String getWarnYear(String idntfNum, String cate, boolean authCheck, String groupId){ + private String getWarnYear(String idntfNum, String cate, boolean authCheck, String serviceType){ QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -160,7 +160,7 @@ public class CtrCntrlWarnLogQueryRepository { builder.and(bas.warnType.eq(cate)); builder.and(bas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(bas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -186,7 +186,7 @@ public class CtrCntrlWarnLogQueryRepository { * @param formatParam * @return */ - public List warnStcs(String cate, String date, String groupId, boolean authCheck, String[] formatParam){ + public List warnStcs(String cate, String date, String serviceType, boolean authCheck, String[] formatParam){ // QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -205,7 +205,7 @@ public class CtrCntrlWarnLogQueryRepository { BooleanBuilder builder = new BooleanBuilder(); builder.and(bas.warnType.eq(cate)); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -244,7 +244,7 @@ public class CtrCntrlWarnLogQueryRepository { * @param formatParam * @return */ - public List warnTopStcs(String cate, String date, String groupId, boolean authCheck, String[] formatParam){ + public List warnTopStcs(String cate, String date, String serviceType, boolean authCheck, String[] formatParam){ QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -258,7 +258,7 @@ public class CtrCntrlWarnLogQueryRepository { BooleanBuilder builder = new BooleanBuilder(); builder.and(bas.warnType.eq(cate)); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index 8237d6c..9cc57a9 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -1173,7 +1173,7 @@ public class FltPlanQueryRepository { * 비행실적 데이터, top 1 * @return */ - public FlightStcsValueModel getFltResultStaticStcs(boolean authCheck, String groupId){ + public FlightStcsValueModel getFltResultStaticStcs(boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; @@ -1181,7 +1181,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull()); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List queryResult = query @@ -1205,9 +1205,9 @@ public class FltPlanQueryRepository { String idntfNum = result.getName(); - result.setYear(getFltResultYear(idntfNum, authCheck, groupId)); - result.setMonth(getFltResultMonth(idntfNum, authCheck, groupId)); - result.setDay(getFltResultDay(idntfNum, authCheck, groupId)); + result.setYear(getFltResultYear(idntfNum, authCheck, serviceType)); + result.setMonth(getFltResultMonth(idntfNum, authCheck, serviceType)); + result.setDay(getFltResultDay(idntfNum, authCheck, serviceType)); } else { FlightStcsValueModel node = new FlightStcsValueModel(); @@ -1223,7 +1223,7 @@ public class FltPlanQueryRepository { } - private Long getFltResultDay(String idntfNum, boolean authCheck, String groupId){ + private Long getFltResultDay(String idntfNum, boolean authCheck, String serviceType){ QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1231,7 +1231,7 @@ public class FltPlanQueryRepository { String dateFormat = "%Y-%m-%d"; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); builder.and(qFltPlanCtrCntrlRel.idntfNum.eq(idntfNum)); builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull()); @@ -1249,7 +1249,7 @@ public class FltPlanQueryRepository { .fetchOne(); } - private Long getFltResultMonth(String idntfNum, boolean authCheck, String groupId){ + private Long getFltResultMonth(String idntfNum, boolean authCheck, String serviceType){ QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1258,7 +1258,7 @@ public class FltPlanQueryRepository { builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull()); builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qFltPlanBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -1272,7 +1272,7 @@ public class FltPlanQueryRepository { .fetchOne(); } - private Long getFltResultYear(String idntfNum, boolean authCheck, String groupId){ + private Long getFltResultYear(String idntfNum, boolean authCheck, String serviceType){ QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1281,7 +1281,7 @@ public class FltPlanQueryRepository { builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull()); builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(qFltPlanBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -1300,14 +1300,14 @@ public class FltPlanQueryRepository { * 비행계획에 많이 기용된 기체 데이터, top 1 * @return */ - public FlightStcsValueModel getFltPlanStaticStcs(boolean authCheck, String groupId){ + public FlightStcsValueModel getFltPlanStaticStcs(boolean authCheck, String serviceType){ FlightStcsValueModel result = new FlightStcsValueModel(); QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List queryResult = query @@ -1332,9 +1332,9 @@ public class FltPlanQueryRepository { String idntfNum = result.getName(); - result.setYear(getFltPlanYear(idntfNum, authCheck, groupId)); - result.setMonth(getFltPlanMonth(idntfNum, authCheck, groupId)); - result.setDay(getFltPlanDay(idntfNum, authCheck, groupId)); + result.setYear(getFltPlanYear(idntfNum, authCheck, serviceType)); + result.setMonth(getFltPlanMonth(idntfNum, authCheck, serviceType)); + result.setDay(getFltPlanDay(idntfNum, authCheck, serviceType)); } else { FlightStcsValueModel node = new FlightStcsValueModel(); @@ -1349,14 +1349,14 @@ public class FltPlanQueryRepository { return result; } - private Long getFltPlanDay(String idntfNum, boolean authCheck, String groupId){ + private Long getFltPlanDay(String idntfNum, boolean authCheck, String serviceType){ QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; String dateFormat = "%Y-%m-%d"; BooleanBuilder builder = new BooleanBuilder(); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); builder.and(bas.idntfNum.eq(idntfNum.trim())); builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", bas.createDt, dateFormat) @@ -1373,7 +1373,7 @@ public class FltPlanQueryRepository { .fetchOne(); } - private Long getFltPlanMonth(String idntfNum, boolean authCheck, String groupId){ + private Long getFltPlanMonth(String idntfNum, boolean authCheck, String serviceType){ QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1381,7 +1381,7 @@ public class FltPlanQueryRepository { builder.and(bas.idntfNum.eq(idntfNum.trim())); builder.and(bas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(bas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -1395,7 +1395,7 @@ public class FltPlanQueryRepository { .fetchOne(); } - private Long getFltPlanYear(String idntfNum, boolean authCheck, String groupId){ + private Long getFltPlanYear(String idntfNum, boolean authCheck, String serviceType){ QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1403,7 +1403,7 @@ public class FltPlanQueryRepository { builder.and(bas.idntfNum.eq(idntfNum.trim())); builder.and(bas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); builder.and(bas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); return query @@ -1551,7 +1551,7 @@ public class FltPlanQueryRepository { * @param formatParam * @return */ - public List fltResultStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltResultStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ // QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1569,7 +1569,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -1605,7 +1605,7 @@ public class FltPlanQueryRepository { * @param formatParam * @return */ - public List fltPlanStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltPlanStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; StringTemplate formattedDate = Expressions.stringTemplate( @@ -1620,7 +1620,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -1654,7 +1654,7 @@ public class FltPlanQueryRepository { * @param formatParam * @return */ - public List fltPlanAprvnStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltPlanAprvnStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ // QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1672,7 +1672,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); builder.and(qFltPlanBas.aprvlYn.eq("Y")); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -1707,7 +1707,7 @@ public class FltPlanQueryRepository { * @param formatParam * @return */ - public List fltTopResultStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTopResultStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1718,7 +1718,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -1754,7 +1754,7 @@ public class FltPlanQueryRepository { * @param formatParam * @return */ - public List fltTopPlanStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTopPlanStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1766,7 +1766,7 @@ public class FltPlanQueryRepository { BooleanBuilder builder = new BooleanBuilder(); if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); List result = query @@ -1803,7 +1803,7 @@ public class FltPlanQueryRepository { * @param formatParam * @return */ - public List fltTopPlanAprvnStcs(String date, String groupId, boolean authCheck, String[] formatParam){ + public List fltTopPlanAprvnStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1817,7 +1817,7 @@ public class FltPlanQueryRepository { if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); builder.and(qFltPlanBas.aprvlYn.eq("Y")); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); - if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); List result = query .select(