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 3d772d4..1a1151c 100644 --- a/src/main/java/io/company/localhost/controller/common/UserController.java +++ b/src/main/java/io/company/localhost/controller/common/UserController.java @@ -67,20 +67,33 @@ public class UserController { /** * 사용 가능 색상 조회 * - * @return ApiResponse> + * @return * */ @ParameterCheck @GetMapping("/color") - public ApiResponse> selectColorList(@RequestParam("type") String type) { + public ApiResponse> selectColorList(String type) { List ColorList = commoncodservice.selectColorList(type); return ApiResponse.ok(ColorList); } + + /** + * 색상 중복 체크 + * + * @return + * + */ + @ParameterCheck + @GetMapping("/checkColor") + public ApiResponse selectMemberColor(String memberCol) { + boolean isDuplicate = netmemberservice.selectMemberColor(memberCol); + return ApiResponse.ok(isDuplicate); + } /** * MBTI 목록 조회 * - * @return ApiResponse> + * @return * */ @ParameterCheck @@ -93,7 +106,7 @@ public class UserController { /** * 비밀번호 힌트 목록 조회 * - * @return ApiResponse> + * @return * */ @ParameterCheck @@ -108,7 +121,7 @@ public class UserController { * * @param profile * @param map - * @return ApiResponse + * @return */ @PostMapping("/join") public ApiResponse register(@RequestParam("memberPrf") MultipartFile memberPrf, @ReqMap MapDto map) { @@ -120,11 +133,11 @@ public class UserController { * 아이디 중복 체크 * * @param memberIds - * @return ApiResponse + * @return * */ @GetMapping("/checkId") - public ApiResponse selectCheckId(@RequestParam("memberIds") String memberIds) { + public ApiResponse selectCheckId(String memberIds) { boolean isDuplicate = netmemberservice.selectCheckId(memberIds); return ApiResponse.ok(!isDuplicate); } @@ -133,11 +146,11 @@ public class UserController { * 전화번호 중복 체크 * * @param memberTel - * @return ApiResponse + * @return * */ @GetMapping("/checkPhone") - public ApiResponse selectCheckPhone(@RequestParam String memberTel) { + public ApiResponse selectCheckPhone(String memberTel) { boolean isDuplicate = netmemberservice.selectCheckPhone(memberTel); return ApiResponse.ok(!isDuplicate); } @@ -145,7 +158,7 @@ public class UserController { /** * 로그인 여부 체크 * - * @return ApiResponse + * @return */ @GetMapping("/isLogin") public ApiResponse checkLogin() { @@ -157,7 +170,7 @@ public class UserController { * 비밀번호 재설정 member 체크 * * @param map - * @return ApiResponse + * @return * */ @PostMapping("/pwReset") @@ -170,7 +183,7 @@ public class UserController { * 기존 비밀번호 체크 * * @param map - * @return ApiResponse + * @return */ @PostMapping("/checkPassword") public ApiResponse selectPassword(@ReqMap MapDto map) { @@ -182,7 +195,7 @@ public class UserController { * 비밀번호 재설정 * * @param map - * @return ApiResponse + * @return * */ @PatchMapping("/pwNew") diff --git a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java index c7726da..c3d6584 100644 --- a/src/main/java/io/company/localhost/mapper/NetmemberMapper.java +++ b/src/main/java/io/company/localhost/mapper/NetmemberMapper.java @@ -34,6 +34,8 @@ public interface NetmemberMapper { int selectCheckPhone(String memberTel); + int selectMemberColor(String memberCol); + int selectPwReset(MapDto map); String selectPassword(String id); diff --git a/src/main/java/io/company/localhost/service/NetmemberService.java b/src/main/java/io/company/localhost/service/NetmemberService.java index 9e6d44c..a836f79 100644 --- a/src/main/java/io/company/localhost/service/NetmemberService.java +++ b/src/main/java/io/company/localhost/service/NetmemberService.java @@ -101,6 +101,17 @@ public class NetmemberService { public boolean selectCheckPhone(String memberTel) { return memberMapper.selectCheckPhone(memberTel) > 0; } + + /** + * 색상 중복 체크 + * + * @param memberCol + * @return + */ + public boolean selectMemberColor(String memberCol) { + return memberMapper.selectMemberColor(memberCol) > 0; + } + /** * 사원 목록 전체 조회 diff --git a/src/main/resources/mapper/NetmemberMapper.xml b/src/main/resources/mapper/NetmemberMapper.xml index f57d8cd..2b8e75f 100644 --- a/src/main/resources/mapper/NetmemberMapper.xml +++ b/src/main/resources/mapper/NetmemberMapper.xml @@ -102,6 +102,13 @@ WHERE MEMBERTEL = #{memberTel} + + +