From 033a50042357c4510420d517dfd3ac201f6e3dd4 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:54:52 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=9A=A9=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dash/controller/MainDashController.java | 3 +- .../controller/MainStatisticsController.java | 37 +++++-------------- .../ctr/CtrCntrlQueryRepository.java | 15 ++------ .../flt/FltPlanQueryRepository.java | 4 +- 4 files changed, 15 insertions(+), 44 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java b/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java index 3d357a27..00a4fa0d 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java @@ -364,8 +364,7 @@ public class MainDashController { @ApiImplicitParam(name = "groupId",value = "그룹아이디", dataTypeClass = String.class) }) public ResponseEntity currentFlightPlan(@RequestParam(required = false) String groupId){ - - log.warn("groupId => {}", groupId); + List result = new ArrayList<>(); try { result = service.currentFlightPlan(groupId); 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 4316f548..63c7177e 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,16 +38,12 @@ public class MainStatisticsController { @GetMapping("/flight-static") @ApiOperation(value = "비행통계 상단 데이터[DB전체 통계데이터]") @Tag(name = "통계 컨트롤러", description = "통계 관련 API") - public ResponseEntity fltStcsStatic(String serviceType){ - - log.warn("ServiceType => {}", serviceType); + public ResponseEntity fltStcsStatic(String serviceType){ List result = null; try { - result = service.getFlightStaticStcs(serviceType); - - log.warn("result => {}", result); + result = service.getFlightStaticStcs(serviceType); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) @@ -65,8 +61,7 @@ public class MainStatisticsController { @ApiImplicitParam(name = "cate",value = "비행시간,거리,횟수[TIME]", dataTypeClass = String.class), @ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class) }) - public ResponseEntity fltStcs(FlightStcsRQ rq, @PathVariable String type){ - log.warn("cate => {}, serviceType => {}, date => {}, type => {}", rq.getCate(), rq.getServiceType(), rq.getDate(), type); + public ResponseEntity fltStcs(FlightStcsRQ rq, @PathVariable String type){ FlightStcsModel result = new FlightStcsModel(); @@ -80,9 +75,7 @@ public class MainStatisticsController { List topData = service.fltTopStatics(rq, formatParam); result.setGraphData(graphData); - result.setTopData(topData); - - log.warn("result => {}", result); + result.setTopData(topData); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) @@ -102,9 +95,7 @@ public class MainStatisticsController { List result = null; try { - result = service.getWarnStaticStcs(serviceType); - - log.warn("result => {}", result); + result = service.getWarnStaticStcs(serviceType); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) @@ -123,7 +114,6 @@ public class MainStatisticsController { @ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class) }) public ResponseEntity warnStcs(FlightStcsRQ rq, @PathVariable String type){ - log.warn("rq => {}",rq); FlightStcsModel result = new FlightStcsModel(); @@ -137,9 +127,7 @@ public class MainStatisticsController { List topData = service.warnTopStatics(rq, formatParam); result.setGraphData(graphData); - result.setTopData(topData); - - log.warn("result => {}", result); + result.setTopData(topData); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) @@ -152,16 +140,12 @@ public class MainStatisticsController { @GetMapping("/flight/result-static") @ApiOperation(value = "비행실적 상단데이터 통계 [DB전체 통계데이터]") @Tag(name = "통계 컨트롤러", description = "통계 관련 API") - public ResponseEntity fltResultStcs(String serviceType){ - - log.warn("Group => {}", serviceType); + public ResponseEntity fltResultStcs(String serviceType){ List result = null; try { - result = service.getFltResultStaticStcs(serviceType); - - log.warn("result => {}", result); + result = service.getFltResultStaticStcs(serviceType); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) @@ -179,8 +163,7 @@ public class MainStatisticsController { @ApiImplicitParam(name = "cate",value = "비행실적,비행계획서,비행계획승인[FLT_PLAN_APRVN]", dataTypeClass = String.class), @ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class) }) - public ResponseEntity fltResultStcs(FlightStcsRQ rq, @PathVariable String type){ - log.warn("cate => {}, ServiceType => {}, date => {}, type => {}", rq.getCate(), rq.getServiceType(), rq.getDate(), type); + public ResponseEntity fltResultStcs(FlightStcsRQ rq, @PathVariable String type){ FlightStcsModel result = new FlightStcsModel(); @@ -195,8 +178,6 @@ public class MainStatisticsController { result.setGraphData(graphData); result.setTopData(topData); - - log.warn("result => {}", result); } catch (Exception e) { log.error("IGNORE : {}", e); return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) 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 996903bc..7fbabb35 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 @@ -1876,15 +1876,11 @@ public List listCntrlHstry(String id){ 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; - year = year == null | year.equals("null") ? "00:00:00" : year; + day = day == null || day.equals("null") ? "00:00:00" : day; + month = month == null || month.equals("null") ? "00:00:00" : month; + year = year == null || year.equals("null") ? "00:00:00" : year; - log.warn("day => {}", day); - log.warn("month => {}", month); - log.warn("day => {}", day); - result.setDay(day); result.setYear(year); result.setMonth(month); @@ -2198,10 +2194,7 @@ public List listCntrlHstry(String id){ builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlBas.createDt, dateFormat) .eq(LocalDate.now().toString())); - - - - log.warn("LocalDate.now().atStartOfDay() => {}", LocalDate.now().atStartOfDay()); + if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); 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 9cc57a92..dfdaf6d8 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 @@ -1322,9 +1322,7 @@ public class FltPlanQueryRepository { .groupBy(qFltPlanArcrft.idntfNum) .orderBy(qFltPlanArcrft.planSno.count().desc()) .limit(1) - .fetch(); - - log.warn("que => {}", queryResult); + .fetch(); if(queryResult.size() > 0){ result = queryResult.get(0);