251222_04_ENH : RequestBody에 Valid 적용 및 중괄호 스타일 통일
This commit is contained in:
@@ -4,7 +4,9 @@ import com.kri.common.datetime.DateTimeUtil;
|
|||||||
import com.kri.common.webmvc.RequestUserContext;
|
import com.kri.common.webmvc.RequestUserContext;
|
||||||
import com.kri.contact.server.service.AssignService;
|
import com.kri.contact.server.service.AssignService;
|
||||||
import com.kri.contact.server.service.SystemEventLogService;
|
import com.kri.contact.server.service.SystemEventLogService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
|
|
||||||
@@ -20,16 +22,19 @@ public class AssignController {
|
|||||||
private final SystemEventLogService systemEventLogService;
|
private final SystemEventLogService systemEventLogService;
|
||||||
private final AssignService assignService;
|
private final AssignService assignService;
|
||||||
|
|
||||||
|
@Operation(summary = "배정된 외주사 조회")
|
||||||
@GetMapping("/prjct-outsource/{prjctIdx}")
|
@GetMapping("/prjct-outsource/{prjctIdx}")
|
||||||
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx) {
|
public List<String> getPrjctOutsourceAssign(@PathVariable Long prjctIdx) {
|
||||||
return assignService.getPrjctOutsourceAssign(prjctIdx);
|
return assignService.getPrjctOutsourceAssign(prjctIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "배정된 컨택원/면접원 조회")
|
||||||
@GetMapping("/prjct-fieldwork/{prjctIdx}")
|
@GetMapping("/prjct-fieldwork/{prjctIdx}")
|
||||||
public List<String> getPrjctFieldworkAssign(@PathVariable Long prjctIdx) {
|
public List<String> getPrjctFieldworkAssign(@PathVariable Long prjctIdx) {
|
||||||
return assignService.getPrjctFieldworkAssign(prjctIdx);
|
return assignService.getPrjctFieldworkAssign(prjctIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "컨택원/면접원 배정")
|
||||||
@PutMapping("/prjct-fieldwork/{prjctIdx}")
|
@PutMapping("/prjct-fieldwork/{prjctIdx}")
|
||||||
public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List<String> assignUserIdList, RequestUserContext ctx) {
|
public void upsertPrjctFieldworkAssign(@PathVariable Long prjctIdx, @RequestBody List<String> assignUserIdList, RequestUserContext ctx) {
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.kri.contact.server.dto.LoginRequestDto;
|
|||||||
import com.kri.contact.server.dto.LoginResponseDto;
|
import com.kri.contact.server.dto.LoginResponseDto;
|
||||||
import com.kri.contact.server.service.AuthService;
|
import com.kri.contact.server.service.AuthService;
|
||||||
import com.kri.contact.server.service.SystemEventLogService;
|
import com.kri.contact.server.service.SystemEventLogService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@@ -20,6 +21,7 @@ public class AuthController {
|
|||||||
private final AuthService authService;
|
private final AuthService authService;
|
||||||
private final SystemEventLogService systemEventLogService;
|
private final SystemEventLogService systemEventLogService;
|
||||||
|
|
||||||
|
@Operation(summary = "로그인 요청")
|
||||||
@PostMapping("/login")
|
@PostMapping("/login")
|
||||||
public LoginResponseDto tryLogin(@RequestBody LoginRequestDto request, RequestUserContext ctx) {
|
public LoginResponseDto tryLogin(@RequestBody LoginRequestDto request, RequestUserContext ctx) {
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
@@ -30,6 +32,7 @@ public class AuthController {
|
|||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "로그아웃 요청")
|
||||||
@PostMapping("/logout/{userId}")
|
@PostMapping("/logout/{userId}")
|
||||||
public boolean logout(@PathVariable String userId, RequestUserContext ctx) {
|
public boolean logout(@PathVariable String userId, RequestUserContext ctx) {
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
|
|||||||
@@ -7,7 +7,9 @@ import com.kri.contact.server.dto.common.PageResponseDto;
|
|||||||
import com.kri.contact.server.service.FileService;
|
import com.kri.contact.server.service.FileService;
|
||||||
import com.kri.contact.server.service.ProjectService;
|
import com.kri.contact.server.service.ProjectService;
|
||||||
import com.kri.contact.server.service.SystemEventLogService;
|
import com.kri.contact.server.service.SystemEventLogService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
import org.springframework.web.multipart.MultipartFile;
|
import org.springframework.web.multipart.MultipartFile;
|
||||||
@@ -25,11 +27,13 @@ public class ProjectController {
|
|||||||
private final ProjectService projectService;
|
private final ProjectService projectService;
|
||||||
private final FileService fileService;
|
private final FileService fileService;
|
||||||
|
|
||||||
|
@Operation(summary = "프로젝트 조회")
|
||||||
@GetMapping("/{prjctIdx}")
|
@GetMapping("/{prjctIdx}")
|
||||||
public ProjectInfoDto getProject(@PathVariable Long prjctIdx) {
|
public ProjectInfoDto getProject(@PathVariable Long prjctIdx) {
|
||||||
return projectService.getProject(prjctIdx);
|
return projectService.getProject(prjctIdx);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "상위 프로젝트 조회(생성일자 늦은 순)")
|
||||||
@GetMapping("/top/{topCount}")
|
@GetMapping("/top/{topCount}")
|
||||||
public List<ProjectInfoDto> getTopProject(
|
public List<ProjectInfoDto> getTopProject(
|
||||||
@PathVariable int topCount,
|
@PathVariable int topCount,
|
||||||
@@ -39,6 +43,7 @@ public class ProjectController {
|
|||||||
return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserRole());
|
return projectService.getTopProject(topCount, keyword, ctx.getUserId(), ctx.getUserRole());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "프로젝트 목록 조회")
|
||||||
@PostMapping("/list")
|
@PostMapping("/list")
|
||||||
public PageResponseDto<ProjectInfoDto> searchProject(
|
public PageResponseDto<ProjectInfoDto> searchProject(
|
||||||
@RequestBody ProjectSearchRequestDto req,
|
@RequestBody ProjectSearchRequestDto req,
|
||||||
@@ -47,14 +52,16 @@ public class ProjectController {
|
|||||||
return projectService.searchProject(req, ctx.getUserId(), ctx.getUserRole());
|
return projectService.searchProject(req, ctx.getUserId(), ctx.getUserRole());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "프로젝트를 소유하고 있는 모든 부서/실사 목록 조회")
|
||||||
@GetMapping("/owner-list")
|
@GetMapping("/owner-list")
|
||||||
public ProjectOwnerResponseDto getOwnerList(RequestUserContext ctx) {
|
public ProjectOwnerResponseDto getOwnerList(RequestUserContext ctx) {
|
||||||
return projectService.getOwnerList(ctx.getUserRole());
|
return projectService.getOwnerList(ctx.getUserRole());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "프로젝트 생성")
|
||||||
@PutMapping()
|
@PutMapping()
|
||||||
public ProjectInfoDto createProject(
|
public ProjectInfoDto createProject(
|
||||||
@RequestBody ProjectCreateRequestDto req,
|
@Valid @RequestBody ProjectCreateRequestDto req,
|
||||||
RequestUserContext ctx
|
RequestUserContext ctx
|
||||||
) {
|
) {
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
@@ -65,15 +72,17 @@ public class ProjectController {
|
|||||||
return prjctInfo;
|
return prjctInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "시나리오 이미지 업로드")
|
||||||
@PutMapping("/senario-image/{prjctCd}")
|
@PutMapping("/senario-image/{prjctCd}")
|
||||||
public String uploadContactSenarioImage(@PathVariable String prjctCd, @RequestParam("file") MultipartFile file) {
|
public String uploadContactSenarioImage(@PathVariable String prjctCd, @RequestParam("file") MultipartFile file) {
|
||||||
return fileService.storeTempFile(prjctCd, file);
|
return fileService.storeTempFile(prjctCd, file);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "프로젝트 수정")
|
||||||
@PatchMapping("/{prjctIdx}")
|
@PatchMapping("/{prjctIdx}")
|
||||||
public void updateProject(
|
public void updateProject(
|
||||||
@PathVariable long prjctIdx,
|
@PathVariable long prjctIdx,
|
||||||
@RequestBody ProjectUpdateRequestDto req,
|
@Valid @RequestBody ProjectUpdateRequestDto req,
|
||||||
RequestUserContext ctx
|
RequestUserContext ctx
|
||||||
) {
|
) {
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
@@ -89,6 +98,7 @@ public class ProjectController {
|
|||||||
systemEventLogService.writeUpdateProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req);
|
systemEventLogService.writeUpdateProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "프로젝트 삭제(소프트 삭제)")
|
||||||
@DeleteMapping("/{prjctIdx}")
|
@DeleteMapping("/{prjctIdx}")
|
||||||
public void deleteProject(@PathVariable Long prjctIdx, RequestUserContext ctx) {
|
public void deleteProject(@PathVariable Long prjctIdx, RequestUserContext ctx) {
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import com.kri.contact.server.common.enums.ResultCodeType;
|
|||||||
import com.kri.contact.server.dto.ResultCodeDto;
|
import com.kri.contact.server.dto.ResultCodeDto;
|
||||||
import com.kri.contact.server.service.ResultCodeService;
|
import com.kri.contact.server.service.ResultCodeService;
|
||||||
import com.kri.contact.server.service.SystemEventLogService;
|
import com.kri.contact.server.service.SystemEventLogService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@@ -20,6 +21,7 @@ public class ResultCodeController {
|
|||||||
private final SystemEventLogService systemEventLogService;
|
private final SystemEventLogService systemEventLogService;
|
||||||
private final ResultCodeService resultCodeService;
|
private final ResultCodeService resultCodeService;
|
||||||
|
|
||||||
|
@Operation(summary = "결과 코드 조회")
|
||||||
@GetMapping("/{prjctIdx}")
|
@GetMapping("/{prjctIdx}")
|
||||||
public List<ResultCodeDto> getResultCodeList(
|
public List<ResultCodeDto> getResultCodeList(
|
||||||
@PathVariable long prjctIdx,
|
@PathVariable long prjctIdx,
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ package com.kri.contact.server.controller;
|
|||||||
import com.kri.common.webmvc.RequestUserContext;
|
import com.kri.common.webmvc.RequestUserContext;
|
||||||
import com.kri.contact.server.dto.RoleInfoDto;
|
import com.kri.contact.server.dto.RoleInfoDto;
|
||||||
import com.kri.contact.server.service.RoleService;
|
import com.kri.contact.server.service.RoleService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.web.bind.annotation.GetMapping;
|
import org.springframework.web.bind.annotation.GetMapping;
|
||||||
@@ -18,6 +19,7 @@ import java.util.List;
|
|||||||
public class RoleController {
|
public class RoleController {
|
||||||
private final RoleService roleService;
|
private final RoleService roleService;
|
||||||
|
|
||||||
|
@Operation(summary = "권한 목록 조회")
|
||||||
@GetMapping()
|
@GetMapping()
|
||||||
public List<RoleInfoDto> getRoleList(RequestUserContext ctx) {
|
public List<RoleInfoDto> getRoleList(RequestUserContext ctx) {
|
||||||
return roleService.getRoleList(ctx.getUserRole());
|
return roleService.getRoleList(ctx.getUserRole());
|
||||||
|
|||||||
@@ -9,7 +9,9 @@ import com.kri.contact.server.dto.UserInfoDto;
|
|||||||
import com.kri.contact.server.dto.systemlog.UploadUserContentDto;
|
import com.kri.contact.server.dto.systemlog.UploadUserContentDto;
|
||||||
import com.kri.contact.server.service.SystemEventLogService;
|
import com.kri.contact.server.service.SystemEventLogService;
|
||||||
import com.kri.contact.server.service.UserService;
|
import com.kri.contact.server.service.UserService;
|
||||||
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||||
|
import jakarta.validation.Valid;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
@@ -29,16 +31,19 @@ public class UserController {
|
|||||||
private final UserService userService;
|
private final UserService userService;
|
||||||
private final SystemEventLogService systemEventLogService;
|
private final SystemEventLogService systemEventLogService;
|
||||||
|
|
||||||
|
@Operation(summary = "ID 가용 여부 검사")
|
||||||
@GetMapping("/check-user-id")
|
@GetMapping("/check-user-id")
|
||||||
public DataVerificationDto checkUserId(@RequestParam String userId) {
|
public DataVerificationDto checkUserId(@RequestParam String userId) {
|
||||||
return userService.checkUserId(userId);
|
return userService.checkUserId(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 정보 조회")
|
||||||
@GetMapping("/{userId}")
|
@GetMapping("/{userId}")
|
||||||
public UserInfoDto getUser(@PathVariable String userId) {
|
public UserInfoDto getUser(@PathVariable String userId) {
|
||||||
return userService.getUser(userId);
|
return userService.getUser(userId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 목록 조회")
|
||||||
@GetMapping()
|
@GetMapping()
|
||||||
public List<UserInfoDto> getUserList(RequestUserContext ctx) {
|
public List<UserInfoDto> getUserList(RequestUserContext ctx) {
|
||||||
String searchCmpn = ctx.getUserCmpn();
|
String searchCmpn = ctx.getUserCmpn();
|
||||||
@@ -50,6 +55,7 @@ public class UserController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "컨택원/면접원 목록 조회")
|
||||||
@GetMapping("fieldwork")
|
@GetMapping("fieldwork")
|
||||||
public List<UserInfoDto> getFiledoworkUserList(RequestUserContext ctx) {
|
public List<UserInfoDto> getFiledoworkUserList(RequestUserContext ctx) {
|
||||||
String searchCmpn = ctx.getUserCmpn();
|
String searchCmpn = ctx.getUserCmpn();
|
||||||
@@ -60,11 +66,13 @@ public class UserController {
|
|||||||
return userService.getFieldworkUserListWithCmpn(searchCmpn);
|
return userService.getFieldworkUserListWithCmpn(searchCmpn);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "외주사 목록 조회")
|
||||||
@GetMapping("outsource")
|
@GetMapping("outsource")
|
||||||
List<UserInfoDto> getOutsourceList() {
|
List<UserInfoDto> getOutsourceList() {
|
||||||
return userService.getOutsourceList();
|
return userService.getOutsourceList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 회사 목록 조회")
|
||||||
@GetMapping("cmpn")
|
@GetMapping("cmpn")
|
||||||
public List<String> getUserCmpnList(RequestUserContext ctx) {
|
public List<String> getUserCmpnList(RequestUserContext ctx) {
|
||||||
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) {
|
if(ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) {
|
||||||
@@ -74,8 +82,9 @@ public class UserController {
|
|||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 생성")
|
||||||
@PutMapping
|
@PutMapping
|
||||||
public void createUser(@RequestBody UserInfoDto userInfo, RequestUserContext ctx){
|
public void createUser(@Valid @RequestBody UserInfoDto userInfo, RequestUserContext ctx) {
|
||||||
String regId = ctx.getUserId();
|
String regId = ctx.getUserId();
|
||||||
String clientIp = ctx.getClientIp();
|
String clientIp = ctx.getClientIp();
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
@@ -84,6 +93,7 @@ public class UserController {
|
|||||||
systemEventLogService.writeCreateUserLog(regId, now, clientIp, userInfo);
|
systemEventLogService.writeCreateUserLog(regId, now, clientIp, userInfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 일괄 생성(엑셀 업로드)")
|
||||||
@PostMapping("/excel")
|
@PostMapping("/excel")
|
||||||
public ExcelUploadResponseDto createUserFromExcel(
|
public ExcelUploadResponseDto createUserFromExcel(
|
||||||
@RequestPart("file") MultipartFile file,
|
@RequestPart("file") MultipartFile file,
|
||||||
@@ -107,6 +117,7 @@ public class UserController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 일괄 생성 양식 다운로드")
|
||||||
@PostMapping("/excel/template")
|
@PostMapping("/excel/template")
|
||||||
public ResponseEntity<byte[]> exportUserTemplate() {
|
public ResponseEntity<byte[]> exportUserTemplate() {
|
||||||
byte[] bytes = userService.exportUserTemplate();
|
byte[] bytes = userService.exportUserTemplate();
|
||||||
@@ -119,8 +130,9 @@ public class UserController {
|
|||||||
.body(bytes);
|
.body(bytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 정보 수정")
|
||||||
@PatchMapping()
|
@PatchMapping()
|
||||||
public void updateUser(@RequestBody UserInfoDto dto, RequestUserContext ctx){
|
public void updateUser(@Valid @RequestBody UserInfoDto dto, RequestUserContext ctx) {
|
||||||
String modId = ctx.getUserId();
|
String modId = ctx.getUserId();
|
||||||
String clientIp = ctx.getClientIp();
|
String clientIp = ctx.getClientIp();
|
||||||
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
|
||||||
@@ -129,6 +141,7 @@ public class UserController {
|
|||||||
systemEventLogService.writeUpdateUserLog(modId, now, clientIp, dto);
|
systemEventLogService.writeUpdateUserLog(modId, now, clientIp, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Operation(summary = "사용자 삭제(소프트 삭제)")
|
||||||
@DeleteMapping("/{userId}")
|
@DeleteMapping("/{userId}")
|
||||||
public void deleteUser(@PathVariable String userId, RequestUserContext ctx) {
|
public void deleteUser(@PathVariable String userId, RequestUserContext ctx) {
|
||||||
String regId = ctx.getUserId();
|
String regId = ctx.getUserId();
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package com.kri.contact.server.dto;
|
package com.kri.contact.server.dto;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
@Getter
|
@Getter
|
||||||
@@ -9,15 +11,23 @@ import lombok.*;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Schema(description = "프로젝트 생성 요청")
|
@Schema(description = "프로젝트 생성 요청")
|
||||||
public class ProjectCreateRequestDto {
|
public class ProjectCreateRequestDto {
|
||||||
|
@Size(max = 128)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "프로젝트 명")
|
@Schema(description = "프로젝트 명")
|
||||||
private String prjctName;
|
private String prjctName;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "인트라넷 프로젝트 코드")
|
@Schema(description = "인트라넷 프로젝트 코드")
|
||||||
private String itrntPrjctCd;
|
private String itrntPrjctCd;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "담당 그룹")
|
@Schema(description = "담당 그룹")
|
||||||
private String ownerDept;
|
private String ownerDept;
|
||||||
|
|
||||||
|
@Size(max = 16)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "담당 실사")
|
@Schema(description = "담당 실사")
|
||||||
private String ownerFw;
|
private String ownerFw;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ import com.kri.contact.server.common.enums.ProjectStatus;
|
|||||||
import com.kri.contact.server.common.enums.SurveyType;
|
import com.kri.contact.server.common.enums.SurveyType;
|
||||||
import com.kri.contact.server.persistence.entity.TPrjctEntity;
|
import com.kri.contact.server.persistence.entity.TPrjctEntity;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -16,45 +19,63 @@ import java.time.LocalDateTime;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Schema(description = "프로젝트 정보")
|
@Schema(description = "프로젝트 정보")
|
||||||
public class ProjectInfoDto {
|
public class ProjectInfoDto {
|
||||||
|
@NotNull
|
||||||
@Schema(description = "프로젝트 고유 번호")
|
@Schema(description = "프로젝트 고유 번호")
|
||||||
private Long prjctIdx;
|
private Long prjctIdx;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "프로젝트 코드")
|
@Schema(description = "프로젝트 코드")
|
||||||
private String prjctCd;
|
private String prjctCd;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
@Schema(description = "프로젝트 진행 상태")
|
@Schema(description = "프로젝트 진행 상태")
|
||||||
private ProjectStatus prjctStatus;
|
private ProjectStatus prjctStatus;
|
||||||
|
|
||||||
|
@Size(max = 128)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "프로젝트 명")
|
@Schema(description = "프로젝트 명")
|
||||||
private String prjctName;
|
private String prjctName;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "인트라넷 프로젝트 코드")
|
@Schema(description = "인트라넷 프로젝트 코드")
|
||||||
private String itrntPrjctCd;
|
private String itrntPrjctCd;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "담당 그룹")
|
@Schema(description = "담당 그룹")
|
||||||
private String ownerDept;
|
private String ownerDept;
|
||||||
|
|
||||||
|
@Size(max = 16)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "담당 실사")
|
@Schema(description = "담당 실사")
|
||||||
private String ownerFw;
|
private String ownerFw;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
@Schema(description = "설문지 타입")
|
@Schema(description = "설문지 타입")
|
||||||
private SurveyType surveyTy;
|
private SurveyType surveyTy;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
@Schema(description = "내부 설문 시스템 프로젝트 코드")
|
@Schema(description = "내부 설문 시스템 프로젝트 코드")
|
||||||
private String surveyPrjctCd;
|
private String surveyPrjctCd;
|
||||||
|
|
||||||
|
@Size(max = 128)
|
||||||
@Schema(description = "설문 URL")
|
@Schema(description = "설문 URL")
|
||||||
private String surveyUrl;
|
private String surveyUrl;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
@Schema(description = "면접원 확인사항 여부")
|
@Schema(description = "면접원 확인사항 여부")
|
||||||
private Boolean ff;
|
private Boolean ff;
|
||||||
|
|
||||||
|
@NotNull
|
||||||
@Schema(description = "컨택 시나리오 사용 여부")
|
@Schema(description = "컨택 시나리오 사용 여부")
|
||||||
private Boolean useContactSenario;
|
private Boolean useContactSenario;
|
||||||
|
|
||||||
@Schema(description = "컨택 시나리오")
|
@Schema(description = "컨택 시나리오")
|
||||||
private String contactSenario;
|
private String contactSenario;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
@Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY)
|
@Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY)
|
||||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
private String regUser;
|
private String regUser;
|
||||||
@@ -63,6 +84,7 @@ public class ProjectInfoDto {
|
|||||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
private LocalDateTime regDt;
|
private LocalDateTime regDt;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
@Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY)
|
@Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY)
|
||||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
private String modUser;
|
private String modUser;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.kri.contact.server.dto;
|
package com.kri.contact.server.dto;
|
||||||
|
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
import lombok.Getter;
|
import lombok.Getter;
|
||||||
import lombok.Setter;
|
import lombok.Setter;
|
||||||
import org.springframework.web.bind.annotation.RequestBody;
|
import org.springframework.web.bind.annotation.RequestBody;
|
||||||
@@ -11,6 +12,7 @@ import java.util.List;
|
|||||||
@Setter
|
@Setter
|
||||||
@Schema(description = "프로젝트 수정 요청")
|
@Schema(description = "프로젝트 수정 요청")
|
||||||
public class ProjectUpdateRequestDto {
|
public class ProjectUpdateRequestDto {
|
||||||
|
@NotNull
|
||||||
@Schema(description = "프로젝트 정보")
|
@Schema(description = "프로젝트 정보")
|
||||||
private ProjectInfoDto projectInfo;
|
private ProjectInfoDto projectInfo;
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,9 @@ import com.kri.common.datetime.DateTimeUtil;
|
|||||||
import com.kri.contact.server.dto.excel.UserUploadDto;
|
import com.kri.contact.server.dto.excel.UserUploadDto;
|
||||||
import com.kri.contact.server.persistence.entity.TUserEntity;
|
import com.kri.contact.server.persistence.entity.TUserEntity;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.*;
|
import lombok.*;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
@@ -16,27 +19,39 @@ import java.time.LocalDateTime;
|
|||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Schema(description = "사용자 정보")
|
@Schema(description = "사용자 정보")
|
||||||
public class UserInfoDto {
|
public class UserInfoDto {
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "사용자 ID")
|
@Schema(description = "사용자 ID")
|
||||||
private String userId;
|
private String userId;
|
||||||
|
|
||||||
|
@Size(max = 128)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "사용자 PW")
|
@Schema(description = "사용자 PW")
|
||||||
private String userPw;
|
private String userPw;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "사용자 이름")
|
@Schema(description = "사용자 이름")
|
||||||
private String userName;
|
private String userName;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "사용자 소속 회사")
|
@Schema(description = "사용자 소속 회사")
|
||||||
private String userCmpn;
|
private String userCmpn;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
|
@NotBlank
|
||||||
@Schema(description = "사용자 소속 팀")
|
@Schema(description = "사용자 소속 팀")
|
||||||
private String userTeam = "S101";
|
private String userTeam = "S101";
|
||||||
|
|
||||||
|
@NotNull
|
||||||
@Schema(description = "사용자 권한")
|
@Schema(description = "사용자 권한")
|
||||||
private Integer userRole;
|
private Integer userRole;
|
||||||
|
|
||||||
@Schema(description = "메모")
|
@Schema(description = "메모")
|
||||||
private String memo;
|
private String memo;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
@Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY)
|
@Schema(description = "등록자", accessMode = Schema.AccessMode.READ_ONLY)
|
||||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
private String regUser;
|
private String regUser;
|
||||||
@@ -45,6 +60,7 @@ public class UserInfoDto {
|
|||||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
private LocalDateTime regDt;
|
private LocalDateTime regDt;
|
||||||
|
|
||||||
|
@Size(max = 32)
|
||||||
@Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY)
|
@Schema(description = "수정자", accessMode = Schema.AccessMode.READ_ONLY)
|
||||||
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
@JsonProperty(access = JsonProperty.Access.READ_ONLY)
|
||||||
private String modUser;
|
private String modUser;
|
||||||
|
|||||||
@@ -6,17 +6,17 @@ import jakarta.persistence.Entity;
|
|||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Builder;
|
import lombok.*;
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import org.hibernate.annotations.ColumnDefault;
|
import org.hibernate.annotations.ColumnDefault;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Entity
|
@Entity
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
@Table(name = "t_prjct_assign")
|
@Table(name = "t_prjct_assign")
|
||||||
public class TPrjctAssignEntity {
|
public class TPrjctAssignEntity {
|
||||||
@EmbeddedId
|
@EmbeddedId
|
||||||
|
|||||||
@@ -4,18 +4,18 @@ import jakarta.persistence.Column;
|
|||||||
import jakarta.persistence.Embeddable;
|
import jakarta.persistence.Embeddable;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Builder;
|
import lombok.*;
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import org.hibernate.Hibernate;
|
import org.hibernate.Hibernate;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Embeddable
|
@Embeddable
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
public class TPrjctAssignEntityId implements Serializable {
|
public class TPrjctAssignEntityId implements Serializable {
|
||||||
private static final long serialVersionUID = -263674621497298216L;
|
private static final long serialVersionUID = -263674621497298216L;
|
||||||
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
|
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
|
||||||
|
|||||||
@@ -8,17 +8,17 @@ import com.kri.contact.server.dto.ProjectInfoDto;
|
|||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Builder;
|
import lombok.*;
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import org.hibernate.annotations.ColumnDefault;
|
import org.hibernate.annotations.ColumnDefault;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Entity
|
@Entity
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
@Table(name = "t_prjct")
|
@Table(name = "t_prjct")
|
||||||
public class TPrjctEntity {
|
public class TPrjctEntity {
|
||||||
@Id
|
@Id
|
||||||
|
|||||||
@@ -9,17 +9,17 @@ import jakarta.persistence.Entity;
|
|||||||
import jakarta.persistence.Table;
|
import jakarta.persistence.Table;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import jakarta.validation.constraints.Size;
|
import jakarta.validation.constraints.Size;
|
||||||
import lombok.Builder;
|
import lombok.*;
|
||||||
import lombok.Getter;
|
|
||||||
import lombok.Setter;
|
|
||||||
import org.hibernate.annotations.ColumnDefault;
|
import org.hibernate.annotations.ColumnDefault;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Entity
|
@Entity
|
||||||
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
|
@AllArgsConstructor
|
||||||
@Table(name = "t_result_code")
|
@Table(name = "t_result_code")
|
||||||
public class TResultCodeEntity {
|
public class TResultCodeEntity {
|
||||||
@EmbeddedId
|
@EmbeddedId
|
||||||
|
|||||||
@@ -12,10 +12,10 @@ import org.hibernate.Hibernate;
|
|||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Embeddable
|
@Embeddable
|
||||||
|
@Builder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public class TResultCodeEntityId implements Serializable {
|
public class TResultCodeEntityId implements Serializable {
|
||||||
|
|||||||
@@ -13,11 +13,11 @@ import org.hibernate.annotations.Type;
|
|||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Entity
|
@Entity
|
||||||
@NoArgsConstructor(access = AccessLevel.PROTECTED)
|
@Builder
|
||||||
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Table(name = "t_sys_event_log")
|
@Table(name = "t_sys_event_log")
|
||||||
public class TSysEventLogEntity {
|
public class TSysEventLogEntity {
|
||||||
|
|||||||
@@ -10,10 +10,10 @@ import org.hibernate.annotations.ColumnDefault;
|
|||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Builder
|
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@Entity
|
@Entity
|
||||||
|
@Builder
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Table(name = "t_user")
|
@Table(name = "t_user")
|
||||||
|
|||||||
Reference in New Issue
Block a user