From 29ed289ab8082d18b193622d9f1440eed443e9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 16 Nov 2023 10:00:09 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EC=9E=90=EB=8F=99=20=EC=9E=AC=EC=8B=9C?= =?UTF-8?q?=EC=9E=91=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pav-server/src/main/resources/application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pav-server/src/main/resources/application.yml b/pav-server/src/main/resources/application.yml index c85a2d59..12896de1 100644 --- a/pav-server/src/main/resources/application.yml +++ b/pav-server/src/main/resources/application.yml @@ -17,6 +17,8 @@ spring: devtools: livereload: enabled: true + restart: + enabled: false servlet: multipart: enabled: true From 2d1577f7fe7ec456f53101d66fc073d1daa92cb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 16 Nov 2023 10:00:41 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=8A=A4=EC=9B=A8=EA=B1=B0=20=EC=84=A4?= =?UTF-8?q?=EB=AA=85=20=EC=88=98=EC=A0=95(=EB=B9=84=ED=96=89=ED=9A=9F?= =?UTF-8?q?=EC=88=98=20>=20=EB=B9=84=ED=96=89=EA=B1=B4=EC=88=98)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/api/main/dash/controller/MainDashController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a811e73f..05b9cd91 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 @@ -43,7 +43,7 @@ public class MainDashController { * @return */ @GetMapping(value = "/stcs/day") - @ApiOperation(value = "일 별 비행횟수 통계") + @ApiOperation(value = "일 별 비행건수 통계") @Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") @ApiImplicitParam(name = "yyyymm",value = "날짜", dataTypeClass = String.class) public ResponseEntity stcsDay(String yyyymm) { From 3c05b88a4238154fd60a108b62e235aa965c031d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 16 Nov 2023 10:01:07 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=EB=B9=84=ED=96=89?= =?UTF-8?q?=EA=B5=AC=EC=97=AD=20=EB=82=98=EC=98=A4=EB=8A=94=20=ED=98=84?= =?UTF-8?q?=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/jpa/repository/flt/FltPlanQueryRepository.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 d9dcd45c..3950fbee 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 @@ -2058,13 +2058,14 @@ public class FltPlanQueryRepository { QFltPlanArea area = QFltPlanArea.fltPlanArea; QFltPlanAreaCoord coord = QFltPlanAreaCoord.fltPlanAreaCoord; - Instant fltNowDt = Instant.now(); +// Instant fltNowDt = Instant.now(); + Instant fltNowDt = Instant.parse("2023-11-15T09:00:00.000Z"); List rs = query.from(bas) .leftJoin(arcrft) .on(bas.planSno.eq(arcrft.planSno)) .leftJoin(area) - .on(area.planSno.eq(area.planSno)) + .on(bas.planSno.eq(area.planSno)) .where( arcrft.idntfNum.eq(idntfNum) .and(bas.aprvlYn.eq("Y")) From ad7dde789e1e9d02178d4295c8c08b49346ca453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Thu, 16 Nov 2023 10:10:48 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EB=AA=A8=EB=93=A0=20=EB=B9=84=ED=96=89?= =?UTF-8?q?=EA=B5=AC=EC=97=AD=20=EB=82=98=EC=98=A4=EB=8A=94=20=ED=98=84?= =?UTF-8?q?=EC=83=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 3950fbee..2ebd9889 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 @@ -2058,8 +2058,7 @@ public class FltPlanQueryRepository { QFltPlanArea area = QFltPlanArea.fltPlanArea; QFltPlanAreaCoord coord = QFltPlanAreaCoord.fltPlanAreaCoord; -// Instant fltNowDt = Instant.now(); - Instant fltNowDt = Instant.parse("2023-11-15T09:00:00.000Z"); + Instant fltNowDt = Instant.now(); List rs = query.from(bas) .leftJoin(arcrft)