diff --git a/build.gradle b/build.gradle index d813758..f4ba40d 100644 --- a/build.gradle +++ b/build.gradle @@ -37,7 +37,7 @@ repositories { } dependencies { - implementation "com.kri.common:starter:beta.1.1.32" + implementation "com.kri.common:starter:beta.1.3.0" 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/UserController.java b/src/main/java/com/kri/intranet/extension/controller/UserController.java index e5f75a1..25c8e6a 100644 --- a/src/main/java/com/kri/intranet/extension/controller/UserController.java +++ b/src/main/java/com/kri/intranet/extension/controller/UserController.java @@ -1,5 +1,6 @@ package com.kri.intranet.extension.controller; +import com.kri.intranet.extension.dto.user.GroupCodeInfoDto; import com.kri.intranet.extension.dto.user.request.GetUserWithIdPwRequestDto; import com.kri.intranet.extension.dto.user.UserBasicInfoDto; import com.kri.intranet.extension.service.UserService; @@ -53,4 +54,13 @@ public class UserController { public List getUserIdArray() { return userService.getUserIdArray(); } + + @Operation( + summary = "그룹 코드 목록 조회", + description = "그룹 코드 목록 조회" + ) + @GetMapping("group-code-list") + public List getGroupCodeList() { + return userService.getGroupCodeList(); + } } \ No newline at end of file diff --git a/src/main/java/com/kri/intranet/extension/dto/user/GroupCodeInfoDto.java b/src/main/java/com/kri/intranet/extension/dto/user/GroupCodeInfoDto.java new file mode 100644 index 0000000..8cdb15b --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/dto/user/GroupCodeInfoDto.java @@ -0,0 +1,25 @@ +package com.kri.intranet.extension.dto.user; + +import com.kri.intranet.extension.entity.user.GroupCodeInfoEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "그룹 코드 정보 Dto") +public class GroupCodeInfoDto { + + @Schema(description = "그룹 코드") + private String groupCode; + + @Schema(description = "그룹 코드 레이블") + private String groupCodeLabel; + + public static GroupCodeInfoDto from(GroupCodeInfoEntity groupCodeInfo) { + return GroupCodeInfoDto.builder() + .groupCode(groupCodeInfo.getGroupCode()) + .groupCodeLabel(groupCodeInfo.getGroupCodeLabel()) + .build(); + } +} diff --git a/src/main/java/com/kri/intranet/extension/entity/user/GroupCodeInfoEntity.java b/src/main/java/com/kri/intranet/extension/entity/user/GroupCodeInfoEntity.java new file mode 100644 index 0000000..8c276c2 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/entity/user/GroupCodeInfoEntity.java @@ -0,0 +1,11 @@ +package com.kri.intranet.extension.entity.user; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GroupCodeInfoEntity { + private String groupCode; + private String groupCodeLabel; +} 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 b91584c..185517d 100644 --- a/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java +++ b/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java @@ -1,5 +1,6 @@ package com.kri.intranet.extension.mapper; +import com.kri.intranet.extension.entity.user.GroupCodeInfoEntity; import com.kri.intranet.extension.entity.user.UserBasicInfoEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,4 +20,6 @@ public interface UserMapper { boolean selectExistUser(@Param("userId") String userId); List selectUserIdList(); + + List selectGroupCodeInfo(); } 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 e3a48dc..1e10079 100644 --- a/src/main/java/com/kri/intranet/extension/service/UserService.java +++ b/src/main/java/com/kri/intranet/extension/service/UserService.java @@ -1,6 +1,7 @@ package com.kri.intranet.extension.service; import com.kri.common.feature.web.BusinessException; +import com.kri.intranet.extension.dto.user.GroupCodeInfoDto; import com.kri.intranet.extension.dto.user.request.GetUserWithIdPwRequestDto; import com.kri.intranet.extension.dto.user.UserBasicInfoDto; import com.kri.intranet.extension.entity.user.UserBasicInfoEntity; @@ -45,4 +46,10 @@ public class UserService { public List getUserIdArray() { return userMapper.selectUserIdList(); } + + public List getGroupCodeList() { + return userMapper.selectGroupCodeInfo().stream() + .map(GroupCodeInfoDto::from) + .toList(); + } } diff --git a/src/main/resources/mybatis/mapper/UserMapper.xml b/src/main/resources/mybatis/mapper/UserMapper.xml index 05f7adf..8aac785 100644 --- a/src/main/resources/mybatis/mapper/UserMapper.xml +++ b/src/main/resources/mybatis/mapper/UserMapper.xml @@ -60,4 +60,13 @@ WHERE krc_in_date IS NOT NULL AND krc_out_date = '' + +