From 8e64369b771384667928f0fa91609d8cd05273c6 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Fri, 21 Feb 2025 11:00:03 +0900 Subject: [PATCH 01/36] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EA=B8=80?= =?UTF-8?q?=EC=9E=91=EC=84=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/localhost/controller/api/BoardController.java | 3 +-- .../io/company/localhost/service/localbordService.java | 8 ++++++++ 2 files changed, 9 insertions(+), 2 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 7b6bbf1..54605a3 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -80,8 +80,7 @@ public class BoardController { @ParameterCheck @PostMapping public ApiResponse createBoard(@ReqMap MapDto map) { - Long userId = AuthUtil.getUser().getId(); - map.put("MEMBERSEQ", userId); + if (map.containsKey("LOCBRDPWD") && !map.getString("LOCBRDPWD").trim().isEmpty()) { // 빈 값 체크 String rawPassword = map.getString("LOCBRDPWD"); diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java index 298d3ba..ed4f2d0 100644 --- a/src/main/java/io/company/localhost/service/localbordService.java +++ b/src/main/java/io/company/localhost/service/localbordService.java @@ -16,6 +16,7 @@ import com.github.pagehelper.PageInfo; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.localbordMapper; +import io.company.localhost.utils.AuthUtil; import io.company.localhost.utils.PageUtil; import lombok.RequiredArgsConstructor; @@ -54,6 +55,13 @@ public class localbordService { } public BigInteger insertBoard(MapDto map) { + // 익명게시판이면 회원 정보를 null로 설정 + if ("300102".equals(String.valueOf(map.get("LOCBRDTYP")))) { + map.put("MEMBERSEQ", null); + }else { + Long userId = AuthUtil.getUser().getId(); + map.put("MEMBERSEQ", userId); + } boardMapper.insertBoard(map); return (BigInteger) map.get("LOCBRDSEQ"); } From 041a726dc1ad17827f141d0ac2f205eb325d9724 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 12:56:51 +0900 Subject: [PATCH 02/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..f41ac30 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,23 @@ +pipeline { + agent any + + stages { + stage('Clean & Build') { + steps { + bat 'gradlew clean build' + } + } + + stage('Deploy') { + steps { + bat ''' + copy /Y build\libs\*-plain.war C:\localhost-tomcat\apache-tomcat-10.1.36-windows-x64\apache-tomcat-10.1.36\webapps\ROOT.war + cd C:\localhost-tomcat\apache-tomcat-10.1.36\bin + call shutdown.bat + timeout /t 5 /nobreak + call startup.bat + ''' + } + } + } +} From e650aebadac95cbc226b0819a5d0238e76103b65 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 13:09:50 +0900 Subject: [PATCH 03/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f41ac30..b3631b7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,13 @@ pipeline { agent any + tools { + gradle 'gradle8' + } stages { stage('Clean & Build') { steps { - bat 'gradlew clean build' + bat './gradlew clean build' } } From 97da33d1510b306e102749a09d9e4c031e5d94f4 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 13:26:22 +0900 Subject: [PATCH 04/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b3631b7..164a8e5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,8 +14,8 @@ pipeline { stage('Deploy') { steps { bat ''' - copy /Y build\libs\*-plain.war C:\localhost-tomcat\apache-tomcat-10.1.36-windows-x64\apache-tomcat-10.1.36\webapps\ROOT.war - cd C:\localhost-tomcat\apache-tomcat-10.1.36\bin + copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war + cd C:\\localhost-tomcat\\apache-tomcat-10.1.36\\bin call shutdown.bat timeout /t 5 /nobreak call startup.bat From 790d73db8d7c3cbc12b26eb96d1ef6b7367e8472 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 13:29:47 +0900 Subject: [PATCH 05/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=953?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 164a8e5..8fb2aff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stages { stage('Clean & Build') { steps { - bat './gradlew clean build' + bat './gradlew clean build -x test' } } From 92872d0eb6b6ae767ad445ccb0b4e2903850c0ef Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 13:40:27 +0900 Subject: [PATCH 06/36] =?UTF-8?q?war=20=EB=B9=8C=EB=93=9C=EB=A1=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index 9a467ae..9f8bb2f 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version "${springBootVersion}" id 'io.spring.dependency-management' version "${springDependencyManagementVersion}" + id 'war' } group = "${projectGroup}" @@ -77,6 +78,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-actuator-autoconfigure' /*implementation 'org.springframework.boot:spring-boot-starter-batch'*/ + providedRuntime 'org.springframework.boot:spring-boot-starter-tomcat' /** spring-boot-starter-security */ implementation 'org.springframework.boot:spring-boot-starter-security' From 15cb57a952bc6196fa443047ba5117b6d115f038 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 13:42:55 +0900 Subject: [PATCH 07/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8fb2aff..360f52d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,7 +15,7 @@ pipeline { steps { bat ''' copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war - cd C:\\localhost-tomcat\\apache-tomcat-10.1.36\\bin + cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin call shutdown.bat timeout /t 5 /nobreak call startup.bat From bebc1d0cd76f040892fe262876e5d958ebe37e81 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:03:20 +0900 Subject: [PATCH 08/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 360f52d..6f6bd36 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,7 @@ pipeline { steps { bat ''' copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war + timeout /t 5 /nobreak cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin call shutdown.bat timeout /t 5 /nobreak From a84ed04027ebbb87df1c78f7ab6ca92d82fb2a6f Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:13:57 +0900 Subject: [PATCH 09/36] 1 --- Jenkinsfile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6f6bd36..14d705b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,11 +14,21 @@ pipeline { stage('Deploy') { steps { bat ''' + netstat -ano | find "8080" > nul + + if errorlevel 1 ( + echo "Tomcat is not running, skipping shutdown..." + ) else ( + echo "Tomcat is running, shutting down..." + cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin + call shutdown.bat + timeout /t 5 /nobreak + ) + copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war timeout /t 5 /nobreak + cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call shutdown.bat - timeout /t 5 /nobreak call startup.bat ''' } From 64f705175163ad5bb19def0b1ea9cf25e2e5ac51 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:15:40 +0900 Subject: [PATCH 10/36] 2 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 14d705b..16092cd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { stage('Deploy') { steps { bat ''' - netstat -ano | find "8080" > nul + netstat -ano | find "8005" > nul if errorlevel 1 ( echo "Tomcat is not running, skipping shutdown..." From 3d8144eb0f889ab56d36f8b25cb357a3d5137817 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:17:58 +0900 Subject: [PATCH 11/36] 4 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 16092cd..ee6099d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,11 +22,11 @@ pipeline { echo "Tomcat is running, shutting down..." cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin call shutdown.bat - timeout /t 5 /nobreak + ping -n 5 127.0.0.1 > nul ) copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war - timeout /t 5 /nobreak + ping -n 5 127.0.0.1 > nul cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin call startup.bat From ae994d677885e26e1b26e80bc5fc58f073b408b1 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:19:39 +0900 Subject: [PATCH 12/36] 5 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee6099d..7abcc8b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,7 @@ pipeline { ping -n 5 127.0.0.1 > nul ) - copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war + copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps ping -n 5 127.0.0.1 > nul cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin From 1ffa52b7269d9b970553b8910bd9dbbef317e4a7 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:47:56 +0900 Subject: [PATCH 13/36] 7 --- Jenkinsfile | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7abcc8b..37b16d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,21 +13,27 @@ pipeline { stage('Deploy') { steps { - bat ''' - netstat -ano | find "8005" > nul - - if errorlevel 1 ( - echo "Tomcat is not running, skipping shutdown..." - ) else ( - echo "Tomcat is running, shutting down..." - cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call shutdown.bat - ping -n 5 127.0.0.1 > nul - ) - - copy /Y build\\libs\\*-plain.war C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps + bat ''' + netstat -ano | find "8005" > nul + + if errorlevel 1 ( + echo "Tomcat is not running, skipping shutdown..." + ) else ( + echo "Tomcat is running, shutting down..." + cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin + call shutdown.bat + ping -n 5 127.0.0.1 > nul + ) + + echo "del" + del /F /Q C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\*.war + ping -n 3 127.0.0.1 > nul + + echo "copy" + copy /Y /B "build\\libs\\*-plain.war" "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war" ping -n 5 127.0.0.1 > nul + echo "start" cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin call startup.bat ''' From 7e8f19d13687414aa41431e8665975a8519b3ff4 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 14:54:23 +0900 Subject: [PATCH 14/36] 8 --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 37b16d9..6a33223 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,8 +34,7 @@ pipeline { ping -n 5 127.0.0.1 > nul echo "start" - cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call startup.bat + start /B cmd /c "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin\\startup.bat" ''' } } From 873910358ce2497dd9a09849ae03072eca7d7b88 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Fri, 21 Feb 2025 16:21:03 +0900 Subject: [PATCH 15/36] =?UTF-8?q?=ED=9C=B4=EA=B0=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/VacationController.java | 77 +++++++++++++------ .../controller/common/UserController.java | 45 +++++------ .../localhost/mapper/commoncodMapper.java | 2 + .../localhost/mapper/localvacaMapper.java | 12 ++- .../localhost/service/commoncodService.java | 8 ++ .../localhost/service/localvacaService.java | 31 +++----- src/main/resources/mapper/commoncodMapper.xml | 7 ++ src/main/resources/mapper/localvacaMapper.xml | 17 ++-- 8 files changed, 114 insertions(+), 85 deletions(-) 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 041cf3f..f0d9c3a 100644 --- a/src/main/java/io/company/localhost/controller/api/VacationController.java +++ b/src/main/java/io/company/localhost/controller/api/VacationController.java @@ -29,11 +29,17 @@ import lombok.extern.slf4j.Slf4j; public class VacationController { private final localvacaService localVacaService; + private final commoncodService commonCodService; + /** + * 휴가 선물하기 + * @ReqMap map 요청 파라미터 (LOCVACTYP, LOCVACRDT, LOCVACUDT, LOCVACRMM, MEMBERSEQ) + * @return 결과 메시지 + */ @Member @ParameterCheck @PostMapping - public ApiResponse saveVacations(@RequestBody List list) { + public ApiResponse insertVacations(@RequestBody List list) { Long user = AuthUtil.getUser().getId(); for (MapDto request : list) { String date = request.getString("date"); @@ -45,7 +51,6 @@ public class VacationController { throw new IllegalArgumentException("요청 데이터에 누락된 값이 있습니다: " + request); } - // count 필드가 있으면, 해당 값만큼 반복해서 insert Integer count = request.getInt("count"); if (count == null || count < 1) { count = 1; @@ -56,11 +61,16 @@ public class VacationController { } return ApiResponse.ok("모든 휴가가 성공적으로 저장되었습니다."); } - + + /** + * 휴가 저장/수정 + * @ReqMap map 요청 파라미터 (LOCVACTYP, LOCVACRDT, LOCVACUDT, MEMBERSEQ / LOCVACSEQ) + * @return 결과 메시지 + */ @Member @ParameterCheck @PostMapping("/batchUpdate") - public ApiResponse batchUpdateVacations(@ReqMap MapDto map) { + public ApiResponse saveVacations(@ReqMap MapDto map) { Long user = AuthUtil.getUser().getId(); List addRequests = map.getList("add", MapDto.class); List deleteIds = map.getList("delete", Long.class); @@ -80,56 +90,73 @@ public class VacationController { } /** - * 특정 연월에 대한 휴가 데이터 조회 + * 전체 사원의 휴가 조회 + * @param year, month + * @return 휴가 데이터 목록 */ @Member @ParameterCheck @GetMapping("/list/{year}/{month}") - public List getVacations(@PathVariable("year") int year, @PathVariable("month") int month) { - return localVacaService.getVacationList(year, month); + public List selectVacations(@PathVariable("year") int year, @PathVariable("month") int month) { + return localVacaService.selectVacationList(year, month); } /** - * 특정 연월에 대한 공휴일 데이터 조회 + * 공휴일 정보 조회 + * @param year, month + * @return 공휴일 데이터 목록 */ @Member @ParameterCheck @GetMapping("/{year}/{month}") - public List getHolidays(@PathVariable("year") int year, @PathVariable("month") int month) { - return localVacaService.getHolidays(year, month); + public List selectHolidays(@PathVariable("year") int year, @PathVariable("month") int month) { + return localVacaService.selectHolidays(year, month); } /** - * 내 연차 사용 내역 조회 + * 로그인한 회원의 연차 사용 내역 조회 */ @Member @ParameterCheck @GetMapping("/history") - public ApiResponse>> getUserVacationHistory() { + public ApiResponse>> selectUserVacationHistory() { Long userId = AuthUtil.getUser().getId(); - return ApiResponse.ok(localVacaService.getUserVacationHistory(userId)); + return ApiResponse.ok(localVacaService.selectUserVacationHistory(userId)); } - + /** + * 사원별 남은 연차 개수 조회 + */ + @Member + @ParameterCheck @GetMapping("/remaining") - public ApiResponse> getRemainingVacation() { - List employeeVacations = localVacaService.getEmployeeRemainingVacation(); + public ApiResponse> selectRemainingVacation() { + List employeeVacations = localVacaService.selectEmployeeRemainingVacation(); return ApiResponse.ok(employeeVacations); } + /** + * 휴가 종류 조회(공통코드) + */ + @Member + @ParameterCheck @GetMapping("/codes") - public ApiResponse> getVacationCodeNames() { - return ApiResponse.ok(localVacaService.getCommonCodeList()); + public ApiResponse> selectVacationType() { + return ApiResponse.ok(commonCodService.selectVacationType()); } + /** + * 사원 별 남은 보내기개수 + * @ReqMap map 요청 파라미터 (LOCVACRMM, MEMBERSEQ) + * @return 남은 선물보내기 개수 + */ + @Member + @ParameterCheck @GetMapping("/sent") - public ApiResponse> getSentVacations(@ReqMap MapDto map) { - Long userId = AuthUtil.getUser().getId(); // 현재 로그인한 사용자 ID - map.put("userId", userId); - List sentCount = localVacaService.getSentVacationCount(map); - - - return ApiResponse.ok(sentCount); + public ApiResponse> selectSentVacationCount(@ReqMap MapDto map) { + Long userId = AuthUtil.getUser().getId(); + map.put("userId", userId); + return ApiResponse.ok(localVacaService.selectSentVacationCount(map)); } } diff --git a/src/main/java/io/company/localhost/controller/common/UserController.java b/src/main/java/io/company/localhost/controller/common/UserController.java index 5dd9790..4a53dc2 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -15,6 +15,27 @@ *************************************************************/ package io.company.localhost.controller.common; +import static org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.springframework.security.authentication.RememberMeAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.security.core.context.SecurityContext; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.context.SecurityContextHolderStrategy; +import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + import io.company.localhost.common.annotation.Admin; import io.company.localhost.common.annotation.Guest; import io.company.localhost.common.annotation.Member; @@ -33,26 +54,6 @@ import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.security.authentication.RememberMeAuthenticationToken; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.annotation.AuthenticationPrincipal; -import org.springframework.security.core.context.SecurityContext; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.context.SecurityContextHolderStrategy; -import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PatchMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import org.springframework.web.multipart.MultipartFile; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import static org.springframework.security.web.authentication.rememberme.AbstractRememberMeServices.SPRING_SECURITY_REMEMBER_ME_COOKIE_KEY; @Slf4j @RestController @@ -71,7 +72,7 @@ public class UserController { */ @ParameterCheck @GetMapping("/color") - public ApiResponse> selectColorList(String type) { + public ApiResponse> selectColorList(@RequestParam("type") String type) { List ColorList = commoncodservice.selectColorList(type); return ApiResponse.ok(ColorList); } @@ -123,7 +124,7 @@ public class UserController { * */ @GetMapping("/checkId") - public ApiResponse selectCheckId(@RequestParam String memberIds) { + public ApiResponse selectCheckId(@RequestParam("memberIds") String memberIds) { boolean isDuplicate = netmemberservice.selectCheckId(memberIds); return ApiResponse.ok(!isDuplicate); } diff --git a/src/main/java/io/company/localhost/mapper/commoncodMapper.java b/src/main/java/io/company/localhost/mapper/commoncodMapper.java index 00184da..8ba1e94 100644 --- a/src/main/java/io/company/localhost/mapper/commoncodMapper.java +++ b/src/main/java/io/company/localhost/mapper/commoncodMapper.java @@ -42,4 +42,6 @@ public interface commoncodMapper { List selectCategories(); Long selectcheckCategoryExists(MapDto map); + + List selectVacationType(); } diff --git a/src/main/java/io/company/localhost/mapper/localvacaMapper.java b/src/main/java/io/company/localhost/mapper/localvacaMapper.java index 00b8fb1..f18e4e5 100644 --- a/src/main/java/io/company/localhost/mapper/localvacaMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvacaMapper.java @@ -14,17 +14,15 @@ public interface localvacaMapper { void deleteVacation(Long vacationId); - List findVacations(@Param("year") int year, @Param("month") int month); + List selectVacations(@Param("year") int year, @Param("month") int month); - List getUsedVacations(@Param("userId") Long userId); + List selectUsedVacations(@Param("userId") Long userId); - List getReceivedVacations(@Param("userId") Long userId); + List selectReceivedVacations(@Param("userId") Long userId); - List getEmployeeRemainingVacation(); + List selectEmployeeRemainingVacation(); - List getCommonCodeNames(); - - List countSentVacations(MapDto map); + List selectSentVacationCount(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 06711ab..c09f81e 100644 --- a/src/main/java/io/company/localhost/service/commoncodService.java +++ b/src/main/java/io/company/localhost/service/commoncodService.java @@ -14,6 +14,7 @@ *************************************************************/ package io.company.localhost.service; +import java.util.ArrayList; import java.util.List; import org.springframework.stereotype.Service; @@ -60,4 +61,11 @@ public class commoncodService { public List selectCategoryList() { return commoncodmapper.selectCategories(); } + + public List selectVacationType() { + List codeList = commoncodmapper.selectVacationType(); + + // 데이터가 비어있으면 빈 리스트 반환 (null 방지) + return (codeList != null) ? codeList : new ArrayList<>(); + } } diff --git a/src/main/java/io/company/localhost/service/localvacaService.java b/src/main/java/io/company/localhost/service/localvacaService.java index bdc2350..a744c71 100644 --- a/src/main/java/io/company/localhost/service/localvacaService.java +++ b/src/main/java/io/company/localhost/service/localvacaService.java @@ -43,14 +43,14 @@ public class localvacaService { localvacaMapper.deleteVacation(vacationId); } - public List getVacationList(int year, int month) { - return localvacaMapper.findVacations(year, month); + public List selectVacationList(int year, int month) { + return localvacaMapper.selectVacations(year, month); } /** * 🔹 특정 연월에 대한 공휴일 데이터 조회 */ - public List getHolidays(int year, int month) { + public List selectHolidays(int year, int month) { // ✅ ServiceKey를 디코딩해서 사용 String decodedServiceKey = URLDecoder.decode(serviceKey, StandardCharsets.UTF_8); System.out.println("📌 디코딩된 ServiceKey: " + decodedServiceKey); @@ -158,9 +158,9 @@ public class localvacaService { /** * 내 연차 사용 내역 조회 (사용한 연차 & 받은 연차) */ - public Map> getUserVacationHistory(Long userId) { - List usedVacations = localvacaMapper.getUsedVacations(userId); - List receivedVacations = localvacaMapper.getReceivedVacations(userId); + public Map> selectUserVacationHistory(Long userId) { + List usedVacations = localvacaMapper.selectUsedVacations(userId); + List receivedVacations = localvacaMapper.selectReceivedVacations(userId); Map> history = new HashMap<>(); history.put("usedVacations", usedVacations); @@ -172,8 +172,8 @@ public class localvacaService { /** * 사원별 남은 연차 개수 조회 */ - public List getEmployeeRemainingVacation() { - List employeeVacations = localvacaMapper.getEmployeeRemainingVacation(); + public List selectEmployeeRemainingVacation() { + List employeeVacations = localvacaMapper.selectEmployeeRemainingVacation(); return employeeVacations.stream().map(emp -> { // 🔹 hireDate 변환 (포맷 정규화) @@ -191,7 +191,7 @@ public class localvacaService { } // 🔹 총 연차 개수 계산 - int totalVacation = calculateTotalVacation(hireDate); + int totalVacation = procCalculateTotalVacation(hireDate); // 🔹 사용한 연차 개수 처리 (null 방지) double usedVacation = emp.get("used_quota") != null ? ((Number) emp.get("used_quota")).doubleValue() : 0.0; @@ -215,7 +215,7 @@ public class localvacaService { /** * 총 연차 계산 로직 */ - private int calculateTotalVacation(LocalDate hireDate) { + private int procCalculateTotalVacation(LocalDate hireDate) { LocalDate today = LocalDate.now(); int yearsWorked = hireDate.until(today).getYears(); @@ -237,14 +237,7 @@ public class localvacaService { return totalVacation; } - public List getCommonCodeList() { - List codeList = localvacaMapper.getCommonCodeNames(); - - // 데이터가 비어있으면 빈 리스트 반환 (null 방지) - return (codeList != null) ? codeList : new ArrayList<>(); - } - - public List getSentVacationCount(MapDto map) { - return localvacaMapper.countSentVacations(map); + public List selectSentVacationCount(MapDto map) { + return localvacaMapper.selectSentVacationCount(map); } } diff --git a/src/main/resources/mapper/commoncodMapper.xml b/src/main/resources/mapper/commoncodMapper.xml index 2b11e3f..a020953 100644 --- a/src/main/resources/mapper/commoncodMapper.xml +++ b/src/main/resources/mapper/commoncodMapper.xml @@ -120,4 +120,11 @@ where CMNCODNAM = #{CMNCODNAM} + + + diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml index 88a948d..c6f0151 100644 --- a/src/main/resources/mapper/localvacaMapper.xml +++ b/src/main/resources/mapper/localvacaMapper.xml @@ -15,14 +15,14 @@ - SELECT LOCVACSEQ, MEMBERSEQ, LOCVACUDT, LOCVACTYP, LOCVACRMM FROM localvaca WHERE DATE_FORMAT(LOCVACUDT, '%Y-%m') = CONCAT(#{year}, '-', LPAD(#{month}, 2, '0')) - SELECT LOCVACUDT AS date, LOCVACTYP AS type, LOCVACRMM AS receiverId, -- 반차(700101, 700102)는 0.5, 연차(700103)는 1로 계산 SUM(CASE @@ -38,7 +38,7 @@ - SELECT LOCVACUDT AS date, LOCVACTYP AS type, MEMBERSEQ AS senderId FROM localvaca WHERE LOCVACRMM = #{userId} @@ -49,7 +49,7 @@ - - - - - SELECT COUNT(*) as count FROM localvaca WHERE MEMBERSEQ = #{userId} AND LOCVACRMM = #{receiverId} From dcb323cb40729b7adc35d8fbcfb8c0846d820d1c Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Fri, 21 Feb 2025 23:53:55 +0900 Subject: [PATCH 16/36] 9 --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a33223..0425f4e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,6 +14,7 @@ pipeline { stage('Deploy') { steps { bat ''' + echo "checking Tomcat is running" netstat -ano | find "8005" > nul if errorlevel 1 ( @@ -22,7 +23,7 @@ pipeline { echo "Tomcat is running, shutting down..." cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin call shutdown.bat - ping -n 5 127.0.0.1 > nul + ping -n 5 127.0.0.1 > nul ) echo "del" @@ -34,7 +35,8 @@ pipeline { ping -n 5 127.0.0.1 > nul echo "start" - start /B cmd /c "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin\\startup.bat" + cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin + call startup.bat ''' } } From 4a2e60c87678fd58a45f7da24f3df38ab44b46e0 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:05:01 +0900 Subject: [PATCH 17/36] 11 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0425f4e..a74cd8d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { echo "start" cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call startup.bat + catalina.bat run ''' } } From 3644023c0bff5a4bdfa58e425a306a0189d1cef2 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:06:46 +0900 Subject: [PATCH 18/36] 13 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a74cd8d..9cd63c8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { echo "start" cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - catalina.bat run + start catalina.bat run ''' } } From 7c84ae6d9f525dead5d3a0cf3947ccd9d2f7137f Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:17:31 +0900 Subject: [PATCH 19/36] 14 --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9cd63c8..c1dc609 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,8 +35,7 @@ pipeline { ping -n 5 127.0.0.1 > nul echo "start" - cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - start catalina.bat run + cmd /c start "Tomcat Console" C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin\\catalina.bat run ''' } } From fa9d085946f15a834cadfda7558b759da3cf5f1f Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:20:44 +0900 Subject: [PATCH 20/36] 15 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c1dc609..08400dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,7 @@ pipeline { ping -n 5 127.0.0.1 > nul echo "start" - cmd /c start "Tomcat Console" C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin\\catalina.bat run + start cmd.exe /k "cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin && catalina.bat run" ''' } } From eec0152edca8c05b821f861ea625bbc1c50548fc Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:32:22 +0900 Subject: [PATCH 21/36] 17 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08400dd..3f999d5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { gradle 'gradle8' } - stages { + stages { stage('Clean & Build') { steps { bat './gradlew clean build -x test' @@ -31,7 +31,7 @@ pipeline { ping -n 3 127.0.0.1 > nul echo "copy" - copy /Y /B "build\\libs\\*-plain.war" "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war" + copy /Y /B "%WORKSPACE%\\build\\libs\\*-plain.war" "C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\webapps\\ROOT.war" ping -n 5 127.0.0.1 > nul echo "start" From 04a1d8e320e2d1f2bab6f74e3798046108bbc9e2 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:38:03 +0900 Subject: [PATCH 22/36] 77 --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f999d5..ef18a61 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,7 +35,8 @@ pipeline { ping -n 5 127.0.0.1 > nul echo "start" - start cmd.exe /k "cd C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin && catalina.bat run" + cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin + start "Tomcat" /min cmd /c "catalina.bat run" ''' } } From 7045bfa2700d09dc8cc63417f50b3b9d2849d779 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:42:08 +0900 Subject: [PATCH 23/36] 81 --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index ef18a61..2e0022e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,6 +37,7 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin start "Tomcat" /min cmd /c "catalina.bat run" + timeout /t 30 ''' } } From e8a0350ac8cffbb1a63b27867747f81adb767d4b Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:43:53 +0900 Subject: [PATCH 24/36] 99 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e0022e..412d1a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,7 +37,7 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin start "Tomcat" /min cmd /c "catalina.bat run" - timeout /t 30 + ping -n 10 127.0.0.1 > nul ''' } } From dd16a29f7752af2a2dc10a6c8a14eb3fa343e23d Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:47:15 +0900 Subject: [PATCH 25/36] 0 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 412d1a9..1c30e0a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - start "Tomcat" /min cmd /c "catalina.bat run" + start catalina.bat run ping -n 10 127.0.0.1 > nul ''' } From ff1f585e45061685aad06e06c43b7fdde5676713 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Sat, 22 Feb 2025 00:49:26 +0900 Subject: [PATCH 26/36] 1 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1c30e0a..2c617b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - start catalina.bat run + call startup.bat ping -n 10 127.0.0.1 > nul ''' } From 4b5e28684a92042870483a9fbafecb0575bf5d27 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Mon, 24 Feb 2025 09:23:44 +0900 Subject: [PATCH 27/36] =?UTF-8?q?=EC=A0=A0=ED=82=A8=EC=8A=A4=20=EB=B0=B0?= =?UTF-8?q?=ED=8F=AC=20=ED=8C=8C=EC=9D=B4=ED=94=84=EB=9D=BC=EC=9D=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2c617b0..966e608 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,8 +36,8 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - call startup.bat - ping -n 10 127.0.0.1 > nul + BUILD_ID=dontKillMe call startup.bat + ping -n 5 127.0.0.1 > nul ''' } } From 5832d18885562d0338fa05fed9983426815c6639 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Mon, 24 Feb 2025 09:27:18 +0900 Subject: [PATCH 28/36] =?UTF-8?q?=ED=8C=8C=EC=9D=B4=ED=94=84=EB=9D=BC?= =?UTF-8?q?=EC=9D=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 966e608..dc74b38 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,8 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - BUILD_ID=dontKillMe call startup.bat + set BUILD_ID=dontKillMe + call startup.bat ping -n 5 127.0.0.1 > nul ''' } From ae1332d7a6b4d81bee169577015418382af64bdf Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Mon, 24 Feb 2025 09:45:48 +0900 Subject: [PATCH 29/36] . --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dc74b38..a5891cf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,9 +36,8 @@ pipeline { echo "start" cd /d C:\\localhost-tomcat\\apache-tomcat-10.1.36-windows-x64\\apache-tomcat-10.1.36\\bin - set BUILD_ID=dontKillMe - call startup.bat - ping -n 5 127.0.0.1 > nul + call startup.bat + ping -n 5 127.0.0.1 > nul ''' } } From 87f425bed2ca3f4194047f66f98b71a822ea3ee0 Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Mon, 24 Feb 2025 09:59:28 +0900 Subject: [PATCH 30/36] =?UTF-8?q?=EC=9E=84=EC=8B=9C=20https=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 4 ++++ src/main/resources/localhost.p12 | Bin 0 -> 2934 bytes 2 files changed, 4 insertions(+) create mode 100644 src/main/resources/localhost.p12 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 92e1fa3..511932e 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -81,6 +81,10 @@ server: http-only: false secure: true same-site: NONE + ssl: + key-store: classpath:localhost.p12 + key-store-password: pmgk1234 + key-store-type: PKCS12 logging: level: diff --git a/src/main/resources/localhost.p12 b/src/main/resources/localhost.p12 new file mode 100644 index 0000000000000000000000000000000000000000..800656159df6a5d9a24a99d4f9cdd344daa089f5 GIT binary patch literal 2934 zcmai$X*3iJ7sqGD3}eeW$Ue$8mc}|g)`+oZXHeD{6d|(j`!<#oN=k*vk{R1bvQzfR zR@O3EMxhC1e?8}YPknqp+;i{!|L-~X+%La#k#URxARrAgj!}Y^9+9M<^otot2YeF8 zcorPT2s@S8kZ};#zZUJ2IEdw`WC{WTPLuv$2Z*%&(?FP!hDgc3EfbO-3{{21h(x@& z>^U2&m#W^i!R zX?`%<93g#DGyqx{s+>$@Nc%+<%@WDV)HuE&w4M6M*~Bl0+^c>IT1M0KXoMH^QdYry z@?j89N2iK1*Ud;+`7j=%f~7~$^p`ZP=W}#xjm#7l1=P!>RKo3`fX@xiNnv6p_+l2R z^6;zZ;4@9KPl(%;^I%GZMQ!u($(kp3k2gk5|;19@g>O8+AvM_b9E zq`3IF*+H&LU0&o!=Lhws+-$|-RC9{r!hFiaAYwl{V^q=D)M+zoeNnD`X?!>`uu-Af zRtNc8!NjNs0f%CQIpM2jnl?W7uj7ZK+Le;Ebweyl2%Vo)A7@S_2_%UrvcGBE*9%iS zQiUy$!I#c*3`0esMv2eOOI6r67#BG}nH_!!Bdjv@6@g0jsYD=0qm*k}wC7zT4bt~F zE?oP=Rzfc~?9VT?)G*)KNPrbZ4Y-??;V2ITq6)f9xwh*QULTxu>AhgOFs_b3%n|@97UH2H(wr9BmzsCzw@ZoESWhoYiViEy5kdSB* z$U%enIP$J;T}gt^2~Wu}$K^}4#gpUsmAb0t<|R>dqH~A>!{hs%q<+N^SGD=Qc=3?R zZTdtd-KI_gtD=3S|HwScp$_DQma5gmn8ZO_eqy52NW@XolAJk!S{oV9$2SDXD2Dftn?)YVKfMCIu z>4T5EhufPvVzD=VO0cfOxz)}$ai64~cu=_o{lcb4AOCQjf1I)V)V$*m+dPoecN;0J zvHq?3${}q%YD)uunQ&yZ-}IuY@g`S=)wXPKK&g9bDev{jN8d1?iWKQXm%@1Y7^HNA zg1PPGxL>%0gJy|lS!uEkB6XddjrB1ml~PL=j`qp&xZiU(!yT@X%0O-h2LFs@Ik&I5 zMam^35K$Kx5_x|@PC|b>-BT<6WD*gn$w84w9#iKnLta`hy8U4$)jW*4qhrUKb)?18 zDIS}(@iBhYalSs?KBIoCSG>C<`zhTOUwW8 z@?QW$3czuYyi+;*G%{!z|Hoz~1|aCvlsgq={vU9aJ%wjqzhM>szrgLT3196l>gSWm zCDj>MRm_6p!0#Ov9(d>C%o-$|RxC2k(dfSPO@^l!PHC=8jB@fy^Hsxxg1oJTjq0S& z7)P`4q|S~Cmo7@I1%pcR@OiGvTJ!51}U ze*OZFtT%HtJ0E~h?A}{(3*>U8*QAZA@Q#PVWm+QvxB4pg;5n_neJyW$oNY!d(I1@6 zvf}g|+vWFp*_!Eo3XPC=WDuV_SPWG-s~}8n7~}wT^TuJtmh2@fkzkM>?u)Dgw<+Ly zAD;T{>B9A%cnrAjcsAZ5wc!PulF3=5HjBUbz&4Gl!F?|WKYps+#zWL>c}?hq?So%w zBwWtOLVdvj`vmgyh?U45GfxD-_N}1J{1GQj?QW~9Y?vCH8M&2}>;+|JYE69u9S{Eu zp;9TBs40HfZ0WhV)ayMC`A;#s;f`mI-POOGNl#YsLiea=wDAM_lk6V&Y@Zllm!Uh! zVZ($-YQk|P=wPRvZUDZ?ZX=YShn2KWu$yNTODKUAZ>BA#0{VUsTfRE;V9|nEWT#!( zN+0Z9mCG_X2mdXsmp!U;`O&nz0nUIwpsd_HJ5mJJ7^7SUdzB+>GUZUy>?%1h%^|lj z^Xme=0cm2ga%|E?5}gFd^yh>Lgupp8v zJ*DUTqqk)q6?3P**Q;5oC$gg`L0yBxLZBshg%G8QY#)1X+$o?pq~OaHhV!a2dT#;N z#ACr%rJOkHNr{Ir0>3J{AP?QmKZ_fBC4C0Q*|8!zq3qCIexph14z;Ji&uP>qlhTo! za>LjWw#(i+>PtAE>Ft75u&lVu@xJZdIh}t@Whb_|ouXCSl?ytLVs}wEM2v5>$n()} zWi|NWuaCmS24KOxfH`D+CN4&2o+Hw_fQtdXsBhU# z{@iG+$$#yln_U&kdm`U5_2T#^RU+#V6g{MvZ!+VguVT8z2p zR(faKLRvcQzRh5D3tt#l)FN+RA9JS3a|cNPa(zo8e-?6C*^YG3aZTTe9Vhr0er1)} zyB#rIOY5SxQIglmOX;z-KY?y^!gMdC^h^FaRHz>8ceBR4 zq~>U6lv=KP7!l^WFx={e;% z1=#^N0k;5d0GHG3d0O2D1R~G<9f8SlfjJ916S$Qo!U@+VAN)8xX*;7lNgPCKA?1+F ze?C?a5CQ-T7vl=&JhVBtt*+)`-t`KU3RQ2>gsh@Sq9nE|v8HiuFqFNI%m+>|y7(`R F{{!2*RO Date: Mon, 24 Feb 2025 11:07:24 +0900 Subject: [PATCH 31/36] . --- .../localhost/controller/api/VacationController.java | 5 +++-- .../java/io/company/localhost/mapper/localvacaMapper.java | 4 ++-- .../java/io/company/localhost/service/localvacaService.java | 6 +++--- src/main/resources/mapper/localbordMapper.xml | 1 + src/main/resources/mapper/localvacaMapper.xml | 2 ++ 5 files changed, 11 insertions(+), 7 deletions(-) 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 f0d9c3a..6817454 100644 --- a/src/main/java/io/company/localhost/controller/api/VacationController.java +++ b/src/main/java/io/company/localhost/controller/api/VacationController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import io.company.localhost.common.annotation.Member; @@ -119,9 +120,9 @@ public class VacationController { @Member @ParameterCheck @GetMapping("/history") - public ApiResponse>> selectUserVacationHistory() { + public ApiResponse>> selectUserVacationHistory(@RequestParam("year") int year) { Long userId = AuthUtil.getUser().getId(); - return ApiResponse.ok(localVacaService.selectUserVacationHistory(userId)); + return ApiResponse.ok(localVacaService.selectUserVacationHistory(userId, year)); } /** diff --git a/src/main/java/io/company/localhost/mapper/localvacaMapper.java b/src/main/java/io/company/localhost/mapper/localvacaMapper.java index f18e4e5..f6488c7 100644 --- a/src/main/java/io/company/localhost/mapper/localvacaMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvacaMapper.java @@ -16,9 +16,9 @@ public interface localvacaMapper { List selectVacations(@Param("year") int year, @Param("month") int month); - List selectUsedVacations(@Param("userId") Long userId); + List selectUsedVacations(@Param("userId") Long userId, @Param("year") int year); - List selectReceivedVacations(@Param("userId") Long userId); + List selectReceivedVacations(@Param("userId") Long userId, @Param("year") int year); List selectEmployeeRemainingVacation(); diff --git a/src/main/java/io/company/localhost/service/localvacaService.java b/src/main/java/io/company/localhost/service/localvacaService.java index a744c71..05c7a48 100644 --- a/src/main/java/io/company/localhost/service/localvacaService.java +++ b/src/main/java/io/company/localhost/service/localvacaService.java @@ -158,9 +158,9 @@ public class localvacaService { /** * 내 연차 사용 내역 조회 (사용한 연차 & 받은 연차) */ - public Map> selectUserVacationHistory(Long userId) { - List usedVacations = localvacaMapper.selectUsedVacations(userId); - List receivedVacations = localvacaMapper.selectReceivedVacations(userId); + public Map> selectUserVacationHistory(Long userId, int year) { + List usedVacations = localvacaMapper.selectUsedVacations(userId,year); + List receivedVacations = localvacaMapper.selectReceivedVacations(userId,year); Map> history = new HashMap<>(); history.put("usedVacations", usedVacations); diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml index 2bc1946..c61081b 100644 --- a/src/main/resources/mapper/localbordMapper.xml +++ b/src/main/resources/mapper/localbordMapper.xml @@ -75,6 +75,7 @@ b.LOCBRDTYP AS type, b.LOCBRDCNT AS cnt, m.MEMBERNAM AS author + m.MEMBERSEQ AS authorId FROM localbord b LEFT JOIN netmember m ON b.MEMBERSEQ = m.MEMBERSEQ WHERE b.LOCBRDSEQ = #{boardId} diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml index c6f0151..925e97e 100644 --- a/src/main/resources/mapper/localvacaMapper.xml +++ b/src/main/resources/mapper/localvacaMapper.xml @@ -32,6 +32,7 @@ END) AS used_quota FROM localvaca WHERE MEMBERSEQ = #{userId} + AND YEAR(LOCVACUDT) = #{year} AND DATE_FORMAT(LOCVACUDT, '%Y') = DATE_FORMAT(CURDATE(), '%Y') GROUP BY LOCVACUDT, LOCVACTYP, LOCVACRMM ORDER BY LOCVACUDT DESC @@ -42,6 +43,7 @@ SELECT LOCVACUDT AS date, LOCVACTYP AS type, MEMBERSEQ AS senderId FROM localvaca WHERE LOCVACRMM = #{userId} + AND YEAR(LOCVACUDT) = #{year} AND DATE_FORMAT(LOCVACUDT, '%Y') = DATE_FORMAT(CURDATE(), '%Y') GROUP BY LOCVACUDT, LOCVACTYP, MEMBERSEQ ORDER BY LOCVACUDT DESC From d09d3139586b2b6fb2933709139d852f540c124b Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Mon, 24 Feb 2025 11:09:51 +0900 Subject: [PATCH 32/36] s --- src/main/resources/mapper/localbordMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml index c61081b..128c812 100644 --- a/src/main/resources/mapper/localbordMapper.xml +++ b/src/main/resources/mapper/localbordMapper.xml @@ -74,7 +74,7 @@ b.LOCBRDUDT AS date, b.LOCBRDTYP AS type, b.LOCBRDCNT AS cnt, - m.MEMBERNAM AS author + m.MEMBERNAM AS author, m.MEMBERSEQ AS authorId FROM localbord b LEFT JOIN netmember m ON b.MEMBERSEQ = m.MEMBERSEQ From 51142afa614073989fd44e8364ddb149288e2964 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Mon, 24 Feb 2025 13:09:20 +0900 Subject: [PATCH 33/36] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=EB=AC=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/mapper/localbordMapper.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml index 128c812..04f1409 100644 --- a/src/main/resources/mapper/localbordMapper.xml +++ b/src/main/resources/mapper/localbordMapper.xml @@ -138,7 +138,8 @@ SELECT c.LOCCMTSEQ,c.LOCBRDSEQ,c.LOCCMTPNT,c.LOCCMTRPY, c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT,c.LOCCMTPNT, - m.MEMBERNAM AS author + m.MEMBERNAM AS author, + m.MEMBERSEQ AS authorId FROM localcomt c LEFT JOIN netmember m ON c.MEMBERSEQ = m.MEMBERSEQ WHERE LOCBRDSEQ = #{LOCBRDSEQ} and LOCCMTPNT = 1 @@ -150,7 +151,8 @@ SELECT c.LOCCMTSEQ,c.LOCBRDSEQ,c.LOCCMTPNT,c.LOCCMTRPY, c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT,c.LOCCMTPNT, - m.MEMBERNAM AS author + m.MEMBERNAM AS author, + m.MEMBERSEQ AS authorId FROM localcomt c LEFT JOIN netmember m ON c.MEMBERSEQ = m.MEMBERSEQ WHERE LOCCMTPNT = #{LOCCMTPNT} and LOCCMTPNT != 1 From e9e6431d7764e042c64f1de8064a4dd00336da6c Mon Sep 17 00:00:00 2001 From: nevermoregb Date: Mon, 24 Feb 2025 13:24:31 +0900 Subject: [PATCH 34/36] =?UTF-8?q?=EC=BF=A0=ED=82=A4=20partitioned:=20true?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 511932e..7060bfc 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -81,6 +81,7 @@ server: http-only: false secure: true same-site: NONE + partitioned: true ssl: key-store: classpath:localhost.p12 key-store-password: pmgk1234 From 972c18d1cbe2e594155b73c0cc5e469e606238cd Mon Sep 17 00:00:00 2001 From: khj0414 Date: Mon, 24 Feb 2025 13:34:59 +0900 Subject: [PATCH 35/36] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/VoteBoardController.java | 16 ++++++-- .../controller/api/worddictController.java | 20 +--------- .../localhost/mapper/VotDetailMapper.java | 2 +- .../localhost/mapper/VotMemberMapper.java | 2 +- .../localhost/mapper/VotRecordMapper.java | 2 +- .../localhost/mapper/VotchoiceMapper.java | 4 ++ .../localhost/mapper/localvoteMapper.java | 4 +- .../localhost/service/commoncodService.java | 10 +---- .../localhost/service/localvoteService.java | 38 +++++++++++++++---- .../localhost/service/worddictyService.java | 7 ++++ src/main/resources/mapper/VotDetailMapper.xml | 2 +- src/main/resources/mapper/VotMemberMapper.xml | 2 +- src/main/resources/mapper/VotRecordMapper.xml | 2 +- src/main/resources/mapper/VotchoiceMapper.xml | 19 +++++++++- src/main/resources/mapper/localvoteMapper.xml | 9 ++++- 15 files changed, 92 insertions(+), 47 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/VoteBoardController.java b/src/main/java/io/company/localhost/controller/api/VoteBoardController.java index f33a200..3aa110c 100644 --- a/src/main/java/io/company/localhost/controller/api/VoteBoardController.java +++ b/src/main/java/io/company/localhost/controller/api/VoteBoardController.java @@ -36,12 +36,12 @@ public class VoteBoardController { @Member @ParameterCheck @GetMapping("getVoteList") - public ApiResponse> getVoteList(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { + public ApiResponse> selectVoteList(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { //userId Long userId = AuthUtil.getUser().getId(); map.put("userId", userId); - PageInfo VoteList = localvoteservice.getVoteList(map); + PageInfo VoteList = localvoteservice.selectVoteList(map); return ApiResponse.ok(VoteList); @@ -90,6 +90,16 @@ public class VoteBoardController { map.put("userId", userId); return ApiResponse.ok(localvoteservice.updateEndData(map)); } - + /** + * 투표 랜덤뽑기 + * @param randomList 랜덤리스트 ,voteid 투표 번호 + * @return + */ + @Member + @PostMapping("randomList") + public ApiResponse randomList(@ReqMap MapDto map) { + return ApiResponse.ok(localvoteservice.updateRandomResult(map)); + } + } diff --git a/src/main/java/io/company/localhost/controller/api/worddictController.java b/src/main/java/io/company/localhost/controller/api/worddictController.java index 606710d..3748e29 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -88,29 +88,13 @@ public class worddictController { return ApiResponse.ok( worddictyservice.getWordDetail(map)); } /** - * 용어집 카테고리 등록 - * @param CMNCODNAM 용어집 등록 카테고리 이름 - * @return - */ - @Member - @ParameterCheck - @PostMapping("insertCategory") - public ApiResponse insertCategory(@ReqMap MapDto map) { - Long result = commoncodservice.insertCategory(map); - if(result == -1) { - return ApiResponse.okMessage("이미 존재하는 카테고리명입니다."); - } - return ApiResponse.ok(result); - } - /** - * 용어 등록 - * @param WRDDICCAT 카테고리 코드값 ,WRDDICTTL 용어,WRDDICCON 내용 ,WRDDICRIK 링크 + * 용어 등록 - 카테고리 등록 + * @param WRDDICCAT 카테고리 코드값 ,WRDDICTTL 용어,WRDDICCON 내용 ,WRDDICRIK 링크 ,CMNCODNAM 추가 등록 카테고리 이름 * @return */ @Member @PostMapping("insertWord") public ApiResponse insertWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) { - //userId //Long userId = AuthUtil.getUser().getId(); //임시 diff --git a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java index 6ec0e88..76b321d 100644 --- a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java @@ -11,6 +11,6 @@ public interface VotDetailMapper { Long insertdetail(MapDto map); - List getVoteDetails(int locvotSeq); + List selectVoteDetails(int locvotSeq); } diff --git a/src/main/java/io/company/localhost/mapper/VotMemberMapper.java b/src/main/java/io/company/localhost/mapper/VotMemberMapper.java index 4da7f8b..7879e48 100644 --- a/src/main/java/io/company/localhost/mapper/VotMemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotMemberMapper.java @@ -11,7 +11,7 @@ public interface VotMemberMapper { void insertmem(MapDto map); - List getVoteMember(Integer locvotSeq); + List selectVoteMember(Integer locvotSeq); diff --git a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java index a9ad991..29e28a4 100644 --- a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java @@ -7,7 +7,7 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface VotRecordMapper { - int yesVotetotal(MapDto map); + int selectYesVotetotal(MapDto map); Long insertCheckedNums(MapDto map); diff --git a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java index 9fa11b2..44ca86a 100644 --- a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java @@ -1,5 +1,7 @@ package io.company.localhost.mapper; +import java.util.List; + import org.apache.ibatis.annotations.Mapper; import io.company.localhost.common.dto.MapDto; @@ -9,4 +11,6 @@ public interface VotchoiceMapper { void insertChoice(MapDto map); + List selectVoteResult(Integer locvotSeq); + } diff --git a/src/main/java/io/company/localhost/mapper/localvoteMapper.java b/src/main/java/io/company/localhost/mapper/localvoteMapper.java index 2d93447..07e9adc 100644 --- a/src/main/java/io/company/localhost/mapper/localvoteMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvoteMapper.java @@ -13,9 +13,11 @@ public interface localvoteMapper { Long insertVote(MapDto map); - List getVoteList(MapDto map); + List selectVoteList(MapDto map); Long updateEndData(MapDto map); + Long updateRandomResult(MapDto selectedItem); + } diff --git a/src/main/java/io/company/localhost/service/commoncodService.java b/src/main/java/io/company/localhost/service/commoncodService.java index 06711ab..c0b1eb8 100644 --- a/src/main/java/io/company/localhost/service/commoncodService.java +++ b/src/main/java/io/company/localhost/service/commoncodService.java @@ -28,19 +28,11 @@ import lombok.RequiredArgsConstructor; public class commoncodService { private final commoncodMapper commoncodmapper; - + public List selectWordCategory() { return commoncodmapper.selectWordCategory(); } - public Long insertCategory(MapDto map) { - Long count = commoncodmapper.selectcheckCategoryExists(map); - if(count > 0) { - return -1L; - } - return commoncodmapper.insertCategory(map); - } - public List selectColorList(String type) { return commoncodmapper.selectColorList(type); } diff --git a/src/main/java/io/company/localhost/service/localvoteService.java b/src/main/java/io/company/localhost/service/localvoteService.java index e4ccbc5..3e4aa3c 100644 --- a/src/main/java/io/company/localhost/service/localvoteService.java +++ b/src/main/java/io/company/localhost/service/localvoteService.java @@ -2,12 +2,16 @@ package io.company.localhost.service; import java.util.ArrayList; import java.util.List; +import java.util.Random; +import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import com.fasterxml.jackson.databind.ObjectMapper; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import io.company.localhost.common.dto.ApiResponse; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.VotDetailMapper; import io.company.localhost.mapper.VotMemberMapper; @@ -30,7 +34,6 @@ public class localvoteService { public Long insertVote(MapDto map) { Long result = 0L; - int voteIdInt = 0 ; if(map.get("voteId") != null) { voteIdInt = (int) map.get("voteId"); @@ -48,12 +51,11 @@ public class localvoteService { } return result; } - - public PageInfo getVoteList(MapDto map) { + public PageInfo selectVoteList(MapDto map) { //투표 목록조회 int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1; PageHelper.startPage(page, 10); - PageInfo localvote = PageUtil.redefineNavigation(new PageInfo<>(localvotemapper.getVoteList(map),10)); + PageInfo localvote = PageUtil.redefineNavigation(new PageInfo<>(localvotemapper.selectVoteList(map),10)); List resultList = new ArrayList<>(); List voteList = localvote.getList(); @@ -63,15 +65,19 @@ public class localvoteService { voteMap.put("localVote", vote); Integer locvotSeq = (Integer) vote.get("LOCVOTSEQ"); //투표 항목조회 - List voteDetails = votdetailmapper.getVoteDetails(locvotSeq); + List voteDetails = votdetailmapper.selectVoteDetails(locvotSeq); //투표 가능 멤버 조회 - List voteMembers = votmembermapper.getVoteMember(locvotSeq); + List voteMembers = votmembermapper.selectVoteMember(locvotSeq); + //투표 결과 조회 + List voteResult = votchoicemapper.selectVoteResult(locvotSeq); + voteMap.put("voteDetails", voteDetails); voteMap.put("voteMembers", voteMembers); + voteMap.put("voteResult", voteResult); map.put("id",locvotSeq); //투표 여부 - int yesVotetotal = votrecordmapper.yesVotetotal(map); + int yesVotetotal = votrecordmapper.selectYesVotetotal(map); voteMap.put("yesVotetotal", yesVotetotal); resultList.add(voteMap); @@ -94,5 +100,23 @@ public class localvoteService { return localvotemapper.updateEndData(map); } + public Long updateRandomResult(MapDto map) { + + Long result = 0L; + ObjectMapper objectMapper = new ObjectMapper(); + Object randomListObj = map.get("randomList"); + if (randomListObj instanceof List) { + List rawList = (List) randomListObj; + if (!rawList.isEmpty()) { + //랜덤뽑기 + Object selectedObj = rawList.get(new Random().nextInt(rawList.size())); + MapDto selectedItem = objectMapper.convertValue(selectedObj, MapDto.class); + selectedItem.put("voteid", map.get("voteid")); + //투표결과 저장 + result = localvotemapper.updateRandomResult(selectedItem); + } + } + return result; + } } diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index c19987a..fddf11e 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -21,6 +21,7 @@ import java.util.List; import org.springframework.stereotype.Service; import io.company.localhost.common.dto.MapDto; +import io.company.localhost.mapper.commoncodMapper; import io.company.localhost.mapper.worddictyMapper; import lombok.RequiredArgsConstructor; @@ -29,6 +30,8 @@ import lombok.RequiredArgsConstructor; public class worddictyService { private final worddictyMapper worddictymapper; + private final commoncodMapper commoncodmapper; + public List getWordList(MapDto map) { List wordList = worddictymapper.getWordList(map); @@ -59,6 +62,10 @@ public class worddictyService { } public Long insertWord(MapDto map) { + + if (map.containsKey("CMNCODNAM") && map.get("CMNCODNAM") != null) { + commoncodmapper.insertCategory(map); + } return worddictymapper.insertWord(map); } diff --git a/src/main/resources/mapper/VotDetailMapper.xml b/src/main/resources/mapper/VotDetailMapper.xml index b933cbd..472a3e5 100644 --- a/src/main/resources/mapper/VotDetailMapper.xml +++ b/src/main/resources/mapper/VotDetailMapper.xml @@ -16,7 +16,7 @@ ) - select * from diff --git a/src/main/resources/mapper/VotMemberMapper.xml b/src/main/resources/mapper/VotMemberMapper.xml index ef68c2f..a9393cd 100644 --- a/src/main/resources/mapper/VotMemberMapper.xml +++ b/src/main/resources/mapper/VotMemberMapper.xml @@ -11,7 +11,7 @@ (#{voteId}, #{user.id}) - SELECT a.*, n.*, diff --git a/src/main/resources/mapper/VotRecordMapper.xml b/src/main/resources/mapper/VotRecordMapper.xml index 8e00221..16cf2e8 100644 --- a/src/main/resources/mapper/VotRecordMapper.xml +++ b/src/main/resources/mapper/VotRecordMapper.xml @@ -1,7 +1,7 @@ - select count(*) as yesvote from votrecord diff --git a/src/main/resources/mapper/VotchoiceMapper.xml b/src/main/resources/mapper/VotchoiceMapper.xml index 817a6b3..9838833 100644 --- a/src/main/resources/mapper/VotchoiceMapper.xml +++ b/src/main/resources/mapper/VotchoiceMapper.xml @@ -1,8 +1,7 @@ - - + INSERT INTO votchoice ( LOCVOTSEQ @@ -16,5 +15,21 @@ ) + diff --git a/src/main/resources/mapper/localvoteMapper.xml b/src/main/resources/mapper/localvoteMapper.xml index ad4af19..4766735 100644 --- a/src/main/resources/mapper/localvoteMapper.xml +++ b/src/main/resources/mapper/localvoteMapper.xml @@ -22,7 +22,7 @@ ,#{votemMltiIs} ) - select a.* ,DATE_FORMAT(a.LOCVOTRDT, '%Y-%m-%d %H:%i') AS formatted_LOCVOTRDT @@ -49,4 +49,11 @@ LOCVOTDDT = now() WHERE LOCVOTSEQ = #{endVoteId} + + UPDATE + localvote + SET + LOCVOTRES = #{LOCVOTCON} + WHERE LOCVOTSEQ = #{voteid} + From fec0172d664b63c8ea22968320d4fbbc8d6ce80e Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Mon, 24 Feb 2025 15:04:53 +0900 Subject: [PATCH 36/36] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=EB=8C=93?= =?UTF-8?q?=EA=B8=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/localhost/controller/api/BoardController.java | 3 --- .../io/company/localhost/service/localbordService.java | 7 +++++++ src/main/resources/mapper/localvacaMapper.xml | 2 +- 3 files changed, 8 insertions(+), 4 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 54605a3..ef5fc4b 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -203,9 +203,6 @@ public class BoardController { @ParameterCheck @PostMapping("/{LOCBRDSEQ}/comment") public ApiResponse addCommentOrReply(@ReqMap MapDto map) { - Long userId = AuthUtil.getUser().getId(); - map.put("MEMBERSEQ", userId); - if (map.containsKey("LOCCMTPWD") && !map.getString("LOCCMTPWD").trim().isEmpty()) { // 빈 값 체크 String rawPassword = map.getString("LOCCMTPWD"); String hashedPassword = passwordEncoder.encode(rawPassword); diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java index ed4f2d0..98b00c8 100644 --- a/src/main/java/io/company/localhost/service/localbordService.java +++ b/src/main/java/io/company/localhost/service/localbordService.java @@ -134,6 +134,13 @@ public class localbordService { } public void insertCommentOrReply(MapDto map) { + // 익명게시판이면 회원 정보를 null로 설정 + if ("300102".equals(String.valueOf(map.get("LOCBRDTYP")))) { + map.put("MEMBERSEQ", null); + }else { + Long userId = AuthUtil.getUser().getId(); + map.put("MEMBERSEQ", userId); + } if (map.get("LOCCMTPNT") == null) { map.put("LOCCMTPNT", null); } diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml index 925e97e..b8dde0c 100644 --- a/src/main/resources/mapper/localvacaMapper.xml +++ b/src/main/resources/mapper/localvacaMapper.xml @@ -23,7 +23,7 @@