From 1c42e5166423aeb76d252a4555e1c31761c84e90 Mon Sep 17 00:00:00 2001 From: yoon Date: Wed, 12 Mar 2025 21:39:05 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EC=A3=BC=EC=84=9D=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/ProjectController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/ProjectController.java b/src/main/java/io/company/localhost/controller/api/ProjectController.java index fb32b4e..b127479 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -61,9 +61,7 @@ public class ProjectController { /** * 프로젝트 목록 조회 * - * @param projectName 프로젝트 이름 - * @param participantSeq 참여자 번호 - * @param address 주소 정보 (주소, 상세주소, 우편번호) + * @param map * @return * */ @@ -105,7 +103,7 @@ public class ProjectController { /** - * 비밀번호 재설정 + * 프로젝트 멤버 참여 업데이트 * * @param map * @return From d0f9cefa80ff6f543b14a4ffb7113c85da959407 Mon Sep 17 00:00:00 2001 From: yoon Date: Thu, 13 Mar 2025 12:13:31 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EC=B6=9C=ED=87=B4=EA=B7=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/CommutersController.java | 59 ++++++++++++++- .../localhost/mapper/CommutersMapper.java | 10 ++- .../localhost/mapper/NetprojctMapper.java | 1 + .../localhost/mapper/PromemberMapper.java | 2 + .../localhost/service/CommutersService.java | 73 ++++++++++++++----- .../localhost/service/NetprojctService.java | 6 ++ src/main/resources/mapper/CommutersMapper.xml | 73 +++++++++++++++---- src/main/resources/mapper/NetprojctMapper.xml | 13 ++-- src/main/resources/mapper/PromemberMapper.xml | 4 + 9 files changed, 198 insertions(+), 43 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/CommutersController.java b/src/main/java/io/company/localhost/controller/api/CommutersController.java index 8689fb3..723522b 100644 --- a/src/main/java/io/company/localhost/controller/api/CommutersController.java +++ b/src/main/java/io/company/localhost/controller/api/CommutersController.java @@ -18,6 +18,8 @@ package io.company.localhost.controller.api; import java.util.List; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -51,14 +53,63 @@ public class CommutersController { } /** - * 출퇴근 당일 조회 + * 퇴근 업데이트 + * + * @param map + * @return + * + */ + @PatchMapping("/updateLve") + public ApiResponse updateLeaveTime(@ReqMap MapDto map) { + boolean isLeaveTime = commutersService.updateLeaveTime(map); + return ApiResponse.ok(isLeaveTime); + } + + + /** + * 현재 달의 모든 출근 정보 조회 * * @param map * @return */ - @GetMapping("/today") - public ApiResponse> selectTodayCommuter(int memberSeq) { - return ApiResponse.ok(commutersService.selectTodayCommuter(memberSeq)); + @GetMapping("/month") + public ApiResponse> selectCommutersByMonth(int year, int month) { + return ApiResponse.ok(commutersService.selectCommutersByMonth(year, month)); + } + + /** + * 오늘 사용자의 출근 정보 조회 + * + * @param map + * @return + */ + @GetMapping("/today/{memberSeq}") + public ApiResponse> selectTodayCommuterInfo(@PathVariable Integer memberSeq) { + return ApiResponse.ok(commutersService.selectTodayCommuterInfo(memberSeq)); } + /** + * 오늘 출근 모든 사용자 조회 + * + * @param map + * @return + */ + @GetMapping("/todays") + public ApiResponse> selectTodayCommuter() { + return ApiResponse.ok(commutersService.selectTodayCommuter()); + } + + /** + * 출근 프로젝트 업데이트 + * + * @param map + * @return + * + */ + @PatchMapping("/update") + public ApiResponse updateCommuterProject(@ReqMap MapDto map) { + boolean isCommuter = commutersService.updateCommuterProject(map); + return ApiResponse.ok(isCommuter); + } + } diff --git a/src/main/java/io/company/localhost/mapper/CommutersMapper.java b/src/main/java/io/company/localhost/mapper/CommutersMapper.java index ca81364..80c54cb 100644 --- a/src/main/java/io/company/localhost/mapper/CommutersMapper.java +++ b/src/main/java/io/company/localhost/mapper/CommutersMapper.java @@ -27,6 +27,14 @@ public interface CommutersMapper { int updateLeaveTime(MapDto map); - List selectTodayCommuter(int memberSeq); + List selectCommutersByMonth(int year, int month); + + List selectTodayCommuterInfo(Integer memberSeq); + + List selectTodayCommuter(); + + int updateCommuterProject(MapDto map); + + int deleteCommuters(MapDto map); } diff --git a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java index 9255cb9..61b4695 100644 --- a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java @@ -32,4 +32,5 @@ public interface NetprojctMapper { List selectProjectLog(int projctSeq); int deleteProject(MapDto map); + } diff --git a/src/main/java/io/company/localhost/mapper/PromemberMapper.java b/src/main/java/io/company/localhost/mapper/PromemberMapper.java index 278da6d..021c04f 100644 --- a/src/main/java/io/company/localhost/mapper/PromemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/PromemberMapper.java @@ -32,5 +32,7 @@ public interface PromemberMapper { List selectProjectMembers(int projctSeq); List selectMemberProjects(int memberSeq); + + int deletePromember(MapDto map); } diff --git a/src/main/java/io/company/localhost/service/CommutersService.java b/src/main/java/io/company/localhost/service/CommutersService.java index 2c19b5a..9eae2b5 100644 --- a/src/main/java/io/company/localhost/service/CommutersService.java +++ b/src/main/java/io/company/localhost/service/CommutersService.java @@ -15,17 +15,13 @@ package io.company.localhost.service; import java.time.LocalDateTime; +import java.time.LocalTime; import java.util.List; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.CommutersMapper; -import io.company.localhost.mapper.NetprojctMapper; -import io.company.localhost.mapper.PromemberMapper; -import io.company.localhost.mapper.commoncodMapper; import lombok.RequiredArgsConstructor; @Service @@ -42,6 +38,8 @@ public class CommutersService { */ public int insertCommuters(MapDto map) { map.put("commutDay", LocalDateTime.now()); + map.put("commutCme", LocalTime.now()); + int result = commutersMapper.insertCommuters(map); return result; @@ -52,21 +50,58 @@ public class CommutersService { * @param map * @return */ -// public List updateLeaveTime(MapDto map) { -// -// -// return ; -// } -// - - /** - * 당일 출근 기록 조회 - * @param memberSeq 사용자 번호 - * @return 당일 출근 정보 - */ - public List selectTodayCommuter(int memberSeq) { - return commutersMapper.selectTodayCommuter(memberSeq); + public boolean updateLeaveTime(MapDto map) { + + if(map.get("commutLve") != null) { + map.put("commutLve", null); + } else { + map.put("commutLve", LocalTime.now()); + } + + + return commutersMapper.updateLeaveTime(map) > 0; } + + /** + * 현재 달의 모든 출근 정보 조회 + * + * @param year, month + * @return + */ + public List selectCommutersByMonth(int year, int month) { + return commutersMapper.selectCommutersByMonth(year, month); + } + + /** + * 오늘 사용자 출근 정보 조회 + * + * @param memberSeq + * @return + */ + public List selectTodayCommuterInfo(Integer memberSeq) { + return commutersMapper.selectTodayCommuterInfo(memberSeq); + } + + /** + * 오늘 출근 모든 사용자 조회 + * + * @param + * @return + */ + public List selectTodayCommuter() { + return commutersMapper.selectTodayCommuter(); + } + + /** + * 출근 프로젝트 업데이트 + * + * @param map + * @return + */ + public boolean updateCommuterProject(MapDto map) { + return commutersMapper.updateCommuterProject(map) > 0; + } + } diff --git a/src/main/java/io/company/localhost/service/NetprojctService.java b/src/main/java/io/company/localhost/service/NetprojctService.java index 15d6983..3ee2891 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -22,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.MapDto; +import io.company.localhost.mapper.CommutersMapper; import io.company.localhost.mapper.NetprojctMapper; import io.company.localhost.mapper.PromemberMapper; import io.company.localhost.mapper.commoncodMapper; @@ -33,6 +34,7 @@ public class NetprojctService { private final commoncodMapper commoncodMapper; private final NetprojctMapper netprojctMapper; private final PromemberMapper promemberMapper; + private final CommutersMapper commutersMapper; /** @@ -123,6 +125,10 @@ public class NetprojctService { */ public boolean deleteProject(MapDto map) { + promemberMapper.deletePromember(map); + + commutersMapper.deleteCommuters(map); + boolean result = netprojctMapper.deleteProject(map) > 0; Integer color = map.getInt("projctCol"); diff --git a/src/main/resources/mapper/CommutersMapper.xml b/src/main/resources/mapper/CommutersMapper.xml index ee4dff3..1971a47 100644 --- a/src/main/resources/mapper/CommutersMapper.xml +++ b/src/main/resources/mapper/CommutersMapper.xml @@ -6,38 +6,83 @@ INSERT INTO commuters ( COMMUTSEQ, - MRMBERSEQ, + MEMBERSEQ, PROJCTSEQ, COMMUTCMT, - COMMUTLVT, + COMMUTLVE, COMMUTDAY, COMMUTARR ) VALUES ( #{commutSeq}, #{memberSeq}, #{projctSeq}, - #{commutCmt}, - #{commutLvt}, + #{commutCme}, + #{commutLve}, #{commutDay}, #{commutArr} ) - + UPDATE commuters - SET COMMUTLVT = #{commutLvt} - WHERE MRMBERSEQ = #{memberSeq} + SET COMMUTLVE = #{commutLve} + WHERE MEMBERSEQ = #{memberSeq} AND COMMUTDAY = CURDATE() - - + SELECT + c.COMMUTSEQ, + c.MEMBERSEQ, + c.PROJCTSEQ, + c.COMMUTCMT, + c.COMMUTLVE, + c.COMMUTDAY, + c.COMMUTARR, + m.MEMBERNAM as memberName, + m.MEMBERPRF as profile, + p.PROJCTNAM, + cc.CMNCODNAM AS projctcolor + FROM + commuters c + JOIN + netmember m ON c.MEMBERSEQ = m.MEMBERSEQ + JOIN + netprojct p ON c.PROJCTSEQ = p.PROJCTSEQ + LEFT JOIN commoncod cc ON p.PROJCTCOL = cc.CMNCODVAL AND cc.CMNCODYNP = '1' + WHERE + YEAR(c.COMMUTDAY) = #{year} + AND MONTH(c.COMMUTDAY) = #{month} + + + + + + + + + UPDATE commuters + SET PROJCTSEQ = #{projctSeq} + WHERE MEMBERSEQ = #{memberSeq} + AND COMMUTDAY = CURDATE() + + + + DELETE FROM commuters WHERE PROJCTSEQ = #{projctSeq} + diff --git a/src/main/resources/mapper/NetprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml index 2edfbc4..312ada9 100644 --- a/src/main/resources/mapper/NetprojctMapper.xml +++ b/src/main/resources/mapper/NetprojctMapper.xml @@ -30,6 +30,9 @@ AND SUBSTRING(p.PROJCTSTR, 1, 4) = #{category} + + AND (p.PROJCTEND IS NULL OR p.PROJCTEND > CURDATE()) + ORDER BY p.PROJCTSTR DESC @@ -105,9 +108,9 @@ - - DELETE FROM netprojct WHERE PROJCTSEQ = #{projctSeq} - - - + + DELETE FROM netprojct WHERE PROJCTSEQ = #{projctSeq} + + + diff --git a/src/main/resources/mapper/PromemberMapper.xml b/src/main/resources/mapper/PromemberMapper.xml index d9f5068..925d1e9 100644 --- a/src/main/resources/mapper/PromemberMapper.xml +++ b/src/main/resources/mapper/PromemberMapper.xml @@ -46,5 +46,9 @@ AND (p.PROJCTEND IS NULL OR p.PROJCTEND >= CURDATE()) ORDER BY p.PROJCTSTR DESC + + + DELETE FROM promember WHERE PROJCTSEQ = #{projctSeq} + From 1673ddccace2c919e7fc00863116c6c9723047ff Mon Sep 17 00:00:00 2001 From: yoon Date: Fri, 14 Mar 2025 12:12:06 +0900 Subject: [PATCH 03/10] =?UTF-8?q?get=20->=20select=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/localhost/controller/common/UserController.java | 4 ++-- .../java/io/company/localhost/mapper/NetmemberMapper.java | 2 +- .../java/io/company/localhost/service/NetmemberService.java | 4 ++-- src/main/resources/mapper/NetmemberMapper.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) 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 1a1151c..c70a63d 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -292,8 +292,8 @@ public class UserController { */ @ParameterCheck @GetMapping("/allUserList") - public ApiResponse getallUserList() { - List allUserList = netmemberservice.getallUserList(); + public ApiResponse selectallUserList() { + List allUserList = netmemberservice.selectallUserList(); MemberVo user = AuthUtil.getUser(); MapDto outData = new MapDto(); diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index c3d6584..ec2ee5e 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -42,6 +42,6 @@ public interface NetmemberMapper { int updatePassword(MapDto map); - List getallUserList(); + List selectallUserList(); } diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index a836f79..307e6f8 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -119,8 +119,8 @@ public class NetmemberService { * @param * @return */ - public List getallUserList() { - return memberMapper.getallUserList(); + public List selectallUserList() { + return memberMapper.selectallUserList(); } /** diff --git a/src/main/resources/mapper/NetmemberMapper.xml b/src/main/resources/mapper/NetmemberMapper.xml index 2b8e75f..f034200 100644 --- a/src/main/resources/mapper/NetmemberMapper.xml +++ b/src/main/resources/mapper/NetmemberMapper.xml @@ -134,7 +134,7 @@ - SELECT m.* ,c.CMNCODNAM usercolor From 87bf1c37de74d5a9b00884a9e9a66a67ffdd054c Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Fri, 14 Mar 2025 13:16:31 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/MapBasedUrlRoleMapper.java | 1 + .../controller/api/AdminController.java | 65 +++++++++++++++++++ .../localhost/mapper/NetmemberMapper.java | 2 + .../localhost/service/NetmemberService.java | 12 +++- src/main/resources/mapper/NetmemberMapper.xml | 4 ++ 5 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 src/main/java/io/company/localhost/controller/api/AdminController.java diff --git a/src/main/java/io/company/localhost/common/security/mapper/MapBasedUrlRoleMapper.java b/src/main/java/io/company/localhost/common/security/mapper/MapBasedUrlRoleMapper.java index 9b2b577..804f9d1 100644 --- a/src/main/java/io/company/localhost/common/security/mapper/MapBasedUrlRoleMapper.java +++ b/src/main/java/io/company/localhost/common/security/mapper/MapBasedUrlRoleMapper.java @@ -36,6 +36,7 @@ public class MapBasedUrlRoleMapper implements UrlRoleMapper{ urlRoleMappings.put("/api/worddict/**", PERMIT_ALL); urlRoleMappings.put("/api/quilleditor/**", PERMIT_ALL); urlRoleMappings.put("/api/commuters/**", PERMIT_ALL); + urlRoleMappings.put("/api/admin/**", PERMIT_ALL); return new HashMap<>(urlRoleMappings); } } \ No newline at end of file diff --git a/src/main/java/io/company/localhost/controller/api/AdminController.java b/src/main/java/io/company/localhost/controller/api/AdminController.java new file mode 100644 index 0000000..4082f47 --- /dev/null +++ b/src/main/java/io/company/localhost/controller/api/AdminController.java @@ -0,0 +1,65 @@ +/************************************************************ + * + * @packageName : io.company.localhost.controller.api + * @fileName : AdminController.java + * @author : 서지희 + * @date : 25.03.14 + * @description : 게시판 + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 25.03.14 서지희 최초 생성 + * + *************************************************************/ +package io.company.localhost.controller.api; + +import java.util.List; + +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PutMapping; +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.NetmemberService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@RestController +@RequestMapping("/api/admin") +@RequiredArgsConstructor +@Slf4j +public class AdminController { + + private final NetmemberService netmemberService; + + @Member + @ParameterCheck + @GetMapping("/users") + public ApiResponse> getAllUsers() { + List response = netmemberService.getallUserList(); + return ApiResponse.ok(response); + } + + @PutMapping("/role") + public ApiResponse updateUserRole(@ReqMap MapDto map) { + // 요청 데이터에서 id와 role 추출 + Long id = Long.valueOf(map.get("id").toString()); + String role = map.get("role").toString(); + + // 역할 변환 + String newRole = role.equalsIgnoreCase("ADMIN") ? "ROLE_ADMIN" : "ROLE_USER"; + + // 권한 업데이트 서비스 호출 + netmemberService.updateUserRole(id, newRole); + + return ApiResponse.ok("관리자 권한이 변경되었습니다."); + } + +} diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index c3d6584..e7383c8 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -43,5 +43,7 @@ public interface NetmemberMapper { int updatePassword(MapDto map); List getallUserList(); + + void updateUserRole(Long id, String role); } diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index a836f79..f27fd96 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -122,6 +122,16 @@ public class NetmemberService { public List getallUserList() { return memberMapper.getallUserList(); } + + /** + * 사원 권한 업데이트 + * + * @param + * @return + */ + public void updateUserRole(Long id, String newRole) { + memberMapper.updateUserRole(id, newRole); + } /** * 로그인 토큰 @@ -132,7 +142,7 @@ public class NetmemberService { public void updateMemberToken(MapDto map) { memberMapper.updateMemberToken(map); } - + /** * 비밀번호 재설정 member 체크 * diff --git a/src/main/resources/mapper/NetmemberMapper.xml b/src/main/resources/mapper/NetmemberMapper.xml index 2b8e75f..56d36ea 100644 --- a/src/main/resources/mapper/NetmemberMapper.xml +++ b/src/main/resources/mapper/NetmemberMapper.xml @@ -151,5 +151,9 @@ AND m.MEMBERLEA ="N" + + + UPDATE netmember SET MEMBERROL = #{role} WHERE MEMBERSEQ = #{id} + From dfca1a9ee2758cb1fe1895a00d8fbb958defeaa2 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Mon, 17 Mar 2025 10:54:42 +0900 Subject: [PATCH 05/10] =?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/worddictController.java | 11 +++++------ .../localhost/mapper/VotDetailMapper.java | 14 ++++++++++++++ .../localhost/mapper/VotMemberMapper.java | 18 ++++++++++++++---- .../localhost/mapper/VotRecordMapper.java | 14 ++++++++++++++ .../localhost/mapper/VotchoiceMapper.java | 15 ++++++++++++++- .../localhost/mapper/localvoteMapper.java | 14 ++++++++++++++ .../localhost/mapper/worddictyMapper.java | 4 ++-- .../localhost/service/localvoteService.java | 16 +++++++++++++++- .../localhost/service/worddictyService.java | 8 ++++---- 9 files changed, 96 insertions(+), 18 deletions(-) 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 a808e0d..7e454ff 100644 --- a/src/main/java/io/company/localhost/controller/api/worddictController.java +++ b/src/main/java/io/company/localhost/controller/api/worddictController.java @@ -53,10 +53,10 @@ public class worddictController { @Member @ParameterCheck @GetMapping("getWordList") - public ApiResponse getWordList(@ReqMap MapDto map) { + public ApiResponse selectWordList(@ReqMap MapDto map) { int total = worddictyservice.getTotal(map); - List wordList = worddictyservice.getWordList(map); + List wordList = worddictyservice.selectWordList(map); MapDto OutData = new MapDto(); OutData.put("total", total); @@ -73,7 +73,7 @@ public class worddictController { @Member @ParameterCheck @GetMapping("getWordCategory") - public ApiResponse> getWordCategory() { + public ApiResponse> selectWordCategory() { List WordCategoryList = commoncodservice.selectWordCategory(); return ApiResponse.ok(WordCategoryList); } @@ -97,8 +97,8 @@ public class worddictController { @Member @ParameterCheck @GetMapping("getWordDetail") - public ApiResponse getWordDetail(@ReqMap MapDto map) { - return ApiResponse.ok( worddictyservice.getWordDetail(map)); + public ApiResponse selectWordDetail(@ReqMap MapDto map) { + return ApiResponse.ok( worddictyservice.selectWordDetail(map)); } /** * 용어 등록 - 카테고리 등록 @@ -125,7 +125,6 @@ public class worddictController { @PatchMapping("updateWord") public ApiResponse updateWord(@ReqMap MapDto map) { - //userId Long userId = AuthUtil.getUser().getId(); map.put("userId", userId); Long result = worddictyservice.updateWord(map); diff --git a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java index f3bafdc..3321b4c 100644 --- a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotDetailMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import java.util.List; diff --git a/src/main/java/io/company/localhost/mapper/VotMemberMapper.java b/src/main/java/io/company/localhost/mapper/VotMemberMapper.java index 7879e48..78f1240 100644 --- a/src/main/java/io/company/localhost/mapper/VotMemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotMemberMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotMemberMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import java.util.List; @@ -13,8 +27,4 @@ public interface VotMemberMapper { 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 7f07618..9669872 100644 --- a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotRecordMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java index b0940bf..4e64b89 100644 --- a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : VotchoiceMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import org.apache.ibatis.annotations.Mapper; @@ -9,5 +23,4 @@ public interface VotchoiceMapper { void insertChoice(MapDto map); - } diff --git a/src/main/java/io/company/localhost/mapper/localvoteMapper.java b/src/main/java/io/company/localhost/mapper/localvoteMapper.java index fb3b4bc..99557f4 100644 --- a/src/main/java/io/company/localhost/mapper/localvoteMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvoteMapper.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.mapper + * @fileName : localvoteMapper.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.mapper; import java.util.List; diff --git a/src/main/java/io/company/localhost/mapper/worddictyMapper.java b/src/main/java/io/company/localhost/mapper/worddictyMapper.java index 4792329..aeb287a 100644 --- a/src/main/java/io/company/localhost/mapper/worddictyMapper.java +++ b/src/main/java/io/company/localhost/mapper/worddictyMapper.java @@ -23,13 +23,13 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface worddictyMapper { - List getWordList(MapDto map); + List selectWordList(MapDto map); Long insertWord(MapDto map); Long updateWord(MapDto map); - MapDto getWordDetail(MapDto map); + MapDto selectWordDetail(MapDto map); int getTotal(MapDto map); diff --git a/src/main/java/io/company/localhost/service/localvoteService.java b/src/main/java/io/company/localhost/service/localvoteService.java index cbcc217..7b78af2 100644 --- a/src/main/java/io/company/localhost/service/localvoteService.java +++ b/src/main/java/io/company/localhost/service/localvoteService.java @@ -1,3 +1,17 @@ +/************************************************************ + * + * @packageName : io.company.localhost.service + * @fileName : localvoteService.java + * @author : 공현지 + * @date : 25.01.07 + * @description : + * + * =========================================================== + * DATE AUTHOR NOTE + * ----------------------------------------------------------- + * 24.12.06 공현지 최초 생성 + * + *************************************************************/ package io.company.localhost.service; import java.util.ArrayList; @@ -63,8 +77,8 @@ public class localvoteService { MapDto voteMap = new MapDto(); voteMap.put("localVote", vote); Integer locvotSeq = (Integer) vote.get("LOCVOTSEQ"); - //투표 항목조회 + 결과 조회 + 투표여부 map.put("locvotSeq", locvotSeq); + //투표 항목조회 + 결과 조회 + 투표여부 List voteDetails = votdetailmapper.selectVoteDetailsResult(map); //투표 가능 멤버 조회 List voteMembers = votmembermapper.selectVoteMember(locvotSeq); diff --git a/src/main/java/io/company/localhost/service/worddictyService.java b/src/main/java/io/company/localhost/service/worddictyService.java index bc33b7a..da9241b 100644 --- a/src/main/java/io/company/localhost/service/worddictyService.java +++ b/src/main/java/io/company/localhost/service/worddictyService.java @@ -33,8 +33,8 @@ public class worddictyService { private final worddictyMapper worddictymapper; private final commoncodMapper commoncodmapper; - public List getWordList(MapDto map) { - List wordList = worddictymapper.getWordList(map); + public List selectWordList(MapDto map) { + List wordList = worddictymapper.selectWordList(map); for (MapDto word : wordList) { Object content = word.get("WRDDICCON"); // BlobUtil.procBlobToString으로 content 변환 @@ -80,8 +80,8 @@ public class worddictyService { public Long updateWord(MapDto map) { return worddictymapper.updateWord(map); } - public MapDto getWordDetail(MapDto map) { - return worddictymapper.getWordDetail(map); + public MapDto selectWordDetail(MapDto map) { + return worddictymapper.selectWordDetail(map); } public int getTotal(MapDto map) { return worddictymapper.getTotal(map); From e7d6db5e94145693fb238f064efff647288ccd90 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Mon, 17 Mar 2025 11:13:20 +0900 Subject: [PATCH 06/10] Merge branch 'khj' into main --- src/main/resources/mapper/worddictyMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml index a4e3920..1251fa8 100644 --- a/src/main/resources/mapper/worddictyMapper.xml +++ b/src/main/resources/mapper/worddictyMapper.xml @@ -141,7 +141,7 @@ and w.WRDDICCAT = #{category} - select w.WRDDICSEQ, w.WRDDICCAT, @@ -232,7 +232,7 @@ where WRDDICSEQ = #{WRDDICSEQ} - select * from worddicty From 606c3c586c417edcbdc543cb5c519128815e8080 Mon Sep 17 00:00:00 2001 From: yoon Date: Mon, 17 Mar 2025 12:01:39 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=EA=B0=9C=EC=9D=B8=EC=B0=B8=EC=97=AC?= =?UTF-8?q?=EA=B8=B0=EA=B0=84=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/ProjectController.java | 13 ++++++++ .../localhost/mapper/NetprojctMapper.java | 1 + .../localhost/service/NetprojctService.java | 10 ++++++ src/main/resources/mapper/NetprojctMapper.xml | 32 +++++++++++++++++++ 4 files changed, 56 insertions(+) diff --git a/src/main/java/io/company/localhost/controller/api/ProjectController.java b/src/main/java/io/company/localhost/controller/api/ProjectController.java index b127479..4d9963e 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -168,4 +168,17 @@ public class ProjectController { return ApiResponse.ok(promemberService.selectMemberProjects(memberSeq)); } + /** + * 프로젝트 모든 사용자 참여기간 조회 + * + * @return + * + */ + @ParameterCheck + @GetMapping("/period/{projctSeq}") + public ApiResponse> selectUserProjectPeriod(@PathVariable int projctSeq) { + + return ApiResponse.ok(netprojctService.selectUserProjectPeriod(projctSeq)); + } + } diff --git a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java index 61b4695..d3e047c 100644 --- a/src/main/java/io/company/localhost/mapper/NetprojctMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetprojctMapper.java @@ -33,4 +33,5 @@ public interface NetprojctMapper { int deleteProject(MapDto map); + List selectUserProjectPeriod(int projectSeq); } diff --git a/src/main/java/io/company/localhost/service/NetprojctService.java b/src/main/java/io/company/localhost/service/NetprojctService.java index 3ee2891..4ce0821 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -142,4 +142,14 @@ public class NetprojctService { return result; } + /** + * 프로젝트 모든 사용자 참여기간 조회 + * + * @param + * @return + */ + public List selectUserProjectPeriod(int projctSeq) { + return netprojctMapper.selectUserProjectPeriod(projctSeq); + } + } diff --git a/src/main/resources/mapper/NetprojctMapper.xml b/src/main/resources/mapper/NetprojctMapper.xml index 312ada9..48f9d72 100644 --- a/src/main/resources/mapper/NetprojctMapper.xml +++ b/src/main/resources/mapper/NetprojctMapper.xml @@ -112,5 +112,37 @@ DELETE FROM netprojct WHERE PROJCTSEQ = #{projctSeq} + + From 778ffb5edf5b4fc0d09c156a77fe099da1d7f7a1 Mon Sep 17 00:00:00 2001 From: yoon Date: Mon, 17 Mar 2025 12:04:38 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20im?= =?UTF-8?q?port=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/company/localhost/controller/api/ProjectController.java | 1 - .../java/io/company/localhost/service/NetprojctService.java | 2 -- 2 files changed, 3 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/ProjectController.java b/src/main/java/io/company/localhost/controller/api/ProjectController.java index 4d9963e..0dd3b18 100644 --- a/src/main/java/io/company/localhost/controller/api/ProjectController.java +++ b/src/main/java/io/company/localhost/controller/api/ProjectController.java @@ -17,7 +17,6 @@ package io.company.localhost.controller.api; import java.util.List; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PatchMapping; import org.springframework.web.bind.annotation.PathVariable; diff --git a/src/main/java/io/company/localhost/service/NetprojctService.java b/src/main/java/io/company/localhost/service/NetprojctService.java index 4ce0821..f986bb9 100644 --- a/src/main/java/io/company/localhost/service/NetprojctService.java +++ b/src/main/java/io/company/localhost/service/NetprojctService.java @@ -18,9 +18,7 @@ import java.time.LocalDateTime; import java.util.List; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import io.company.localhost.common.annotation.ReqMap; import io.company.localhost.common.dto.MapDto; import io.company.localhost.mapper.CommutersMapper; import io.company.localhost.mapper.NetprojctMapper; From e9f4cb2fc5de4c213d3cb31230e3ead27498c19c Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Mon, 17 Mar 2025 12:06:33 +0900 Subject: [PATCH 09/10] =?UTF-8?q?Admin=20=EA=B6=8C=ED=95=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/api/AdminController.java | 20 +++++++++---- .../controller/api/BoardController.java | 6 ++-- .../localhost/service/localbordService.java | 20 ++++++------- src/main/resources/mapper/localbordMapper.xml | 29 ++----------------- 4 files changed, 28 insertions(+), 47 deletions(-) diff --git a/src/main/java/io/company/localhost/controller/api/AdminController.java b/src/main/java/io/company/localhost/controller/api/AdminController.java index 4082f47..e09e0ae 100644 --- a/src/main/java/io/company/localhost/controller/api/AdminController.java +++ b/src/main/java/io/company/localhost/controller/api/AdminController.java @@ -39,24 +39,32 @@ public class AdminController { private final NetmemberService netmemberService; + /** + * 사원 리스트 + * @return 사원 리스트 + */ @Member @ParameterCheck @GetMapping("/users") - public ApiResponse> getAllUsers() { - List response = netmemberService.getallUserList(); + public ApiResponse> selectallUserList() { + List response = netmemberService.selectallUserList(); return ApiResponse.ok(response); } + /** + * 관리자 권한 수정 + * @ReqMap map 요청 파라미터 (MEMBERROL, MEMBERSEQ) + * @return 결과 메시지 + */ + @Member + @ParameterCheck @PutMapping("/role") public ApiResponse updateUserRole(@ReqMap MapDto map) { - // 요청 데이터에서 id와 role 추출 Long id = Long.valueOf(map.get("id").toString()); String role = map.get("role").toString(); - // 역할 변환 - String newRole = role.equalsIgnoreCase("ADMIN") ? "ROLE_ADMIN" : "ROLE_USER"; + String newRole = role.equalsIgnoreCase("ADMIN") ? "ROLE_ADMIN" : "ROLE_MEMBER"; - // 권한 업데이트 서비스 호출 netmemberService.updateUserRole(id, newRole); return ApiResponse.ok("관리자 권한이 변경되었습니다."); 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 ffec70a..a01f898 100644 --- a/src/main/java/io/company/localhost/controller/api/BoardController.java +++ b/src/main/java/io/company/localhost/controller/api/BoardController.java @@ -229,7 +229,7 @@ public class BoardController { /** * 댓글 조회 - * @ReqMap map 수정 데이터 (LOCBRDSEQ) + * @ReqMap map 수정 데이터 (LOCBRDSEQ, page) * @return 댓글 */ @Member @@ -245,7 +245,7 @@ public class BoardController { /** * 대댓글 조회 - * @ReqMap map 수정 데이터 (LOCBRDSEQ) + * @ReqMap map 수정 데이터 (LOCCMTPNT) * @return 대댓글 */ @Member @@ -383,7 +383,7 @@ public class BoardController { * @return 카테고리 리스트 */ @GetMapping("/categories") - public ApiResponse> getCategories() { + public ApiResponse> SelectCategories() { List categories = commoncodService.selectCategoryList(); return ApiResponse.ok(categories); } diff --git a/src/main/java/io/company/localhost/service/localbordService.java b/src/main/java/io/company/localhost/service/localbordService.java index c76db7c..2fdead5 100644 --- a/src/main/java/io/company/localhost/service/localbordService.java +++ b/src/main/java/io/company/localhost/service/localbordService.java @@ -229,21 +229,19 @@ public class localbordService { return boardMapper.selectCountCommentReactions(boardId); } - private String procFirstImageUrl(String jsonContent) { + public static String procFirstImageUrl(String jsonContent) { try { - // JSON 유효성 검사 - if (!procIsValidJson(jsonContent)) { - throw new IllegalArgumentException("Invalid JSON content: " + jsonContent); - } - ObjectMapper objectMapper = new ObjectMapper(); JsonNode rootNode = objectMapper.readTree(jsonContent); - // JSON 배열 순회 - for (JsonNode node : rootNode) { - JsonNode insertNode = node.get("insert"); - if (insertNode != null && insertNode.has("image")) { - return insertNode.get("image").asText(); // 첫 번째 이미지 URL 반환 + // "ops" 배열 가져오기 + JsonNode opsNode = rootNode.get("ops"); + if (opsNode != null && opsNode.isArray()) { + for (JsonNode node : opsNode) { + JsonNode insertNode = node.get("insert"); + if (insertNode != null && insertNode.has("image")) { + return insertNode.get("image").asText(); // 첫 번째 이미지 URL 반환 + } } } } catch (Exception e) { diff --git a/src/main/resources/mapper/localbordMapper.xml b/src/main/resources/mapper/localbordMapper.xml index 7683691..0dbff11 100644 --- a/src/main/resources/mapper/localbordMapper.xml +++ b/src/main/resources/mapper/localbordMapper.xml @@ -65,30 +65,6 @@ ) - - - INSERT INTO commonfil ( - CMNBRDSEQ, - CMNFLENAM, - CMNFLEORG, - CMNFLEPAT, - CMNFLEEXT, - CMNFLESIZ, - CMNFLEREG, - CMNFLERDT - ) VALUES - - #{LOCBRDSEQ}, - #{item.saveFileName}, - #{item.originalFileName}, - #{item.filePath}, - #{item.extension}, - #{item.fileSize}, - #{CMNFLEREG}, - NOW() - - - SELECT c.LOCCMTSEQ,c.LOCBRDSEQ,c.LOCCMTPNT,c.LOCCMTRPY, - c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT,c.LOCCMTPNT, + c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT, m.MEMBERNAM AS author, m.MEMBERSEQ AS authorId FROM localcomt c @@ -177,8 +153,7 @@ c.LOCCMTSEQ,c.LOCBRDSEQ,c.LOCCMTPNT,c.LOCCMTRPY, c.LOCCMTUDT,c.LOCCMTPWD,c.LOCCMTRDT,c.LOCCMTPNT, m.MEMBERNAM AS author, - m.MEMBERSEQ AS authorId, - m.MEMBERPRF as profileImg + m.MEMBERSEQ AS authorId FROM localcomt c LEFT JOIN netmember m ON c.MEMBERSEQ = m.MEMBERSEQ WHERE LOCCMTPNT = #{LOCCMTPNT} and LOCCMTPNT != 1 From ada6654edd8b9580f24388771ff0e0d9015526f5 Mon Sep 17 00:00:00 2001 From: dyhj625 Date: Mon, 17 Mar 2025 12:32:16 +0900 Subject: [PATCH 10/10] =?UTF-8?q?=ED=9C=B4=EA=B0=80=EC=BF=BC=EB=A6=AC?= =?UTF-8?q?=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/localvacaMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/localvacaMapper.xml b/src/main/resources/mapper/localvacaMapper.xml index a39eb4b..8a16d2c 100644 --- a/src/main/resources/mapper/localvacaMapper.xml +++ b/src/main/resources/mapper/localvacaMapper.xml @@ -122,7 +122,7 @@