From 8b38b98347c96ab817eb1457f296f3c7bcef518d Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 10 Dec 2025 16:22:09 +0900 Subject: [PATCH] =?UTF-8?q?251210=5F01=5FENH=20:=20=EA=B2=80=EC=83=89?= =?UTF-8?q?=EC=96=B4=EB=A1=9C=EB=A7=8C=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EA=B2=80=EC=83=89=20=EC=B6=94=EA=B0=80,=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20ID=20=EC=9E=88=EB=8A=94=20?= =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../controller/ProjectController.java | 11 +++++ .../extension/controller/UserController.java | 43 +++++++++++++----- ...ResponseDto.java => UserBasicInfoDto.java} | 8 ++-- .../extension/mapper/ProjectMapper.java | 4 ++ .../intranet/extension/mapper/UserMapper.java | 6 +++ .../extension/service/ProjectService.java | 8 ++++ .../extension/service/UserService.java | 20 +++++++-- .../mybatis/mapper/ProjectMapper.xml | 41 +++++++++++++---- .../resources/mybatis/mapper/UserMapper.xml | 44 ++++++++++++++++++- 10 files changed, 159 insertions(+), 28 deletions(-) rename src/main/java/com/kri/intranet/extension/dto/user/{response/GetUserWithIdPwResponseDto.java => UserBasicInfoDto.java} (80%) diff --git a/build.gradle b/build.gradle index 8bb3005..ae744b5 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.0.25" + implementation "com.kri.common:starter:beta.1.0.32" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/intranet/extension/controller/ProjectController.java b/src/main/java/com/kri/intranet/extension/controller/ProjectController.java index fef0310..6714392 100644 --- a/src/main/java/com/kri/intranet/extension/controller/ProjectController.java +++ b/src/main/java/com/kri/intranet/extension/controller/ProjectController.java @@ -18,6 +18,17 @@ public class ProjectController { private final ProjectService projectService; + @Operation( + summary = "Keyword로만 상위 10개 프로젝트 조회", + description = "p_child_sn, p_subject, p_intention 전부 OR 조건으로 최신 10건 프로젝트를 조회합니다." + ) + @GetMapping("search/top10") + public List getProjectTop10OnlyKeyword( + @RequestParam(required = false) String keyword + ) { + return projectService.getProjectTop10OnlyKeyword(keyword); + } + @Operation( summary = "상위 10개 프로젝트 조회", description = "p_child_sn, p_subject, p_intention 조건으로 최신 10건 프로젝트를 조회합니다." diff --git a/src/main/java/com/kri/intranet/extension/controller/UserController.java b/src/main/java/com/kri/intranet/extension/controller/UserController.java index bed3c3a..d55b36a 100644 --- a/src/main/java/com/kri/intranet/extension/controller/UserController.java +++ b/src/main/java/com/kri/intranet/extension/controller/UserController.java @@ -1,15 +1,14 @@ package com.kri.intranet.extension.controller; import com.kri.intranet.extension.dto.user.request.GetUserWithIdPwRequestDto; -import com.kri.intranet.extension.dto.user.response.GetUserWithIdPwResponseDto; +import com.kri.intranet.extension.dto.user.UserBasicInfoDto; import com.kri.intranet.extension.service.UserService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; -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.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/api/v1/user") @@ -20,14 +19,38 @@ public class UserController { private final UserService userService; @Operation( - summary = "사용자 정보 조회", - description = "ID/PW로 사용자 정보 조회" + summary = "사용자 정보 조회", + description = "ID/PW로 사용자 정보 조회" ) - @PostMapping("search/login-info") - public GetUserWithIdPwResponseDto getUserWithIdPw( + @PostMapping("login-info") + public UserBasicInfoDto getUserWithIdPw( @RequestBody GetUserWithIdPwRequestDto getUserWithIdPwRequestDto ) { return userService.getUserWithIdPw(getUserWithIdPwRequestDto); } -} + @Operation( + summary = "사용자 리스트", + description = "사용자 리스트 조회" + ) + @GetMapping("list") + public List getUserList(){ return userService.getUserList(); } + + @Operation( + summary = "ID 사용 여부 조회", + description = "ID로 사용가능 여부 조회" + ) + @GetMapping("check-user-id") + public boolean checkUserId(@RequestParam String userId){ + return userService.checkUserId(userId); + } + + @Operation( + summary = "사용자 ID 목록 조회", + description = "사용자 ID 목록 조회" + ) + @GetMapping("user-id-list") + public List getUserIdArray(){ + return userService.getUserIdArray(); + } +} \ No newline at end of file diff --git a/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java b/src/main/java/com/kri/intranet/extension/dto/user/UserBasicInfoDto.java similarity index 80% rename from src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java rename to src/main/java/com/kri/intranet/extension/dto/user/UserBasicInfoDto.java index fb1e585..231b37a 100644 --- a/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java +++ b/src/main/java/com/kri/intranet/extension/dto/user/UserBasicInfoDto.java @@ -1,4 +1,4 @@ -package com.kri.intranet.extension.dto.user.response; +package com.kri.intranet.extension.dto.user; import com.kri.intranet.extension.entity.user.UserBasicInfoEntity; import io.swagger.v3.oas.annotations.media.Schema; @@ -8,7 +8,7 @@ import lombok.Getter; @Getter @Builder @Schema(description = "사용자 ID/PW 검색 응답 DTO") -public class GetUserWithIdPwResponseDto { +public class UserBasicInfoDto { @Schema(description = "사용자 ID") private final String userId; @@ -26,8 +26,8 @@ public class GetUserWithIdPwResponseDto { private final int userRole; - public static GetUserWithIdPwResponseDto from(UserBasicInfoEntity e) { - return GetUserWithIdPwResponseDto.builder() + public static UserBasicInfoDto from(UserBasicInfoEntity e) { + return UserBasicInfoDto.builder() .userId(e.getUserId()) .userNm(e.getUserName()) .userTeam(e.getUserTeam()) diff --git a/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java b/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java index e0c902d..08f5f3f 100644 --- a/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java +++ b/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java @@ -13,4 +13,8 @@ public interface ProjectMapper { @Param("childSn") String childSn, @Param("keyword") String keyword ); + + List selectProjectTop10OnlyKeyword( + @Param("keyword") String keyword + ); } diff --git a/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java b/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java index d469fbc..b91584c 100644 --- a/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java +++ b/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java @@ -13,4 +13,10 @@ public interface UserMapper { @Param("userId") String userId, @Param("userPw") String userPw ); + + List selectUser(); + + boolean selectExistUser(@Param("userId") String userId); + + List selectUserIdList(); } diff --git a/src/main/java/com/kri/intranet/extension/service/ProjectService.java b/src/main/java/com/kri/intranet/extension/service/ProjectService.java index e35939f..25a9db8 100644 --- a/src/main/java/com/kri/intranet/extension/service/ProjectService.java +++ b/src/main/java/com/kri/intranet/extension/service/ProjectService.java @@ -25,4 +25,12 @@ public class ProjectService { .map(GetProjectTop10ResponseDto::from) .toList(); } + + public List getProjectTop10OnlyKeyword(String keyword){ + List entityList = projectMapper.selectProjectTop10OnlyKeyword(keyword); + + return entityList.stream() + .map(GetProjectTop10ResponseDto::from) + .toList(); + } } diff --git a/src/main/java/com/kri/intranet/extension/service/UserService.java b/src/main/java/com/kri/intranet/extension/service/UserService.java index 68e4d76..721d23d 100644 --- a/src/main/java/com/kri/intranet/extension/service/UserService.java +++ b/src/main/java/com/kri/intranet/extension/service/UserService.java @@ -2,7 +2,7 @@ package com.kri.intranet.extension.service; import com.kri.common.web.BusinessException; import com.kri.intranet.extension.dto.user.request.GetUserWithIdPwRequestDto; -import com.kri.intranet.extension.dto.user.response.GetUserWithIdPwResponseDto; +import com.kri.intranet.extension.dto.user.UserBasicInfoDto; import com.kri.intranet.extension.entity.user.UserBasicInfoEntity; import com.kri.intranet.extension.mapper.UserMapper; import lombok.RequiredArgsConstructor; @@ -15,7 +15,7 @@ import java.util.List; public class UserService { private final UserMapper userMapper; - public GetUserWithIdPwResponseDto getUserWithIdPw(GetUserWithIdPwRequestDto getUserWithIdPwRequestDto) { + public UserBasicInfoDto getUserWithIdPw(GetUserWithIdPwRequestDto getUserWithIdPwRequestDto) { String userId = getUserWithIdPwRequestDto.getUserId(); String userPw = getUserWithIdPwRequestDto.getUserPw(); @@ -29,6 +29,20 @@ public class UserService { UserBasicInfoEntity entity = userBasicInfoEntityList.get(0); - return GetUserWithIdPwResponseDto.from(entity); + return UserBasicInfoDto.from(entity); + } + + public List getUserList(){ + return userMapper.selectUser().stream() + .map(UserBasicInfoDto::from) + .toList(); + } + + public boolean checkUserId(String userId){ + return !userMapper.selectExistUser(userId); + } + + public List getUserIdArray(){ + return userMapper.selectUserIdList(); } } diff --git a/src/main/resources/mybatis/mapper/ProjectMapper.xml b/src/main/resources/mybatis/mapper/ProjectMapper.xml index ffb8e1b..1ed91a9 100644 --- a/src/main/resources/mybatis/mapper/ProjectMapper.xml +++ b/src/main/resources/mybatis/mapper/ProjectMapper.xml @@ -4,13 +4,13 @@ + + + SELECT p_user_mail AS [user_id] , p_name as [user_name] @@ -13,10 +14,49 @@ CASE WHEN p_team_now 300 THEN 3001 ELSE 1001 END ELSE 1001 END AS [user_role] FROM project2.dbo.person - WHERE krc_in_date IS NOT NULL and krc_out_date = '' - AND (p_user_mail = #{userId} or p_user_mail = #{userId} + '@kric.com') + WHERE krc_in_date IS NOT NULL + AND krc_out_date = '' + AND p_user_mail = #{userMail} AND p_pass_new COLLATE Latin1_General_CS_AS = #{userPw} ORDER BY p_no + + + + +