From 849b99e475d26b3c63d7734b31920791491450a4 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Mon, 3 Feb 2025 15:33:02 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B3=B4=EB=93=9C=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localhost/controller/api/BoardController.java | 14 +++++++++++++- .../controller/api/VacationController.java | 12 ++++-------- .../company/localhost/mapper/commoncodMapper.java | 2 ++ .../company/localhost/mapper/localvacaMapper.java | 2 +- .../localhost/service/commoncodService.java | 5 ++++- .../localhost/service/localbordService.java | 2 +- .../localhost/service/localvacaService.java | 8 ++++---- src/main/resources/mapper/commoncodMapper.xml | 5 +++++ src/main/resources/mapper/localbordMapper.xml | 2 +- src/main/resources/mapper/localvacaMapper.xml | 2 +- 10 files changed, 36 insertions(+), 18 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 d545e55..3cb1643 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -27,6 +27,7 @@ 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.localbordService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -38,6 +39,7 @@ import lombok.extern.slf4j.Slf4j; public class BoardController { private final localbordService boardService; + private final commoncodService commoncodService; /** * 공지사항 목록 조회 @@ -74,7 +76,7 @@ public class BoardController { @PostMapping public ApiResponse createBoard(@ReqMap MapDto map) { //임시 - map.put("MEMBERSEQ", 1); + map.put("MEMBERSEQ", 1); return ApiResponse.ok(boardService.createBoard(map)); } @@ -230,4 +232,14 @@ public class BoardController { public ApiResponse checkBoardPassword(@PathVariable("boardId") int boardId, @ReqMap MapDto map) { return ApiResponse.ok(boardService.getBoardPassword(boardId).equals(map.getString("LOCBRDPWD"))); } + + /** + * 카테고리 목록 조회 + * @return 카테고리 리스트 + */ + @GetMapping("/categories") + public ApiResponse> getCategories() { + List categories = commoncodService.getCategoryList(); + return ApiResponse.ok(categories); + } } \ No newline at end of file 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 60dda49..e8d110a 100644 --- a/src/main/java/io/company/localhost/controller/api/VacationController.java +++ b/src/main/java/io/company/localhost/controller/api/VacationController.java @@ -23,13 +23,9 @@ public class VacationController { private final localvacaService localVacaService; @PostMapping - public ApiResponse saveVacations(@RequestBody List vacationRequests) { - // 요청 데이터 유효성 검사 - if (vacationRequests == null || vacationRequests.isEmpty()) { - throw new IllegalArgumentException("휴가 요청 데이터가 비어 있습니다."); - } + public ApiResponse saveVacations(@RequestBody List map) { - for (MapDto request : vacationRequests) { + for (MapDto request : map) { // 각 요청 데이터의 필수 값 검증 Integer employeeId = (Integer) request.get("employeeId"); String date = request.getString("date"); @@ -51,10 +47,10 @@ public class VacationController { * 휴가 정보를 조회하여 프론트엔드로 전달 */ @GetMapping("/list") - public ApiResponse> getVacationList() { + public ApiResponse> getVacationList(@ReqMap MapDto map) { // 서비스 호출을 통해 데이터 조회 - List vacationList = localVacaService.getVacationList(); + List vacationList = localVacaService.getVacationList(map); return ApiResponse.ok(vacationList); } diff --git a/src/main/java/io/company/localhost/mapper/commoncodMapper.java b/src/main/java/io/company/localhost/mapper/commoncodMapper.java index 46255a6..daf7eea 100644 --- a/src/main/java/io/company/localhost/mapper/commoncodMapper.java +++ b/src/main/java/io/company/localhost/mapper/commoncodMapper.java @@ -32,4 +32,6 @@ public interface commoncodMapper { List getMbtiList(); int updateColorYon(String color); + + List getCategories(); } diff --git a/src/main/java/io/company/localhost/mapper/localvacaMapper.java b/src/main/java/io/company/localhost/mapper/localvacaMapper.java index b6bca47..21bb469 100644 --- a/src/main/java/io/company/localhost/mapper/localvacaMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvacaMapper.java @@ -12,7 +12,7 @@ import io.company.localhost.common.dto.MapDto; public interface localvacaMapper { void insertVacation(MapDto map); - List findVacations(); + List findVacations(MapDto map); } diff --git a/src/main/java/io/company/localhost/service/commoncodService.java b/src/main/java/io/company/localhost/service/commoncodService.java index 2db79e1..2ea168b 100644 --- a/src/main/java/io/company/localhost/service/commoncodService.java +++ b/src/main/java/io/company/localhost/service/commoncodService.java @@ -43,6 +43,9 @@ public class commoncodService { public List getMbtiList() { return commoncodmapper.getMbtiList(); } - + + public List getCategoryList() { + return commoncodmapper.getCategories(); + } } diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java index 71e4b77..5e28d64 100644 --- a/src/main/java/io/company/localhost/service/localbordService.java +++ b/src/main/java/io/company/localhost/service/localbordService.java @@ -33,7 +33,7 @@ public class localbordService { public PageInfo getGeneralPosts(MapDto map) { int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1; - int size = map.getString("size") != null ? Integer.parseInt(map.getString("size")) : 10; + int size = map.getString("size") != null ? Integer.parseInt(map.getString("size")) : 12; String orderBy = map.getString("orderBy"); if (orderBy == null || (!orderBy.equals("date") && !orderBy.equals("views"))) { diff --git a/src/main/java/io/company/localhost/service/localvacaService.java b/src/main/java/io/company/localhost/service/localvacaService.java index 91086c3..b932f60 100644 --- a/src/main/java/io/company/localhost/service/localvacaService.java +++ b/src/main/java/io/company/localhost/service/localvacaService.java @@ -14,12 +14,12 @@ public class localvacaService { private final localvacaMapper localvacaMapper; - public void insertVacation(MapDto vacationRequest) { - localvacaMapper.insertVacation(vacationRequest); + public void insertVacation(MapDto map) { + localvacaMapper.insertVacation(map); } - public List getVacationList() { - return localvacaMapper.findVacations(); + public List getVacationList(MapDto map) { + return localvacaMapper.findVacations(map); } } diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml index 710c47e..a4c7c92 100644 --- a/src/main/resources/mapper/commoncodMapper.xml +++ b/src/main/resources/mapper/commoncodMapper.xml @@ -62,5 +62,10 @@ WHERE CMNCODVAL = #{color}; + + diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml index 7d451c4..de7e078 100644 --- a/src/main/resources/mapper/localbordMapper.xml +++ b/src/main/resources/mapper/localbordMapper.xml @@ -62,7 +62,7 @@ diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml index a926273..6138a15 100644 --- a/src/main/resources/mapper/localvacaMapper.xml +++ b/src/main/resources/mapper/localvacaMapper.xml @@ -9,7 +9,7 @@ - SELECT MEMBERSEQ LOCVACUDT,