From ce24478c6adba6cee6943b821427c851d657b5ba Mon Sep 17 00:00:00 2001 From: lkd9125 Date: Tue, 19 Sep 2023 16:09:28 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=EB=AA=85?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20[=EA=B8=B0=EC=A1=B4]=20yyyymm=20[?= =?UTF-8?q?=EB=B3=80=EA=B2=BD]=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/dash/controller/MainDashController.java | 12 ++++++------ .../api/main/dash/service/MainDashService.java | 16 +++++++--------- .../repository/ctr/CtrCntrlQueryRepository.java | 4 ++-- 3 files changed, 15 insertions(+), 17 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 5d761f4..51035ee 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 @@ -163,14 +163,14 @@ public class MainDashController { @GetMapping(value = "/kac/flight/stcs/date/{type}") @ApiOperation(value = "김포공항, 날짜 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") - @ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class) - public ResponseEntity kacDateStatistics(String yyyymm, @PathVariable String type){ + @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class) + public ResponseEntity kacDateStatistics(String date, @PathVariable String type){ String[] formatParam = null; try { - if(yyyymm == null) yyyymm = ""; - formatParam = service.paramCheck(yyyymm, type); + if(date == null) date = ""; + formatParam = service.paramCheck(date, type); } catch (NumberFormatException e) { return ResponseEntity.status(HttpStatus.OK) .body(new ErrorResponse(RSErrorCode.ER_PARAM)); @@ -179,7 +179,7 @@ public class MainDashController { List result = null; try { - result = service.mainKacDashStcsDay(yyyymm,formatParam); + result = service.mainKacDashStcsDay(date,formatParam); } catch (Exception e) { log.error("IGNORE : {}", e); @@ -190,7 +190,7 @@ public class MainDashController { return ResponseEntity.ok().body(new SuccessResponse>(result)); } - @GetMapping("/kac/stcs/plan-allow/{type}") + @GetMapping("/kac/plan-allow/stcs/date/{type}") @ApiOperation(value = "김포공항, 비행승인 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class) 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 e5b4c19..32ff01e 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 @@ -102,9 +102,9 @@ public class MainDashService { * @param yyyymm * @return */ - public List mainKacDashStcsDay(String yyyymm, String[] formatParam){ + public List mainKacDashStcsDay(String date, String[] formatParam){ - List resultList = query.mainKacDashStcsDay(yyyymm, formatParam); + List resultList = query.mainKacDashStcsDay(date, formatParam); return resultList; } @@ -128,22 +128,20 @@ public class MainDashService { * 3. 일단위 검색 -> Parameter 2023-09 등 월까지 있는경우 * 4. 일일단위 검색 -> Parameter 2023-09-01 등 한 날짜에 대한 검색 * 이하 모든 데이터는 Exception 발생 - * @param yyyyMM + * @param date * @throws NumberFormatException */ - public String[] paramCheck(String yyyymm, String type) throws NumberFormatException{ + public String[] paramCheck(String date, String type) throws NumberFormatException{ String[] result = new String[2]; - yyyymm = yyyymm.trim(); + date = date.trim(); - logger.error("yyyymm -> {}", yyyymm.length()); - - String[] paramStrings = yyyymm.split("-"); + String[] paramStrings = date.split("-"); switch (type) { case "month": // 2. 월단위 검색 -> Parameter 2023등 연도만 있는경우 - Integer.parseInt(yyyymm.trim()); + Integer.parseInt(date.trim()); result[0] = "%Y"; result[1] = "%m"; 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 65ad442..23acb06 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 @@ -1676,7 +1676,7 @@ public List listCntrlHstry(String id){ * @param yyyymm * @return */ - public List mainKacDashStcsDay(String yyyymm, String[] formatParam){ + public List mainKacDashStcsDay(String date, String[] formatParam){ QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; StringTemplate formattedDate = Expressions.stringTemplate( @@ -1691,7 +1691,7 @@ public List listCntrlHstry(String id){ BooleanBuilder builder = new BooleanBuilder(); builder.and(bas.statusCd.eq("99")); - if(yyyymm != null && yyyymm.length() > 0) builder.and(formattedDate.eq(yyyymm)); + if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); List result = query .select(