From 01280c335e2e5d8c294764a235ed11522ca7d249 Mon Sep 17 00:00:00 2001 From: lkd9125 Date: Tue, 19 Sep 2023 17:26:59 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=EC=9D=BC=EC=8B=9C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=B6=94=EA=B0=80,=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=EB=AA=85=20=EB=B0=8F=20URL=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/dash/controller/MainDashController.java | 14 +++++++------- .../biz/api/main/dash/service/MainDashService.java | 4 ++-- .../jpa/repository/flt/FltPlanBasRepository.java | 2 +- .../jpa/repository/flt/FltPlanQueryRepository.java | 8 ++++---- 4 files changed, 14 insertions(+), 14 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 f3f1f0c..df2fbdc 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 @@ -161,7 +161,7 @@ public class MainDashController { @GetMapping(value = "/stcs/flight/date/{type}") - @ApiOperation(value = "김포공항, 날짜 통계") + @ApiOperation(value = "김포공항, 비행실적 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class) public ResponseEntity kacDateStatistics(String date, @PathVariable String type){ @@ -190,17 +190,17 @@ public class MainDashController { return ResponseEntity.ok().body(new SuccessResponse>(result)); } - @GetMapping("/kac/plan-allow/stcs/date/{type}") + @GetMapping("/stcs/plan-allow/date/{type}") @ApiOperation(value = "김포공항, 비행승인 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") - @ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class) - public ResponseEntity kacPlanAllowStatistics(String yyyymm ,@PathVariable String type){ + @ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class) + public ResponseEntity kacPlanAllowStatistics(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)); @@ -209,7 +209,7 @@ public class MainDashController { List result = null; try { - result = service.mainKacStcsPlanAllow(yyyymm,formatParam); + result = service.mainKacStcsPlanAllow(date,formatParam); } catch (Exception e) { log.error("IGNORE : {}", e); 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 32ff01e..e0c2cfe 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 @@ -114,9 +114,9 @@ public class MainDashService { * @param yyyymm * @return */ - public List mainKacStcsPlanAllow(String yyyymm, String[] formatParam){ + public List mainKacStcsPlanAllow(String date, String[] formatParam){ - List resultList = fltPlanQueryRepository.mainKacStcsPlanAllow(yyyymm, formatParam); + List resultList = fltPlanQueryRepository.mainKacStcsPlanAllow(date, formatParam); return resultList; } diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java index aa1fb8e..98258f3 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanBasRepository.java @@ -33,7 +33,7 @@ public interface FltPlanBasRepository extends JpaRepository @Transactional @Modifying - @Query("update FltPlanBas f set f.aprvlYn = :aprvlYn where f.planSno in :planSno") + @Query("update FltPlanBas f set f.aprvlYn = :aprvlYn, f.aprvlDt = now() where f.planSno in :planSno") int updateAprvlYnByPlanSnoIn(@Param("planSno") List planSnos, @Param("aprvlYn") String aprvlYn); Optional findByPlanSnoAndDelYnNot(Integer planSno, String delYn); 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 4793b4a..6e27930 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 @@ -672,23 +672,23 @@ public class FltPlanQueryRepository { * @param yyyymm * @return */ - public List mainKacStcsPlanAllow(String yyyymm, String[] formatParam){ + public List mainKacStcsPlanAllow(String date, String[] formatParam){ QFltPlanBas bas = QFltPlanBas.fltPlanBas; StringTemplate formattedDate = Expressions.stringTemplate( "DATE_FORMAT({0}, {1})" - , bas.schFltStDt + , bas.aprvlDt , ConstantImpl.create(formatParam[0])); StringTemplate formattedDate2 = Expressions.stringTemplate( "DATE_FORMAT({0}, {1})" - , bas.schFltStDt + , bas.aprvlDt , ConstantImpl.create(formatParam[1])); BooleanBuilder builder = new BooleanBuilder(); builder.and(bas.aprvlYn.eq("Y")); - 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(