From ea3ce3b5173558c3df7b4b78df8253ad2a144cba Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Thu, 13 Feb 2025 16:24:38 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9C=B4=EA=B0=80=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=82=AC=EC=9B=90=20=EC=97=B0=EC=B0=A8=EC=82=AC=EC=9A=A9?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/BoardController.java | 2 +- .../controller/api/VacationController.java | 33 ++++++++++++++----- .../localhost/mapper/localvacaMapper.java | 4 +++ .../localhost/service/localvacaService.java | 15 +++++++++ src/main/resources/mapper/localvacaMapper.xml | 18 ++++++++++ 5 files changed, 63 insertions(+), 9 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/BoardController.java b/src/main/java/io/company/localhost/controller/api/BoardController.java index 1b96954..7368d47 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -179,7 +179,7 @@ public class BoardController { /** * 댓글/대댓글 작성 * @param boardId 게시물 ID - * @ReqMap map 댓글 데이터 (LOCBRDSEQ, LOCCMTRPY, LOCCMTPNT, LOCCMTPWD, MEMBERSEQ 등) + * @ReqMap map 댓글 데이터 (LOCBRDSEQ, LOCCMTRPY, LOCCMTPNT, LOCCMTPWD, MEMBERSEQ ) * @return 작성 결과 메시지 */ @Member diff --git a/src/main/java/io/company/localhost/controller/api/VacationController.java b/src/main/java/io/company/localhost/controller/api/VacationController.java index 3123c9e..5aa7af6 100644 --- a/src/main/java/io/company/localhost/controller/api/VacationController.java +++ b/src/main/java/io/company/localhost/controller/api/VacationController.java @@ -1,5 +1,6 @@ package io.company.localhost.controller.api; import java.util.List; +import java.util.Map; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -8,11 +9,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import io.company.localhost.common.annotation.Member; +import io.company.localhost.common.annotation.ParameterCheck; import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.ApiResponse; import io.company.localhost.common.dto.MapDto; import io.company.localhost.service.commoncodService; import io.company.localhost.service.localvacaService; // 서비스 클래스 경로 수정 +import io.company.localhost.utils.AuthUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -23,31 +27,32 @@ import lombok.extern.slf4j.Slf4j; public class VacationController { private final localvacaService localVacaService; - + + @Member + @ParameterCheck @PostMapping - public ApiResponse saveVacations(@RequestBody List map) { - + public ApiResponse saveVacations(@RequestBody List map) { + Long user = AuthUtil.getUser().getId(); for (MapDto request : map) { - // 각 요청 데이터의 필수 값 검증 - Integer employeeId = (Integer) request.get("employeeId"); String date = request.getString("date"); String type = request.getString("type"); - if (employeeId == null || date == null || type == null) { + if ( date == null || type == null) { throw new IllegalArgumentException("요청 데이터에 누락된 값이 있습니다: " + request); } - + request.put("employeeId", user); // 데이터 저장 localVacaService.insertVacation(request); } return ApiResponse.ok("모든 휴가가 성공적으로 저장되었습니다."); } - /** * 특정 연월에 대한 휴가 데이터 조회 */ + @Member + @ParameterCheck @GetMapping("/list/{year}/{month}") public List getVacations(@PathVariable("year") int year, @PathVariable("month") int month) { return localVacaService.getVacationList(year, month); @@ -56,9 +61,21 @@ public class VacationController { /** * 특정 연월에 대한 공휴일 데이터 조회 */ + @Member + @ParameterCheck @GetMapping("/{year}/{month}") public List getHolidays(@PathVariable("year") int year, @PathVariable("month") int month) { return localVacaService.getHolidays(year, month); } + /** + * 내 연차 사용 내역 조회 + */ + @Member + @ParameterCheck + @GetMapping("/history") + public ApiResponse>> getUserVacationHistory() { + Long userId = AuthUtil.getUser().getId(); + return ApiResponse.ok(localVacaService.getUserVacationHistory(userId)); + } } diff --git a/src/main/java/io/company/localhost/mapper/localvacaMapper.java b/src/main/java/io/company/localhost/mapper/localvacaMapper.java index 7f034f1..e094214 100644 --- a/src/main/java/io/company/localhost/mapper/localvacaMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvacaMapper.java @@ -13,6 +13,10 @@ public interface localvacaMapper { void insertVacation(MapDto map); List findVacations(@Param("year") int year, @Param("month") int month); + + List getUsedVacations(@Param("userId") Long userId); + + List getReceivedVacations(@Param("userId") Long userId); } diff --git a/src/main/java/io/company/localhost/service/localvacaService.java b/src/main/java/io/company/localhost/service/localvacaService.java index b046348..d51d859 100644 --- a/src/main/java/io/company/localhost/service/localvacaService.java +++ b/src/main/java/io/company/localhost/service/localvacaService.java @@ -3,6 +3,7 @@ package io.company.localhost.service; import java.net.URLDecoder; import java.nio.charset.StandardCharsets; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Value; @@ -140,4 +141,18 @@ public class localvacaService { dto.put("name", item.get("dateName")); return dto; } + + /** + * 내 연차 사용 내역 조회 (사용한 연차 & 받은 연차) + */ + public Map> getUserVacationHistory(Long userId) { + List usedVacations = localvacaMapper.getUsedVacations(userId); + List receivedVacations = localvacaMapper.getReceivedVacations(userId); + + Map> history = new HashMap<>(); + history.put("usedVacations", usedVacations); + history.put("receivedVacations", receivedVacations); + + return history; + } } diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml index a6728d8..944cc46 100644 --- a/src/main/resources/mapper/localvacaMapper.xml +++ b/src/main/resources/mapper/localvacaMapper.xml @@ -14,5 +14,23 @@ FROM localvaca WHERE DATE_FORMAT(LOCVACUDT, '%Y-%m') = CONCAT(#{year}, '-', LPAD(#{month}, 2, '0')) + + + + + + \ No newline at end of file