commit b2e978c776927a9caa2f4fd9507f76767b09f08c Author: kric_jspark Date: Tue Nov 18 10:18:26 2025 +0900 251118_01_ENH : 인트라넷 확장 초기 세팅 및 프로젝트, 사용자 조회 구현 diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/application-dev.yml b/application-dev.yml new file mode 100644 index 0000000..83d6e80 --- /dev/null +++ b/application-dev.yml @@ -0,0 +1,6 @@ +spring: + datasource: + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://10.10.11.6:1433;databaseName=project2;encrypt=false + username: sa + password: krco#51304 \ No newline at end of file diff --git a/application-local.yml b/application-local.yml new file mode 100644 index 0000000..6ce9e4d --- /dev/null +++ b/application-local.yml @@ -0,0 +1,11 @@ +spring: + datasource: + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://10.10.11.6:1433;databaseName=project2;encrypt=false + username: sa + password: krco#51304 + +mybatis: + configuration: + map-underscore-to-camel-case: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/application-prod.yml b/application-prod.yml new file mode 100644 index 0000000..ce521bd --- /dev/null +++ b/application-prod.yml @@ -0,0 +1,6 @@ +spring: + datasource: + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + url: jdbc:sqlserver://1.235.195.34:1433;databaseName=project2;encrypt=false + username: sa + password: krco#51304 \ No newline at end of file diff --git a/application.yml b/application.yml new file mode 100644 index 0000000..456d1d4 --- /dev/null +++ b/application.yml @@ -0,0 +1,51 @@ +server: + port: 3031 + +spring: + application: + name: IntranetExtension + + profiles: + # 아무 설정 없을 때 기본으로 쓸 프로파일 + default: local + +logging: + file: + path: ./logs + +mybatis: + mapper-locations: classpath:/mybatis/mapper/**/*.xml + type-aliases-package: com.kri.intranet.extension.entity + configuration: + map-underscore-to-camel-case: true + +kri: + auth: + apikey: + enabled: true # API Key 인증 사용 여부 + header-name: "X-API-Key" # API Key 헤더 + + security: + enabled: true + public-paths: # 인증 없이 열어둘 URL + - /v3/api-docs/** + - /swagger-ui.html + - /swagger-ui/** + - /ping + + swagger: + enabled: true + title: "IntranetExtension API" + description: "인트라넷 확장 서비스 API" + version: "v1.0.0" + base-package: "com.kri.intranet.extension" + +common: + web: + enabled: true # 공통 Web 구성 사용 여부 (기본 true) + webmvc: + enabled: true # 공통 Webmvc 구성 사용 여부 (기본 true) + redis: + enabled: false # RedisQueueHelper 사용 시 true + scheduling: + enabled: false # @Scheduled 사용 시 true \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..aa24e56 --- /dev/null +++ b/build.gradle @@ -0,0 +1,63 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.7' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.kri' +version = '0.0.1-SNAPSHOT' +description = 'IntranetExtension' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +def giteaUser = findProperty("giteaUser") ?: "" +def giteaToken = findProperty("giteaToken") ?: "" +repositories { + mavenCentral() + + maven { + name = "gitea" + url = uri("https://gitea.kric.com/api/packages/KRi/maven") + //allowInsecureProtocol = true + credentials { + username = giteaUser + password = giteaToken + } + } +} + +dependencies { + implementation "com.kri.common:starter:1.0.15" + + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.11" + + implementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter:3.0.5' + implementation 'com.microsoft.sqlserver:mssql-jdbc:12.8.1.jre11' // 버전은 환경 맞춰 조정 + + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + developmentOnly 'org.springframework.boot:spring-boot-devtools' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.mybatis.spring.boot:mybatis-spring-boot-starter-test:3.0.5' + testImplementation 'org.springframework.security:spring-security-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..23d15a9 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ca2eaa3 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'intranet_extension' diff --git a/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java b/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java new file mode 100644 index 0000000..30df379 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/IntranetExtensionApplication.java @@ -0,0 +1,13 @@ +package com.kri.intranet.extension; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class IntranetExtensionApplication { + + public static void main(String[] args) { + SpringApplication.run(IntranetExtensionApplication.class, args); + } + +} diff --git a/src/main/java/com/kri/intranet/extension/controller/InternalJwtController.java b/src/main/java/com/kri/intranet/extension/controller/InternalJwtController.java new file mode 100644 index 0000000..de622b6 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/controller/InternalJwtController.java @@ -0,0 +1,37 @@ +package com.kri.intranet.extension.controller; + +import com.kri.common.auth.jwt.JwtService; +import com.kri.common.auth.jwt.JwtUserClaimsDto; +import com.kri.intranet.extension.dto.jwt.InternalJwtDto; +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; + +@Tag(name = "InternalJWT", description = "시간 제한 없는 내부 사용용 JWT 생성") +@RestController +@RequestMapping("/api/v1/internal/jwt") +@RequiredArgsConstructor +public class InternalJwtController { + + private final JwtService jwtService; + + @Operation( + summary = "내부 서비스용 JWT", + description = "시간 제한 없는 내부 사용용 JWT 생성" + ) + @PostMapping("generate") + public String generateInternalJwt(@RequestBody InternalJwtDto internalJwtDto) { + JwtUserClaimsDto internalClaims = JwtUserClaimsDto.builder() + .userId(internalJwtDto.getServiceId()) + .userTeam("SYSTEM") + .userName(internalJwtDto.getServiceName()) + .role(999) // 예: 내부 시스템용 권한코드 + .build(); + + return jwtService.generateAccessToken(internalClaims); + } +} diff --git a/src/main/java/com/kri/intranet/extension/controller/ProjectController.java b/src/main/java/com/kri/intranet/extension/controller/ProjectController.java new file mode 100644 index 0000000..fef0310 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/controller/ProjectController.java @@ -0,0 +1,31 @@ +package com.kri.intranet.extension.controller; + +import com.kri.intranet.extension.dto.project.request.GetProjectTop10RequestDto; +import com.kri.intranet.extension.dto.project.response.GetProjectTop10ResponseDto; +import com.kri.intranet.extension.service.ProjectService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/api/v1/project") +@RequiredArgsConstructor +@Tag(name = "Project", description = "프로젝트 조회 API") +public class ProjectController { + + private final ProjectService projectService; + + @Operation( + summary = "상위 10개 프로젝트 조회", + description = "p_child_sn, p_subject, p_intention 조건으로 최신 10건 프로젝트를 조회합니다." + ) + @PostMapping("search/top10") + public List getProjectTop10( + @RequestBody GetProjectTop10RequestDto getProjectTop10RequestDto + ) { + return projectService.getProjectTop10(getProjectTop10RequestDto); + } +} diff --git a/src/main/java/com/kri/intranet/extension/controller/UserController.java b/src/main/java/com/kri/intranet/extension/controller/UserController.java new file mode 100644 index 0000000..bed3c3a --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/controller/UserController.java @@ -0,0 +1,33 @@ +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.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; + +@RestController +@RequestMapping("/api/v1/user") +@RequiredArgsConstructor +@Tag(name = "User", description = "사용자 조회 API") +public class UserController { + + private final UserService userService; + + @Operation( + summary = "사용자 정보 조회", + description = "ID/PW로 사용자 정보 조회" + ) + @PostMapping("search/login-info") + public GetUserWithIdPwResponseDto getUserWithIdPw( + @RequestBody GetUserWithIdPwRequestDto getUserWithIdPwRequestDto + ) { + return userService.getUserWithIdPw(getUserWithIdPwRequestDto); + } + +} diff --git a/src/main/java/com/kri/intranet/extension/dto/jwt/InternalJwtDto.java b/src/main/java/com/kri/intranet/extension/dto/jwt/InternalJwtDto.java new file mode 100644 index 0000000..74714a3 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/dto/jwt/InternalJwtDto.java @@ -0,0 +1,16 @@ +package com.kri.intranet.extension.dto.jwt; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; + +@Builder +@Getter +@Setter +@AllArgsConstructor +public class InternalJwtDto { + @Schema(description = "서비스 ID ex) INTRANET_EXTENSION") + private String serviceId; + + @Schema(description = "서비스명 ex) Intranet Extension Service") + private String serviceName; +} diff --git a/src/main/java/com/kri/intranet/extension/dto/project/request/GetProjectTop10RequestDto.java b/src/main/java/com/kri/intranet/extension/dto/project/request/GetProjectTop10RequestDto.java new file mode 100644 index 0000000..7e22d36 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/dto/project/request/GetProjectTop10RequestDto.java @@ -0,0 +1,17 @@ +package com.kri.intranet.extension.dto.project.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "프로젝트 검색 조건 DTO") +public class GetProjectTop10RequestDto { + + @Schema(description = "프로젝트 자식 일련번호 (p_child_sn LIKE 검색)") + private String childSn; // p_child_sn용 파라미터 + + @Schema(description = "제목/의도 통합 키워드 (p_subject / p_intention 공용)") + private String keyword; // p_subject + p_intention 공용 파라미터 +} diff --git a/src/main/java/com/kri/intranet/extension/dto/project/response/GetProjectTop10ResponseDto.java b/src/main/java/com/kri/intranet/extension/dto/project/response/GetProjectTop10ResponseDto.java new file mode 100644 index 0000000..4376425 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/dto/project/response/GetProjectTop10ResponseDto.java @@ -0,0 +1,33 @@ +package com.kri.intranet.extension.dto.project.response; + +import com.kri.intranet.extension.entity.project.ProjectBasicInfoEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "프로젝트 조회 결과 DTO") +public class GetProjectTop10ResponseDto { + + @Schema(description = "프로젝트 자코드 (p_child_sn)") + private final String childSn; + + @Schema(description = "프로젝트 제목 (p_subject 또는 p_subject )") + private final String title; + + @Schema(description = "연구팀 코드 (p_rsch_team)") + private final String researchTeam; + + @Schema(description = "연구팀 명 (p_rsch_team_name)") + private final String researchTeamName; + + public static GetProjectTop10ResponseDto from(ProjectBasicInfoEntity e){ + return GetProjectTop10ResponseDto.builder() + .childSn(e.getPChildSn()) + .title(e.getPTitle()) + .researchTeam(e.getPRschTeam()) + .researchTeamName(e.getPRschTeamName()) + .build(); + } +} diff --git a/src/main/java/com/kri/intranet/extension/dto/user/request/GetUserWithIdPwRequestDto.java b/src/main/java/com/kri/intranet/extension/dto/user/request/GetUserWithIdPwRequestDto.java new file mode 100644 index 0000000..de543e1 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/dto/user/request/GetUserWithIdPwRequestDto.java @@ -0,0 +1,17 @@ +package com.kri.intranet.extension.dto.user.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "사용자 ID/PW 검색 요청 DTO") +public class GetUserWithIdPwRequestDto { + + @Schema(description = "사용자 ID") + private String userId; + + @Schema(description = "사용자 PW") + private String userPw; +} \ 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/response/GetUserWithIdPwResponseDto.java new file mode 100644 index 0000000..ad7a73c --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/dto/user/response/GetUserWithIdPwResponseDto.java @@ -0,0 +1,33 @@ +package com.kri.intranet.extension.dto.user.response; + +import com.kri.intranet.extension.entity.user.UserBasicInfoEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "사용자 ID/PW 검색 응답 DTO") +public class GetUserWithIdPwResponseDto { + @Schema(description = "사용자 ID (p_user_mail)") + private final String userId; + + @Schema(description = "사용자 이름 (p_name)") + private final String userNm; + + @Schema(description = "사용자 팀 (p_depart_now + p_team_now)") + private final String userTeam; + + @Schema(description = "사용자 역할") + private final int userRole; + + + public static GetUserWithIdPwResponseDto from(UserBasicInfoEntity e) { + return GetUserWithIdPwResponseDto.builder() + .userId(e.getUserId()) + .userNm(e.getUserName()) + .userTeam(e.getUserTeam()) + .userRole(e.getUserRole()) + .build(); + } +} diff --git a/src/main/java/com/kri/intranet/extension/entity/project/ProjectBasicInfoEntity.java b/src/main/java/com/kri/intranet/extension/entity/project/ProjectBasicInfoEntity.java new file mode 100644 index 0000000..73e187a --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/entity/project/ProjectBasicInfoEntity.java @@ -0,0 +1,14 @@ +package com.kri.intranet.extension.entity.project; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ProjectBasicInfoEntity { + + private String pChildSn; // p_child_sn + private String pTitle; // p_title (subject + ) + private String pRschTeam; // p_rsch_team + private String pRschTeamName; // p_rsch_team_name +} diff --git a/src/main/java/com/kri/intranet/extension/entity/user/UserBasicInfoEntity.java b/src/main/java/com/kri/intranet/extension/entity/user/UserBasicInfoEntity.java new file mode 100644 index 0000000..f8d8007 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/entity/user/UserBasicInfoEntity.java @@ -0,0 +1,14 @@ +package com.kri.intranet.extension.entity.user; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class UserBasicInfoEntity { + + private String userId; + private String userName; + private String userTeam; + private int userRole; +} diff --git a/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java b/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java new file mode 100644 index 0000000..e0c902d --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/mapper/ProjectMapper.java @@ -0,0 +1,16 @@ +package com.kri.intranet.extension.mapper; + +import com.kri.intranet.extension.entity.project.ProjectBasicInfoEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface ProjectMapper { + + List selectProjectTop10( + @Param("childSn") String childSn, + @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 new file mode 100644 index 0000000..d469fbc --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/mapper/UserMapper.java @@ -0,0 +1,16 @@ +package com.kri.intranet.extension.mapper; + +import com.kri.intranet.extension.entity.user.UserBasicInfoEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface UserMapper { + + List selectUserWithIdPw( + @Param("userId") String userId, + @Param("userPw") String userPw + ); +} diff --git a/src/main/java/com/kri/intranet/extension/service/ProjectService.java b/src/main/java/com/kri/intranet/extension/service/ProjectService.java new file mode 100644 index 0000000..e35939f --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/service/ProjectService.java @@ -0,0 +1,28 @@ +package com.kri.intranet.extension.service; + + +import com.kri.intranet.extension.dto.project.request.GetProjectTop10RequestDto; +import com.kri.intranet.extension.dto.project.response.GetProjectTop10ResponseDto; +import com.kri.intranet.extension.entity.project.ProjectBasicInfoEntity; +import com.kri.intranet.extension.mapper.ProjectMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class ProjectService { + private final ProjectMapper projectMapper; + + public List getProjectTop10(GetProjectTop10RequestDto getProjectTop10RequestDto){ + String childSn = getProjectTop10RequestDto.getChildSn(); + String keyword = getProjectTop10RequestDto.getKeyword(); + + List entityList = projectMapper.selectProjectTop10(childSn,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 new file mode 100644 index 0000000..68e4d76 --- /dev/null +++ b/src/main/java/com/kri/intranet/extension/service/UserService.java @@ -0,0 +1,34 @@ +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.entity.user.UserBasicInfoEntity; +import com.kri.intranet.extension.mapper.UserMapper; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class UserService { + private final UserMapper userMapper; + + public GetUserWithIdPwResponseDto getUserWithIdPw(GetUserWithIdPwRequestDto getUserWithIdPwRequestDto) { + String userId = getUserWithIdPwRequestDto.getUserId(); + String userPw = getUserWithIdPwRequestDto.getUserPw(); + + List userBasicInfoEntityList = userMapper.selectUserWithIdPw(userId,userPw); + + if(userBasicInfoEntityList.isEmpty()){ + throw BusinessException.notFound("USER_NOT_FOUND", "사용자가 없습니다.") + .with("userId", userId) + .with("userPw", userPw); + } + + UserBasicInfoEntity entity = userBasicInfoEntityList.get(0); + + return GetUserWithIdPwResponseDto.from(entity); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..5adbf52 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=IntranetExtension diff --git a/src/main/resources/mybatis/mapper/ProjectMapper.xml b/src/main/resources/mybatis/mapper/ProjectMapper.xml new file mode 100644 index 0000000..ffb8e1b --- /dev/null +++ b/src/main/resources/mybatis/mapper/ProjectMapper.xml @@ -0,0 +1,33 @@ + + + + + + + diff --git a/src/main/resources/mybatis/mapper/UserMapper.xml b/src/main/resources/mybatis/mapper/UserMapper.xml new file mode 100644 index 0000000..61f873c --- /dev/null +++ b/src/main/resources/mybatis/mapper/UserMapper.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/src/test/java/com/kri/intranet/extension/IntranetExtensionApplicationTests.java b/src/test/java/com/kri/intranet/extension/IntranetExtensionApplicationTests.java new file mode 100644 index 0000000..fec3a8f --- /dev/null +++ b/src/test/java/com/kri/intranet/extension/IntranetExtensionApplicationTests.java @@ -0,0 +1,13 @@ +package com.kri.intranet.extension; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class IntranetExtensionApplicationTests { + + @Test + void contextLoads() { + } + +}