Compare commits

..

5 Commits

85 changed files with 3182 additions and 2895 deletions

View File

@@ -38,7 +38,7 @@ repositories {
} }
dependencies { dependencies {
implementation "com.kri.common:starter:beta.1.0.61" implementation "com.kri.common:starter:beta.1.0.66"
implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-security'

View File

@@ -1,11 +1,11 @@
package com.kri.contact.server; package com.kri.contact.server;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationRunner; import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import lombok.extern.slf4j.Slf4j;
@Slf4j @Slf4j
@SpringBootApplication @SpringBootApplication

View File

@@ -1,10 +1,10 @@
package com.kri.contact.server.common.consts; package com.kri.contact.server.common.consts;
public final class ContactConstant { public final class ContactConstant {
private ContactConstant() {}
public static final String DEFAULT_COMPANY_NAME = "KRI"; public static final String DEFAULT_COMPANY_NAME = "KRI";
public static final int OUTSOURCE_USER_ROLE = 4000; public static final int OUTSOURCE_USER_ROLE = 4000;
public static final int FIELDWORK_USER_ROLE = 9000; public static final int FIELDWORK_USER_ROLE = 9000;
private ContactConstant() {
}
} }

View File

@@ -21,9 +21,13 @@ public enum ChannelType implements CodeEnum<Short> {
@JsonCreator(mode = JsonCreator.Mode.DELEGATING) @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public static ChannelType fromCode(Short code) { public static ChannelType fromCode(Short code) {
if (code == null) return null; if (code == null) {
return null;
}
for (ChannelType s : values()) { for (ChannelType s : values()) {
if (s.code == code) return s; if (s.code == code) {
return s;
}
} }
throw new IllegalArgumentException("Unknown ChannelType code: " + code); throw new IllegalArgumentException("Unknown ChannelType code: " + code);
} }

View File

@@ -17,9 +17,13 @@ public enum ProjectStatus implements CodeEnum<Short> {
@JsonCreator(mode = JsonCreator.Mode.DELEGATING) @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public static ProjectStatus fromCode(Short code) { public static ProjectStatus fromCode(Short code) {
if (code == null) return null; if (code == null) {
return null;
}
for (ProjectStatus s : values()) { for (ProjectStatus s : values()) {
if (s.code == code) return s; if (s.code == code) {
return s;
}
} }
throw new IllegalArgumentException("Unknown ProjectStatus code: " + code); throw new IllegalArgumentException("Unknown ProjectStatus code: " + code);
} }

View File

@@ -18,9 +18,13 @@ public enum ResultCodeType implements CodeEnum<Short> {
@JsonCreator(mode = JsonCreator.Mode.DELEGATING) @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public static ResultCodeType fromCode(Short code) { public static ResultCodeType fromCode(Short code) {
if (code == null) return null; if (code == null) {
return null;
}
for (ResultCodeType s : values()) { for (ResultCodeType s : values()) {
if (s.code == code) return s; if (s.code == code) {
return s;
}
} }
throw new IllegalArgumentException("Unknown ResultCodeType code: " + code); throw new IllegalArgumentException("Unknown ResultCodeType code: " + code);
} }

View File

@@ -18,9 +18,13 @@ public enum SurveyType implements CodeEnum<Short> {
@JsonCreator(mode = JsonCreator.Mode.DELEGATING) @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
public static SurveyType fromCode(Short code) { public static SurveyType fromCode(Short code) {
if (code == null) return null; if (code == null) {
return null;
}
for (SurveyType s : values()) { for (SurveyType s : values()) {
if (s.code == code) return s; if (s.code == code) {
return s;
}
} }
throw new IllegalArgumentException("Unknown SurveyType code: " + code); throw new IllegalArgumentException("Unknown SurveyType code: " + code);
} }

View File

@@ -1,6 +1,5 @@
package com.kri.contact.server.common.enums; package com.kri.contact.server.common.enums;
import com.fasterxml.jackson.annotation.JsonValue;
import com.kri.common.enums.CodeEnum; import com.kri.common.enums.CodeEnum;
import lombok.Getter; import lombok.Getter;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;

View File

@@ -1,39 +1,35 @@
package com.kri.contact.server.common.external.intranet; package com.kri.contact.server.common.external.intranet;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.kri.common.http.ExternalApiClient; import com.kri.common.http.ExternalApiClient;
import com.kri.common.http.ExternalApiResponse;
import com.kri.contact.server.dto.LoginRequestDto; import com.kri.contact.server.dto.LoginRequestDto;
import java.util.Collections; import java.util.Collections;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.kri.common.http.ExternalApiResponse; import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
/** /**
* 공통 모듈로 분리하기 위한 외부(Intranet-Extension) 인증 API 클라이언트. * 공통 모듈로 분리하기 위한 외부(Intranet-Extension) 인증 API 클라이언트. 현재 프로젝트 내에 두되, 이후 common 리포지토리로 이동이 용이하도록
* 현재 프로젝트 내에 두되, 이후 common 리포지토리로 이동이 용이하도록
* contact-server 의 도메인(Service) 코드와 분리한다. * contact-server 의 도메인(Service) 코드와 분리한다.
*/ */
@Component @Component
@RequiredArgsConstructor @RequiredArgsConstructor
public class IntranetExtensionApiClient { public class IntranetExtensionApiClient {
@Value("${kri.api-url.intranet-extension}")
private String intranetExtensionBaseUrl;
@Value("${kri.auth.apikey.header-name:X-API-Key}")
private String apiKeyHeaderName;
@Value("${kri.auth.apikey.key}")
private String apiKey;
// ExternalApiClient 를 직접 생성해 사용 (starter에서 Bean 미제공 시 대비) // ExternalApiClient 를 직접 생성해 사용 (starter에서 Bean 미제공 시 대비)
private final ExternalApiClient externalApiClient = new ExternalApiClient(); private final ExternalApiClient externalApiClient = new ExternalApiClient();
private final ObjectMapper objectMapper = new ObjectMapper(); private final ObjectMapper objectMapper = new ObjectMapper();
@Value("${kri.api-url.intranet-extension}")
private String intranetExtensionBaseUrl;
@Value("${kri.auth.apikey.header-name:X-API-Key}")
private String apiKeyHeaderName;
@Value("${kri.auth.apikey.key}")
private String apiKey;
public SearchLoginInfoResponseDto searchLoginInfo(LoginRequestDto request) { public SearchLoginInfoResponseDto searchLoginInfo(LoginRequestDto request) {
String url = String.format("%s/user/login-info", intranetExtensionBaseUrl); String url = String.format("%s/user/login-info", intranetExtensionBaseUrl);
@@ -59,7 +55,8 @@ public class IntranetExtensionApiClient {
return objectMapper.readValue( return objectMapper.readValue(
response.getBody(), response.getBody(),
new com.fasterxml.jackson.core.type.TypeReference<List<String>>() {} new com.fasterxml.jackson.core.type.TypeReference<List<String>>() {
}
); );
} catch (JsonProcessingException e) { } catch (JsonProcessingException e) {
return Collections.emptyList(); return Collections.emptyList();

View File

@@ -12,6 +12,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor // Builder 패턴 사용 시 필요 @AllArgsConstructor // Builder 패턴 사용 시 필요
@Schema(description = "인트라넷 사용자 검색 응답 DTO") @Schema(description = "인트라넷 사용자 검색 응답 DTO")
public class SearchLoginInfoResponseDto { public class SearchLoginInfoResponseDto {
@Schema(description = "사용자 ID") @Schema(description = "사용자 ID")
private String userId; private String userId;

View File

@@ -6,6 +6,7 @@ import jakarta.persistence.Converter;
@Converter(autoApply = false) @Converter(autoApply = false)
public class ResultCodeTypeConverter extends AbstractCodeEnumConverter<ResultCodeType, Short> { public class ResultCodeTypeConverter extends AbstractCodeEnumConverter<ResultCodeType, Short> {
public ResultCodeTypeConverter() { public ResultCodeTypeConverter() {
super(ResultCodeType.class); super(ResultCodeType.class);
} }

View File

@@ -2,15 +2,15 @@ package com.kri.contact.server.common.util;
import com.kri.common.excel.ExcelMapper; import com.kri.common.excel.ExcelMapper;
import com.kri.contact.server.dto.ExcelUploadResponseDto; import com.kri.contact.server.dto.ExcelUploadResponseDto;
import org.apache.poi.ss.usermodel.Workbook;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.util.Base64; import java.util.Base64;
import java.util.List; import java.util.List;
import org.apache.poi.ss.usermodel.Workbook;
public final class ExcelUploadResultUtil { public final class ExcelUploadResultUtil {
private ExcelUploadResultUtil() {} private ExcelUploadResultUtil() {
}
/** /**
* 엑셀 업로드 결과 + 에러 엑셀 생성까지 공통 처리. * 엑셀 업로드 결과 + 에러 엑셀 생성까지 공통 처리.

View File

@@ -1,10 +1,10 @@
package com.kri.contact.server.config; package com.kri.contact.server.config;
import com.querydsl.jpa.impl.JPAQueryFactory;
import jakarta.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import lombok.RequiredArgsConstructor;
import jakarta.persistence.EntityManager;
import com.querydsl.jpa.impl.JPAQueryFactory;
@Configuration @Configuration
@RequiredArgsConstructor @RequiredArgsConstructor

View File

@@ -7,11 +7,15 @@ import com.kri.contact.server.service.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation; 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 jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/v1/assign") @RequestMapping("/api/v1/assign")
@@ -43,6 +47,7 @@ public class AssignController {
) { ) {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
assignService.upsertPrjctFieldworkAssign(prjctIdx, assignUserIdList, ctx.getUserId(), now); assignService.upsertPrjctFieldworkAssign(prjctIdx, assignUserIdList, ctx.getUserId(), now);
systemEventLogService.writeAssignUserProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, assignUserIdList); systemEventLogService.writeAssignUserProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx,
assignUserIdList);
} }
} }

View File

@@ -9,16 +9,20 @@ import com.kri.contact.server.service.SystemEventLogService;
import io.swagger.v3.oas.annotations.Operation; 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 jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.PathVariable;
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 @RestController
@RequestMapping("/api/v1/auth") @RequestMapping("/api/v1/auth")
@RequiredArgsConstructor @RequiredArgsConstructor
@Tag(name = "Auth", description = "인증 API") @Tag(name = "Auth", description = "인증 API")
public class AuthController { public class AuthController {
private final AuthService authService; private final AuthService authService;
private final SystemEventLogService systemEventLogService; private final SystemEventLogService systemEventLogService;

View File

@@ -4,19 +4,32 @@ import com.kri.common.datetime.DateTimeUtil;
import com.kri.common.webmvc.RequestUserContext; import com.kri.common.webmvc.RequestUserContext;
import com.kri.common.webmvc.page.PageResponseDto; import com.kri.common.webmvc.page.PageResponseDto;
import com.kri.contact.server.common.enums.ChannelType; import com.kri.contact.server.common.enums.ChannelType;
import com.kri.contact.server.dto.*; import com.kri.contact.server.dto.ProjectCreateRequestDto;
import com.kri.contact.server.dto.ProjectInfoDto;
import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto;
import com.kri.contact.server.dto.ProjectOwnerResponseDto;
import com.kri.contact.server.dto.ProjectSearchRequestDto;
import com.kri.contact.server.dto.ProjectUpdateRequestDto;
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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
@RestController @RestController
@RequestMapping("/api/v1/project") @RequestMapping("/api/v1/project")
@@ -78,14 +91,16 @@ public class ProjectController {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
ProjectInfoDto prjctInfo = projectService.createProject(req, ctx.getUserId(), now); ProjectInfoDto prjctInfo = projectService.createProject(req, ctx.getUserId(), now);
systemEventLogService.writeCreateProject(ctx.getUserId(), now, ctx.getClientIp(), prjctInfo.getPrjctIdx(), req); systemEventLogService.writeCreateProject(ctx.getUserId(), now, ctx.getClientIp(),
prjctInfo.getPrjctIdx(), req);
return prjctInfo; return prjctInfo;
} }
@Operation(summary = "시나리오 이미지 업로드") @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);
} }
@@ -106,7 +121,8 @@ public class ProjectController {
projectService.updateProject(prjctIdx, req, ctx.getUserId(), now); projectService.updateProject(prjctIdx, req, ctx.getUserId(), now);
systemEventLogService.writeUpdateProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx, req); systemEventLogService.writeUpdateProject(ctx.getUserId(), now, ctx.getClientIp(), prjctIdx,
req);
} }
@Operation(summary = "프로젝트 대표 발송 템플릿 지정") @Operation(summary = "프로젝트 대표 발송 템플릿 지정")
@@ -118,7 +134,8 @@ public class ProjectController {
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
projectService.updateProjectMainTemplate(req, ctx.getUserId(), now); projectService.updateProjectMainTemplate(req, ctx.getUserId(), now);
systemEventLogService.writeUpdateDefaultMessageTemplate(ctx.getUserId(), now, ctx.getClientIp(), req); systemEventLogService.writeUpdateDefaultMessageTemplate(ctx.getUserId(), now, ctx.getClientIp(),
req);
} }
@Operation(summary = "프로젝트 삭제(소프트 삭제)") @Operation(summary = "프로젝트 삭제(소프트 삭제)")

View File

@@ -1,16 +1,18 @@
package com.kri.contact.server.controller; package com.kri.contact.server.controller;
import com.kri.common.webmvc.RequestUserContext;
import com.kri.contact.server.common.enums.ResultCodeType; 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
@RestController @RestController
@RequestMapping("/api/v1/result-code") @RequestMapping("/api/v1/result-code")

View File

@@ -5,18 +5,18 @@ 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.Operation;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController @RestController
@RequestMapping("/api/v1/role") @RequestMapping("/api/v1/role")
@RequiredArgsConstructor @RequiredArgsConstructor
@Tag(name = "Role", description = "권한 관리 API") @Tag(name = "Role", description = "권한 관리 API")
public class RoleController { public class RoleController {
private final RoleService roleService; private final RoleService roleService;
@Operation(summary = "권한 목록 조회") @Operation(summary = "권한 목록 조회")

View File

@@ -12,22 +12,32 @@ import com.kri.contact.server.service.UserService;
import io.swagger.v3.oas.annotations.Operation; 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 jakarta.validation.Valid;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
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;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PatchMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
@RestController @RestController
@RequestMapping("/api/v1/user") @RequestMapping("/api/v1/user")
@RequiredArgsConstructor @RequiredArgsConstructor
@Tag(name = "User", description = "사용자 관리 API") @Tag(name = "User", description = "사용자 관리 API")
public class UserController { public class UserController {
private final UserService userService; private final UserService userService;
private final SystemEventLogService systemEventLogService; private final SystemEventLogService systemEventLogService;
@@ -49,8 +59,7 @@ public class UserController {
String searchCmpn = ctx.getUserCmpn(); String searchCmpn = ctx.getUserCmpn();
if (ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) { if (ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE) {
return userService.getUserList(); return userService.getUserList();
} } else {
else{
return userService.getFieldworkUserListWithCmpn(searchCmpn); return userService.getFieldworkUserListWithCmpn(searchCmpn);
} }
} }
@@ -106,7 +115,8 @@ public class UserController {
String clientIp = ctx.getClientIp(); String clientIp = ctx.getClientIp();
final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime();
//외주사급이 업로드로 계정을 생성하는 경우 자신의 회사명으로 고정 //외주사급이 업로드로 계정을 생성하는 경우 자신의 회사명으로 고정
String forceCmpn = ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE? "" : ctx.getUserCmpn(); String forceCmpn =
ctx.getUserRole() < ContactConstant.OUTSOURCE_USER_ROLE ? "" : ctx.getUserCmpn();
ExcelUploadResponseDto result = userService.createUsersFromExcel(file, regId, now, forceCmpn); ExcelUploadResponseDto result = userService.createUsersFromExcel(file, regId, now, forceCmpn);

View File

@@ -12,6 +12,7 @@ import lombok.Setter;
@AllArgsConstructor @AllArgsConstructor
@Schema(description = "데이터 검증에 대한 공용 Dto") @Schema(description = "데이터 검증에 대한 공용 Dto")
public class DataVerificationDto { public class DataVerificationDto {
@Schema(description = "데이터 검증 통과 여부") @Schema(description = "데이터 검증 통과 여부")
private boolean success; private boolean success;

View File

@@ -8,6 +8,7 @@ import lombok.Setter;
@Setter @Setter
@Schema(description = "사용자 로그인 요청") @Schema(description = "사용자 로그인 요청")
public class LoginRequestDto { public class LoginRequestDto {
@Schema(description = "사용자 ID") @Schema(description = "사용자 ID")
private String userId; private String userId;

View File

@@ -10,6 +10,7 @@ import lombok.Getter;
@Builder @Builder
@Schema(description = "로그인 응답") @Schema(description = "로그인 응답")
public class LoginResponseDto { public class LoginResponseDto {
@Schema(description = "jwt access 토큰") @Schema(description = "jwt access 토큰")
private String accessToken; private String accessToken;

View File

@@ -3,7 +3,10 @@ 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.NotBlank;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.*; import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter @Getter
@Setter @Setter
@@ -11,6 +14,7 @@ import lombok.*;
@AllArgsConstructor @AllArgsConstructor
@Schema(description = "프로젝트 생성 요청") @Schema(description = "프로젝트 생성 요청")
public class ProjectCreateRequestDto { public class ProjectCreateRequestDto {
@Size(max = 128) @Size(max = 128)
@NotBlank @NotBlank
@Schema(description = "프로젝트 명") @Schema(description = "프로젝트 명")

View File

@@ -8,9 +8,12 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter @Getter
@Setter @Setter
@@ -19,6 +22,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor @AllArgsConstructor
@Schema(description = "프로젝트 정보") @Schema(description = "프로젝트 정보")
public class ProjectInfoDto { public class ProjectInfoDto {
@NotNull @NotNull
@Schema(description = "프로젝트 고유 번호") @Schema(description = "프로젝트 고유 번호")
private Long prjctIdx; private Long prjctIdx;

View File

@@ -1,9 +1,11 @@
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 lombok.*;
import java.util.List; import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter @Getter
@Setter @Setter
@@ -11,6 +13,7 @@ import java.util.List;
@AllArgsConstructor @AllArgsConstructor
@Schema(description = "프로젝트 담당들 정보") @Schema(description = "프로젝트 담당들 정보")
public class ProjectOwnerResponseDto { public class ProjectOwnerResponseDto {
@Schema(description = "담당 연구 부서") @Schema(description = "담당 연구 부서")
List<String> ownerDeptList; List<String> ownerDeptList;
@Schema(description = "담당 실사 인원") @Schema(description = "담당 실사 인원")

View File

@@ -2,15 +2,15 @@ package com.kri.contact.server.dto;
import com.kri.common.webmvc.page.PageRequestDto; import com.kri.common.webmvc.page.PageRequestDto;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import java.util.List;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.List;
@Getter @Getter
@Setter @Setter
@Schema(description = "프로젝트 검색 조건") @Schema(description = "프로젝트 검색 조건")
public class ProjectSearchRequestDto { public class ProjectSearchRequestDto {
@Schema(description = "검색 텍스트") @Schema(description = "검색 텍스트")
private String prjctText; // like 대상 private String prjctText; // like 대상
@Schema(description = "프로젝트 상태 리스트") @Schema(description = "프로젝트 상태 리스트")

View File

@@ -2,16 +2,15 @@ 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 jakarta.validation.constraints.NotNull;
import java.util.List;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.springframework.web.bind.annotation.RequestBody;
import java.util.List;
@Getter @Getter
@Setter @Setter
@Schema(description = "프로젝트 수정 요청") @Schema(description = "프로젝트 수정 요청")
public class ProjectUpdateRequestDto { public class ProjectUpdateRequestDto {
@NotNull @NotNull
@Schema(description = "프로젝트 정보") @Schema(description = "프로젝트 정보")
private ProjectInfoDto projectInfo; private ProjectInfoDto projectInfo;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.dto;
import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.entity.TResultCodeEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import java.util.UUID;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.UUID;
@Getter @Getter
@Setter @Setter
@Builder @Builder
@Schema(description = "결과 코드") @Schema(description = "결과 코드")
public class ResultCodeDto { public class ResultCodeDto {
@Schema(description = "결과 코드 고유 키") @Schema(description = "결과 코드 고유 키")
private String resultCdUUID; private String resultCdUUID;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.dto;
import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonProperty;
import com.kri.contact.server.persistence.entity.TRoleEntity; import com.kri.contact.server.persistence.entity.TRoleEntity;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import java.time.LocalDateTime;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Builder @Builder
@Schema(description = "권한 정보") @Schema(description = "권한 정보")
public class RoleInfoDto { public class RoleInfoDto {
@Schema(description = "권한 코드") @Schema(description = "권한 코드")
private Integer roleCd; private Integer roleCd;

View File

@@ -8,9 +8,12 @@ import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size; import jakarta.validation.constraints.Size;
import lombok.*;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter @Getter
@Setter @Setter
@@ -19,6 +22,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor @AllArgsConstructor
@Schema(description = "사용자 정보") @Schema(description = "사용자 정보")
public class UserInfoDto { public class UserInfoDto {
@Size(max = 32) @Size(max = 32)
@NotBlank @NotBlank
@Schema(description = "사용자 ID") @Schema(description = "사용자 ID")

View File

@@ -2,7 +2,11 @@ package com.kri.contact.server.dto.excel;
import com.kri.common.excel.ExcelColumn; import com.kri.common.excel.ExcelColumn;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter @Getter
@Setter @Setter
@@ -10,6 +14,7 @@ import lombok.*;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class UserUploadDto { public class UserUploadDto {
@ExcelColumn(header = "사용자 ID", order = 0, width = 11) @ExcelColumn(header = "사용자 ID", order = 0, width = 11)
@Schema(description = "사용자 ID") @Schema(description = "사용자 ID")
private String userId; private String userId;

View File

@@ -8,6 +8,7 @@ import lombok.Setter;
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public class UploadUserContentDto { public class UploadUserContentDto {
String fileName; String fileName;
String fileType; String fileType;
Long fileSize; Long fileSize;

View File

@@ -1,6 +1,10 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
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.Getter; import lombok.Getter;
@@ -12,6 +16,7 @@ import org.hibernate.annotations.ColumnDefault;
@Entity @Entity
@Table(name = "t_func") @Table(name = "t_func")
public class TFuncEntity { public class TFuncEntity {
@Id @Id
@NotNull @NotNull
@Column(name = "func_cd") @Column(name = "func_cd")

View File

@@ -1,19 +1,24 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_assign") @Table(name = "t_list_assign")
public class TListAssignEntity { public class TListAssignEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "list_assign_idx", nullable = false) @Column(name = "list_assign_idx", nullable = false)

View File

@@ -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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list") @Table(name = "t_list")
public class TListEntity { public class TListEntity {
@EmbeddedId @EmbeddedId
private TListEntityId id; private TListEntityId id;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.persistence.entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import java.io.Serializable;
import java.util.Objects;
@Getter @Getter
@Setter @Setter
@Embeddable @Embeddable
public class TListEntityId implements Serializable { public class TListEntityId implements Serializable {
private static final long serialVersionUID = 7012247084434778447L; private static final long serialVersionUID = 7012247084434778447L;
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
private Long prjctIdx; private Long prjctIdx;
@@ -24,8 +24,12 @@ public class TListEntityId implements Serializable {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TListEntityId entity = (TListEntityId) o; TListEntityId entity = (TListEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.sid, entity.sid); Objects.equals(this.sid, entity.sid);

View File

@@ -1,20 +1,26 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_event_hist") @Table(name = "t_list_event_hist")
public class TListEventHistEntity { public class TListEventHistEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "list_event_hist_idx", nullable = false) @Column(name = "list_event_hist_idx", nullable = false)

View File

@@ -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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_header") @Table(name = "t_list_header")
public class TListHeaderEntity { public class TListHeaderEntity {
@EmbeddedId @EmbeddedId
private TListHeaderEntityId id; private TListHeaderEntityId id;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.persistence.entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import java.io.Serializable;
import java.util.Objects;
@Getter @Getter
@Setter @Setter
@Embeddable @Embeddable
public class TListHeaderEntityId implements Serializable { public class TListHeaderEntityId implements Serializable {
private static final long serialVersionUID = -1296812261527497087L; private static final long serialVersionUID = -1296812261527497087L;
@Column(name = "prjct_idx", insertable = false, updatable = false, columnDefinition = "int UNSIGNED not null") @Column(name = "prjct_idx", insertable = false, updatable = false, columnDefinition = "int UNSIGNED not null")
private Long prjctIdx; private Long prjctIdx;
@@ -24,8 +24,12 @@ public class TListHeaderEntityId implements Serializable {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TListHeaderEntityId entity = (TListHeaderEntityId) o; TListHeaderEntityId entity = (TListHeaderEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.listHderId, entity.listHderId); Objects.equals(this.listHderId, entity.listHderId);

View File

@@ -1,19 +1,23 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.EmbeddedId;
import jakarta.persistence.Entity;
import jakarta.persistence.Lob;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_item") @Table(name = "t_list_item")
public class TListItemEntity { public class TListItemEntity {
@EmbeddedId @EmbeddedId
private TListItemEntityId id; private TListItemEntityId id;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.persistence.entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import java.io.Serializable;
import java.util.Objects;
@Getter @Getter
@Setter @Setter
@Embeddable @Embeddable
public class TListItemEntityId implements Serializable { public class TListItemEntityId implements Serializable {
private static final long serialVersionUID = -3478285652359764540L; private static final long serialVersionUID = -3478285652359764540L;
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
private Long prjctIdx; private Long prjctIdx;
@@ -28,8 +28,12 @@ public class TListItemEntityId implements Serializable {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TListItemEntityId entity = (TListItemEntityId) o; TListItemEntityId entity = (TListItemEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.listHderId, entity.listHderId) && Objects.equals(this.listHderId, entity.listHderId) &&

View File

@@ -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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_item_upload") @Table(name = "t_list_item_upload")
public class TListItemUploadEntity { public class TListItemUploadEntity {
@EmbeddedId @EmbeddedId
private TListItemUploadEntityId id; private TListItemUploadEntityId id;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.persistence.entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import java.io.Serializable;
import java.util.Objects;
@Getter @Getter
@Setter @Setter
@Embeddable @Embeddable
public class TListItemUploadEntityId implements Serializable { public class TListItemUploadEntityId implements Serializable {
private static final long serialVersionUID = -8073832649114843758L; private static final long serialVersionUID = -8073832649114843758L;
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
private Long prjctIdx; private Long prjctIdx;
@@ -28,8 +28,12 @@ public class TListItemUploadEntityId implements Serializable {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TListItemUploadEntityId entity = (TListItemUploadEntityId) o; TListItemUploadEntityId entity = (TListItemUploadEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.listHderId, entity.listHderId) && Objects.equals(this.listHderId, entity.listHderId) &&

View File

@@ -1,22 +1,27 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import io.hypersistence.utils.hibernate.type.json.JsonType; import io.hypersistence.utils.hibernate.type.json.JsonType;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
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 java.time.LocalDateTime;
import java.util.Map;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Type; import org.hibernate.annotations.Type;
import java.time.LocalDateTime;
import java.util.Map;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_reset_log") @Table(name = "t_list_reset_log")
public class TListResetLogEntity { public class TListResetLogEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "list_reset_log_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "list_reset_log_idx", columnDefinition = "int UNSIGNED not null")

View File

@@ -1,19 +1,24 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_resve") @Table(name = "t_list_resve")
public class TListResveEntity { public class TListResveEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "list_resve_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "list_resve_idx", columnDefinition = "int UNSIGNED not null")

View File

@@ -1,19 +1,25 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_update_hist") @Table(name = "t_list_update_hist")
public class TListUpdateHistEntity { public class TListUpdateHistEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "list_update_hist_idx", nullable = false) @Column(name = "list_update_hist_idx", nullable = false)

View File

@@ -1,19 +1,24 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_list_upload_log") @Table(name = "t_list_upload_log")
public class TListUploadLogEntity { public class TListUploadLogEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "list_upload_log_idx", nullable = false) @Column(name = "list_upload_log_idx", nullable = false)

View File

@@ -6,10 +6,13 @@ 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.*;
import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
@Getter @Getter
@Setter @Setter
@@ -19,6 +22,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor @AllArgsConstructor
@Table(name = "t_prjct_assign") @Table(name = "t_prjct_assign")
public class TPrjctAssignEntity { public class TPrjctAssignEntity {
@EmbeddedId @EmbeddedId
private TPrjctAssignEntityId id; private TPrjctAssignEntityId id;
@@ -32,7 +36,8 @@ public class TPrjctAssignEntity {
@Column(name = "reg_dt", nullable = false) @Column(name = "reg_dt", nullable = false)
private LocalDateTime regDt; private LocalDateTime regDt;
public static TPrjctAssignEntity create(Long prjctIdx, String userId, String regUser, LocalDateTime regDt) { public static TPrjctAssignEntity create(Long prjctIdx, String userId, String regUser,
LocalDateTime regDt) {
return TPrjctAssignEntity.builder() return TPrjctAssignEntity.builder()
.id(TPrjctAssignEntityId.create(prjctIdx, userId)) .id(TPrjctAssignEntityId.create(prjctIdx, userId))
.regUser(regUser) .regUser(regUser)

View File

@@ -4,11 +4,14 @@ 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.*;
import org.hibernate.Hibernate;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.Hibernate;
@Getter @Getter
@Setter @Setter
@@ -17,6 +20,7 @@ import java.util.Objects;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @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")
private Long prjctIdx; private Long prjctIdx;
@@ -26,10 +30,21 @@ public class TPrjctAssignEntityId implements Serializable {
@Column(name = "user_id", nullable = false, length = 32) @Column(name = "user_id", nullable = false, length = 32)
private String userId; private String userId;
public static TPrjctAssignEntityId create(Long prjctIdx, String userId) {
return TPrjctAssignEntityId.builder()
.prjctIdx(prjctIdx)
.userId(userId)
.build();
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TPrjctAssignEntityId entity = (TPrjctAssignEntityId) o; TPrjctAssignEntityId entity = (TPrjctAssignEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.userId, entity.userId); Objects.equals(this.userId, entity.userId);
@@ -39,11 +54,4 @@ public class TPrjctAssignEntityId implements Serializable {
public int hashCode() { public int hashCode() {
return Objects.hash(prjctIdx, userId); return Objects.hash(prjctIdx, userId);
} }
public static TPrjctAssignEntityId create(Long prjctIdx, String userId) {
return TPrjctAssignEntityId.builder()
.prjctIdx(prjctIdx)
.userId(userId)
.build();
}
} }

View File

@@ -5,13 +5,22 @@ 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.dto.ProjectCreateRequestDto; import com.kri.contact.server.dto.ProjectCreateRequestDto;
import com.kri.contact.server.dto.ProjectInfoDto; import com.kri.contact.server.dto.ProjectInfoDto;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
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.*;
import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
@Getter @Getter
@Setter @Setter
@@ -21,6 +30,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor @AllArgsConstructor
@Table(name = "t_prjct") @Table(name = "t_prjct")
public class TPrjctEntity { public class TPrjctEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
@@ -131,7 +141,8 @@ public class TPrjctEntity {
.build(); .build();
} }
public static TPrjctEntity create(ProjectCreateRequestDto req, String prjctCd, String regUser, LocalDateTime regDt) { public static TPrjctEntity create(ProjectCreateRequestDto req, String prjctCd, String regUser,
LocalDateTime regDt) {
return TPrjctEntity.builder() return TPrjctEntity.builder()
.prjctCd(prjctCd) .prjctCd(prjctCd)
.prjctStatus(ProjectStatus.STANDBY.getCode()) .prjctStatus(ProjectStatus.STANDBY.getCode())

View File

@@ -7,10 +7,13 @@ 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.*;
import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
@Getter @Getter
@Setter @Setter
@@ -20,6 +23,7 @@ import java.time.LocalDateTime;
@Entity @Entity
@Table(name = "t_prjct_main_tmplat") @Table(name = "t_prjct_main_tmplat")
public class TPrjctMainTmplatEntity { public class TPrjctMainTmplatEntity {
@EmbeddedId @EmbeddedId
private TPrjctMainTmplatEntityId id; private TPrjctMainTmplatEntityId id;
@@ -37,6 +41,16 @@ public class TPrjctMainTmplatEntity {
@Column(name = "reg_dt", nullable = false) @Column(name = "reg_dt", nullable = false)
private LocalDateTime regDt; private LocalDateTime regDt;
public static TPrjctMainTmplatEntity create(ProjectMainTemplateUpdateRequestDto req,
String regUser, LocalDateTime regDt) {
return TPrjctMainTmplatEntity.builder()
.id(TPrjctMainTmplatEntityId.create(req.getPrjctIdx(), req.getChnnlTy().getCode()))
.tmplatIdx(req.getTmplatIdx())
.regUser(regUser)
.regDt(regDt)
.build();
}
// convenience // convenience
public Long getPrjctIdx() { public Long getPrjctIdx() {
return id != null ? id.getPrjctIdx() : null; return id != null ? id.getPrjctIdx() : null;
@@ -45,13 +59,4 @@ public class TPrjctMainTmplatEntity {
public Short getChnnlTy() { public Short getChnnlTy() {
return id != null ? id.getChnnlTy() : null; return id != null ? id.getChnnlTy() : null;
} }
public static TPrjctMainTmplatEntity create(ProjectMainTemplateUpdateRequestDto req, String regUser, LocalDateTime regDt) {
return TPrjctMainTmplatEntity.builder()
.id(TPrjctMainTmplatEntityId.create(req.getPrjctIdx(), req.getChnnlTy().getCode()))
.tmplatIdx(req.getTmplatIdx())
.regUser(regUser)
.regDt(regDt)
.build();
}
} }

View File

@@ -2,11 +2,14 @@ package com.kri.contact.server.persistence.entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import lombok.*;
import org.hibernate.Hibernate;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.Hibernate;
@Getter @Getter
@Setter @Setter
@@ -15,6 +18,7 @@ import java.util.Objects;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class TPrjctMainTmplatEntityId implements Serializable { public class TPrjctMainTmplatEntityId implements Serializable {
private static final long serialVersionUID = -263674621497298216L; private static final long serialVersionUID = -263674621497298216L;
@Column(name = "prjct_idx", nullable = false, columnDefinition = "INT UNSIGNED") @Column(name = "prjct_idx", nullable = false, columnDefinition = "INT UNSIGNED")
@@ -23,10 +27,21 @@ public class TPrjctMainTmplatEntityId implements Serializable {
@Column(name = "chnnl_ty", nullable = false) @Column(name = "chnnl_ty", nullable = false)
private Short chnnlTy; private Short chnnlTy;
public static TPrjctMainTmplatEntityId create(Long prjctIdx, Short chnnlTy) {
return TPrjctMainTmplatEntityId.builder()
.prjctIdx(prjctIdx)
.chnnlTy(chnnlTy)
.build();
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TPrjctMainTmplatEntityId entity = (TPrjctMainTmplatEntityId) o; TPrjctMainTmplatEntityId entity = (TPrjctMainTmplatEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.chnnlTy, entity.chnnlTy); Objects.equals(this.chnnlTy, entity.chnnlTy);
@@ -36,11 +51,4 @@ public class TPrjctMainTmplatEntityId implements Serializable {
public int hashCode() { public int hashCode() {
return Objects.hash(prjctIdx, chnnlTy); return Objects.hash(prjctIdx, chnnlTy);
} }
public static TPrjctMainTmplatEntityId create(Long prjctIdx, Short chnnlTy) {
return TPrjctMainTmplatEntityId.builder()
.prjctIdx(prjctIdx)
.chnnlTy(chnnlTy)
.build();
}
} }

View File

@@ -1,6 +1,5 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.dto.ResultCodeDto; import com.kri.contact.server.dto.ResultCodeDto;
import jakarta.persistence.Column; import jakarta.persistence.Column;
@@ -9,10 +8,13 @@ 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.*;
import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
@Getter @Getter
@Setter @Setter
@@ -22,6 +24,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor @AllArgsConstructor
@Table(name = "t_result_code") @Table(name = "t_result_code")
public class TResultCodeEntity { public class TResultCodeEntity {
@EmbeddedId @EmbeddedId
private TResultCodeEntityId id; private TResultCodeEntityId id;
@@ -40,18 +43,6 @@ public class TResultCodeEntity {
@Column(name = "reg_dt", nullable = false) @Column(name = "reg_dt", nullable = false)
private LocalDateTime regDt; private LocalDateTime regDt;
public Long getPrjctIdx() {
return id.getPrjctIdx();
}
public ResultCodeType getResultCdTy() {
return id.getResultCdTy();
}
public Short getResultCd() {
return id.getResultCd();
}
public static TResultCodeEntity copyFromDefault( public static TResultCodeEntity copyFromDefault(
TResultCodeEntity src, TResultCodeEntity src,
Long prjctIdx, Long prjctIdx,
@@ -66,7 +57,8 @@ public class TResultCodeEntity {
.build(); .build();
} }
public static TResultCodeEntity fromDto(Long prjctIdx, ResultCodeType resultCdTy, ResultCodeDto req, String regUser, LocalDateTime regDt) { public static TResultCodeEntity fromDto(Long prjctIdx, ResultCodeType resultCdTy,
ResultCodeDto req, String regUser, LocalDateTime regDt) {
return TResultCodeEntity.builder() return TResultCodeEntity.builder()
.id(TResultCodeEntityId.create(prjctIdx, resultCdTy, req.getResultCd())) .id(TResultCodeEntityId.create(prjctIdx, resultCdTy, req.getResultCd()))
.resultCdLbl(req.getResultCdLbl()) .resultCdLbl(req.getResultCdLbl())
@@ -75,4 +67,16 @@ public class TResultCodeEntity {
.build(); .build();
} }
public Long getPrjctIdx() {
return id.getPrjctIdx();
}
public ResultCodeType getResultCdTy() {
return id.getResultCdTy();
}
public Short getResultCd() {
return id.getResultCd();
}
} }

View File

@@ -1,16 +1,19 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import com.kri.contact.server.common.jpa.ResultCodeTypeConverter;
import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.common.jpa.ResultCodeTypeConverter;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Convert; import jakarta.persistence.Convert;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import lombok.*;
import org.hibernate.Hibernate;
import java.io.Serializable; import java.io.Serializable;
import java.util.Objects; import java.util.Objects;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.Hibernate;
@Getter @Getter
@Setter @Setter
@@ -19,6 +22,7 @@ import java.util.Objects;
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
public class TResultCodeEntityId implements Serializable { public class TResultCodeEntityId implements Serializable {
private static final long serialVersionUID = -1984612223940078355L; private static final long serialVersionUID = -1984612223940078355L;
@Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "prjct_idx", columnDefinition = "int UNSIGNED not null")
private Long prjctIdx; private Long prjctIdx;
@@ -32,10 +36,23 @@ public class TResultCodeEntityId implements Serializable {
@Column(name = "result_cd", nullable = false) @Column(name = "result_cd", nullable = false)
private Short resultCd; private Short resultCd;
public static TResultCodeEntityId create(Long prjctIdx, ResultCodeType resultCdTy,
Short resultCd) {
return TResultCodeEntityId.builder()
.prjctIdx(prjctIdx)
.resultCdTy(resultCdTy)
.resultCd(resultCd)
.build();
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TResultCodeEntityId entity = (TResultCodeEntityId) o; TResultCodeEntityId entity = (TResultCodeEntityId) o;
return Objects.equals(this.prjctIdx, entity.prjctIdx) && return Objects.equals(this.prjctIdx, entity.prjctIdx) &&
Objects.equals(this.resultCdTy, entity.resultCdTy) && Objects.equals(this.resultCdTy, entity.resultCdTy) &&
@@ -46,12 +63,4 @@ public class TResultCodeEntityId implements Serializable {
public int hashCode() { public int hashCode() {
return Objects.hash(prjctIdx, resultCdTy, resultCd); return Objects.hash(prjctIdx, resultCdTy, resultCd);
} }
public static TResultCodeEntityId create(Long prjctIdx, ResultCodeType resultCdTy, Short resultCd) {
return TResultCodeEntityId.builder()
.prjctIdx(prjctIdx)
.resultCdTy(resultCdTy)
.resultCd(resultCd)
.build();
}
} }

View File

@@ -1,19 +1,23 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_role") @Table(name = "t_role")
public class TRoleEntity { public class TRoleEntity {
@Id @Id
@Column(name = "role_cd", nullable = false) @Column(name = "role_cd", nullable = false)
private Integer roleCd; private Integer roleCd;

View File

@@ -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 java.time.LocalDateTime;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime;
@Getter @Getter
@Setter @Setter
@Entity @Entity
@Table(name = "t_role_func_map") @Table(name = "t_role_func_map")
public class TRoleFuncMapEntity { public class TRoleFuncMapEntity {
@EmbeddedId @EmbeddedId
private TRoleFuncMapEntityId id; private TRoleFuncMapEntityId id;

View File

@@ -3,17 +3,17 @@ package com.kri.contact.server.persistence.entity;
import jakarta.persistence.Column; import jakarta.persistence.Column;
import jakarta.persistence.Embeddable; import jakarta.persistence.Embeddable;
import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Objects;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import org.hibernate.Hibernate; import org.hibernate.Hibernate;
import java.io.Serializable;
import java.util.Objects;
@Getter @Getter
@Setter @Setter
@Embeddable @Embeddable
public class TRoleFuncMapEntityId implements Serializable { public class TRoleFuncMapEntityId implements Serializable {
private static final long serialVersionUID = 5430666726716009453L; private static final long serialVersionUID = 5430666726716009453L;
@NotNull @NotNull
@Column(name = "role_cd", nullable = false) @Column(name = "role_cd", nullable = false)
@@ -25,8 +25,12 @@ public class TRoleFuncMapEntityId implements Serializable {
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) {
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false; return true;
}
if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) {
return false;
}
TRoleFuncMapEntityId entity = (TRoleFuncMapEntityId) o; TRoleFuncMapEntityId entity = (TRoleFuncMapEntityId) o;
return Objects.equals(this.roleCd, entity.roleCd) && return Objects.equals(this.roleCd, entity.roleCd) &&
Objects.equals(this.funcCd, entity.funcCd); Objects.equals(this.funcCd, entity.funcCd);

View File

@@ -1,17 +1,24 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.contact.server.common.enums.SystemEventType; import com.kri.contact.server.common.enums.SystemEventType;
import io.hypersistence.utils.hibernate.type.json.JsonType; import io.hypersistence.utils.hibernate.type.json.JsonType;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
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.*;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Type;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Map; import java.util.Map;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
import org.hibernate.annotations.Type;
@Getter @Getter
@Setter @Setter
@@ -21,6 +28,7 @@ import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
@Table(name = "t_sys_event_log") @Table(name = "t_sys_event_log")
public class TSysEventLogEntity { public class TSysEventLogEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "sys_event_log_idx", nullable = false) @Column(name = "sys_event_log_idx", nullable = false)

View File

@@ -1,14 +1,22 @@
package com.kri.contact.server.persistence.entity; package com.kri.contact.server.persistence.entity;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.contact.server.dto.UserInfoDto; import com.kri.contact.server.dto.UserInfoDto;
import jakarta.persistence.*; import jakarta.persistence.Column;
import jakarta.persistence.Entity;
import jakarta.persistence.GeneratedValue;
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.Lob;
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.*;
import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
import org.hibernate.annotations.ColumnDefault;
@Getter @Getter
@Setter @Setter
@@ -18,6 +26,7 @@ import java.time.LocalDateTime;
@AllArgsConstructor @AllArgsConstructor
@Table(name = "t_user") @Table(name = "t_user")
public class TUserEntity { public class TUserEntity {
@Id @Id
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name = "user_idx", columnDefinition = "int UNSIGNED not null") @Column(name = "user_idx", columnDefinition = "int UNSIGNED not null")

View File

@@ -1,8 +1,9 @@
package com.kri.contact.server.persistence.query; package com.kri.contact.server.persistence.query;
import org.springframework.data.domain.*; import org.springframework.data.domain.Sort;
public class ProjectSorts { public class ProjectSorts {
public static Sort toSort(String sortBy, String sortDir) { public static Sort toSort(String sortBy, String sortDir) {
String prop = switch (sortBy) { String prop = switch (sortBy) {
case "prjctIdx" -> "prjctIdx"; case "prjctIdx" -> "prjctIdx";

View File

@@ -4,11 +4,10 @@ import com.kri.contact.server.persistence.entity.TPrjctAssignEntity;
import com.kri.contact.server.persistence.entity.TPrjctEntity; import com.kri.contact.server.persistence.entity.TPrjctEntity;
import jakarta.persistence.criteria.Predicate; import jakarta.persistence.criteria.Predicate;
import jakarta.persistence.criteria.Root; import jakarta.persistence.criteria.Root;
import java.util.List;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.util.List;
public class ProjectSpecs { public class ProjectSpecs {
public static Specification<TPrjctEntity> isDelFalse() { public static Specification<TPrjctEntity> isDelFalse() {
@@ -17,7 +16,9 @@ public class ProjectSpecs {
public static Specification<TPrjctEntity> keywordLike(String searchText) { public static Specification<TPrjctEntity> keywordLike(String searchText) {
return (root, query, cb) -> { return (root, query, cb) -> {
if (!StringUtils.hasText(searchText)) return cb.conjunction(); if (!StringUtils.hasText(searchText)) {
return cb.conjunction();
}
String like = "%" + searchText.trim() + "%"; String like = "%" + searchText.trim() + "%";
return cb.or( return cb.or(
@@ -29,21 +30,27 @@ public class ProjectSpecs {
public static Specification<TPrjctEntity> statusIn(List<Short> list) { public static Specification<TPrjctEntity> statusIn(List<Short> list) {
return (root, query, cb) -> { return (root, query, cb) -> {
if (list == null || list.isEmpty()) return cb.conjunction(); if (list == null || list.isEmpty()) {
return cb.conjunction();
}
return root.get("prjctStatus").in(list); return root.get("prjctStatus").in(list);
}; };
} }
public static Specification<TPrjctEntity> ownerDeptIn(List<String> list) { public static Specification<TPrjctEntity> ownerDeptIn(List<String> list) {
return (root, query, cb) -> { return (root, query, cb) -> {
if (list == null || list.isEmpty()) return cb.conjunction(); if (list == null || list.isEmpty()) {
return cb.conjunction();
}
return root.get("ownerDept").in(list); return root.get("ownerDept").in(list);
}; };
} }
public static Specification<TPrjctEntity> ownerFwIn(List<String> list) { public static Specification<TPrjctEntity> ownerFwIn(List<String> list) {
return (root, query, cb) -> { return (root, query, cb) -> {
if (list == null || list.isEmpty()) return cb.conjunction(); if (list == null || list.isEmpty()) {
return cb.conjunction();
}
return root.get("ownerFw").in(list); return root.get("ownerFw").in(list);
}; };
} }

View File

@@ -2,14 +2,15 @@ package com.kri.contact.server.persistence.repository;
import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; import com.kri.contact.server.persistence.entity.TPrjctAssignEntity;
import com.kri.contact.server.persistence.entity.TPrjctAssignEntityId; import com.kri.contact.server.persistence.entity.TPrjctAssignEntityId;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.util.List; public interface ProjectAssignRepository extends
JpaRepository<TPrjctAssignEntity, TPrjctAssignEntityId>,
public interface ProjectAssignRepository extends JpaRepository<TPrjctAssignEntity, TPrjctAssignEntityId>, JpaSpecificationExecutor<TPrjctAssignEntity> { JpaSpecificationExecutor<TPrjctAssignEntity> {
@Query(""" @Query("""
select a.id.userId select a.id.userId

View File

@@ -2,12 +2,13 @@ package com.kri.contact.server.persistence.repository;
import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity;
import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntityId; import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntityId;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.Optional; public interface ProjectMainTemplateRepository extends
JpaRepository<TPrjctMainTmplatEntity, TPrjctMainTmplatEntityId>,
public interface ProjectMainTemplateRepository extends JpaRepository<TPrjctMainTmplatEntity, TPrjctMainTmplatEntityId>, JpaSpecificationExecutor<TPrjctMainTmplatEntity> { JpaSpecificationExecutor<TPrjctMainTmplatEntity> {
Optional<TPrjctMainTmplatEntity> findByIdPrjctIdxAndIdChnnlTy(Long prjctIdx, Short chnnlTy); Optional<TPrjctMainTmplatEntity> findByIdPrjctIdxAndIdChnnlTy(Long prjctIdx, Short chnnlTy);

View File

@@ -1,15 +1,15 @@
package com.kri.contact.server.persistence.repository; package com.kri.contact.server.persistence.repository;
import com.kri.contact.server.persistence.entity.TPrjctEntity; import com.kri.contact.server.persistence.entity.TPrjctEntity;
import java.time.LocalDateTime;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.time.LocalDateTime; public interface ProjectRepository extends JpaRepository<TPrjctEntity, Long>,
import java.util.List; JpaSpecificationExecutor<TPrjctEntity> {
public interface ProjectRepository extends JpaRepository<TPrjctEntity, Long>, JpaSpecificationExecutor<TPrjctEntity> {
List<TPrjctEntity> findByItrntPrjctCd(String itrntPrjctCd); List<TPrjctEntity> findByItrntPrjctCd(String itrntPrjctCd);

View File

@@ -4,13 +4,14 @@ package com.kri.contact.server.persistence.repository;
import com.kri.contact.server.common.enums.ResultCodeType; import com.kri.contact.server.common.enums.ResultCodeType;
import com.kri.contact.server.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.entity.TResultCodeEntity;
import com.kri.contact.server.persistence.entity.TResultCodeEntityId; import com.kri.contact.server.persistence.entity.TResultCodeEntityId;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.util.List; public interface ResultCodeRepository extends JpaRepository<TResultCodeEntity, TResultCodeEntityId>,
JpaSpecificationExecutor<TResultCodeEntity> {
public interface ResultCodeRepository extends JpaRepository<TResultCodeEntity, TResultCodeEntityId>, JpaSpecificationExecutor<TResultCodeEntity> {
@Query(""" @Query("""
select r select r
from TResultCodeEntity r from TResultCodeEntity r

View File

@@ -1,11 +1,12 @@
package com.kri.contact.server.persistence.repository; package com.kri.contact.server.persistence.repository;
import com.kri.contact.server.persistence.entity.TRoleEntity; import com.kri.contact.server.persistence.entity.TRoleEntity;
import java.util.List;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.List; public interface RoleRepository extends JpaRepository<TRoleEntity, Integer>,
JpaSpecificationExecutor<TRoleEntity> {
public interface RoleRepository extends JpaRepository<TRoleEntity, Integer>, JpaSpecificationExecutor<TRoleEntity> {
List<TRoleEntity> findByRoleCdGreaterThanEqual(Integer roleCd); List<TRoleEntity> findByRoleCdGreaterThanEqual(Integer roleCd);
} }

View File

@@ -4,5 +4,7 @@ import com.kri.contact.server.persistence.entity.TSysEventLogEntity;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
public interface SystemEventLogRepository extends JpaRepository<TSysEventLogEntity, Long>, JpaSpecificationExecutor<TSysEventLogEntity> { public interface SystemEventLogRepository extends JpaRepository<TSysEventLogEntity, Long>,
JpaSpecificationExecutor<TSysEventLogEntity> {
} }

View File

@@ -1,16 +1,17 @@
package com.kri.contact.server.persistence.repository; package com.kri.contact.server.persistence.repository;
import com.kri.contact.server.persistence.entity.TUserEntity; import com.kri.contact.server.persistence.entity.TUserEntity;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Optional;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import java.time.LocalDateTime; public interface UserRepository extends JpaRepository<TUserEntity, Long>,
import java.util.List; JpaSpecificationExecutor<TUserEntity> {
import java.util.Optional;
public interface UserRepository extends JpaRepository<TUserEntity, Long>, JpaSpecificationExecutor<TUserEntity> {
Optional<TUserEntity> findByUserIdAndUserPwAndDelFalse(String userId, String userPw); Optional<TUserEntity> findByUserIdAndUserPwAndDelFalse(String userId, String userPw);
Optional<TUserEntity> findByUserIdAndDelFalse(String userId); Optional<TUserEntity> findByUserIdAndDelFalse(String userId);
@@ -19,7 +20,8 @@ public interface UserRepository extends JpaRepository<TUserEntity, Long>, JpaSpe
List<TUserEntity> findByUserRoleGreaterThanEqualAndDelFalse(Integer userRoleCd); List<TUserEntity> findByUserRoleGreaterThanEqualAndDelFalse(Integer userRoleCd);
List<TUserEntity> findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn, Integer userRoleCd); List<TUserEntity> findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(String userCmpn,
Integer userRoleCd);
@Query(""" @Query("""
select u select u

View File

@@ -1,16 +1,18 @@
package com.kri.contact.server.scheduler; package com.kri.contact.server.scheduler;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.Duration;
import java.time.Instant;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.io.IOException;
import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes;
import java.time.Duration;
import java.time.Instant;
@Slf4j @Slf4j
@Component @Component
public class TempFileCleanupScheduler { public class TempFileCleanupScheduler {
@@ -27,8 +29,7 @@ public class TempFileCleanupScheduler {
} }
/** /**
* 매일 자정(00:00)에 실행. * 매일 자정(00:00)에 실행. 필요하면 application.yml 에서 kri.contact-senario.temp-cleanup-cron 으로 변경 가능.
* 필요하면 application.yml 에서 kri.contact-senario.temp-cleanup-cron 으로 변경 가능.
*/ */
@Scheduled(cron = "${kri.contact-senario.temp-cleanup-cron:0 0 0 * * *}") @Scheduled(cron = "${kri.contact-senario.temp-cleanup-cron:0 0 0 * * *}")
public void cleanupOldTempFiles() { public void cleanupOldTempFiles() {

View File

@@ -1,16 +1,14 @@
package com.kri.contact.server.service; package com.kri.contact.server.service;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.persistence.entity.TPrjctAssignEntity; import com.kri.contact.server.persistence.entity.TPrjctAssignEntity;
import com.kri.contact.server.persistence.repository.ProjectAssignRepository; import com.kri.contact.server.persistence.repository.ProjectAssignRepository;
import java.time.LocalDateTime;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.List;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class AssignService { public class AssignService {
@@ -34,7 +32,8 @@ public class AssignService {
} }
@Transactional @Transactional
public void upsertPrjctOutsourceAssign(Long prjctIdx, List<String> assignUserIdList, String regUser, LocalDateTime regDt) { public void upsertPrjctOutsourceAssign(Long prjctIdx, List<String> assignUserIdList,
String regUser, LocalDateTime regDt) {
projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange(
prjctIdx, prjctIdx,
ContactConstant.OUTSOURCE_USER_ROLE, ContactConstant.OUTSOURCE_USER_ROLE,
@@ -45,7 +44,8 @@ public class AssignService {
} }
@Transactional @Transactional
public void upsertPrjctFieldworkAssign(Long prjctIdx, List<String> assignUserIdList, String regUser, LocalDateTime regDt) { public void upsertPrjctFieldworkAssign(Long prjctIdx, List<String> assignUserIdList,
String regUser, LocalDateTime regDt) {
projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange( projectAssignRepository.deleteAssignByPrjctIdxAndRoleRange(
prjctIdx, prjctIdx,
ContactConstant.FIELDWORK_USER_ROLE, ContactConstant.FIELDWORK_USER_ROLE,
@@ -55,7 +55,8 @@ public class AssignService {
insertPrjctAssign(prjctIdx, assignUserIdList, regUser, regDt); insertPrjctAssign(prjctIdx, assignUserIdList, regUser, regDt);
} }
private void insertPrjctAssign(Long prjctIdx, List<String> assignUserIdList, String regUser, LocalDateTime regDt) { private void insertPrjctAssign(Long prjctIdx, List<String> assignUserIdList, String regUser,
LocalDateTime regDt) {
if (assignUserIdList == null || assignUserIdList.isEmpty()) { if (assignUserIdList == null || assignUserIdList.isEmpty()) {
return; return;
} }
@@ -66,7 +67,9 @@ public class AssignService {
.distinct() .distinct()
.toList(); .toList();
if (normalized.isEmpty()) return; if (normalized.isEmpty()) {
return;
}
List<TPrjctAssignEntity> entities = normalized.stream() List<TPrjctAssignEntity> entities = normalized.stream()
.map(uid -> TPrjctAssignEntity.create(prjctIdx, uid, regUser, regDt)) .map(uid -> TPrjctAssignEntity.create(prjctIdx, uid, regUser, regDt))

View File

@@ -1,11 +1,11 @@
package com.kri.contact.server.service; package com.kri.contact.server.service;
import com.kri.common.auth.jwt.JwtService;
import com.kri.common.auth.dto.JwtUserClaimsDto; import com.kri.common.auth.dto.JwtUserClaimsDto;
import com.kri.contact.server.dto.LoginRequestDto; import com.kri.common.auth.jwt.JwtService;
import com.kri.contact.server.dto.LoginResponseDto;
import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient; import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient;
import com.kri.contact.server.common.external.intranet.SearchLoginInfoResponseDto; import com.kri.contact.server.common.external.intranet.SearchLoginInfoResponseDto;
import com.kri.contact.server.dto.LoginRequestDto;
import com.kri.contact.server.dto.LoginResponseDto;
import com.kri.contact.server.persistence.entity.TUserEntity; import com.kri.contact.server.persistence.entity.TUserEntity;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -13,13 +13,15 @@ import org.springframework.stereotype.Service;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class AuthService { public class AuthService {
private final JwtService jwtService; private final JwtService jwtService;
private final UserService userService; private final UserService userService;
private final IntranetExtensionApiClient intranetExtensionApiClient; private final IntranetExtensionApiClient intranetExtensionApiClient;
public LoginResponseDto tryLogin(LoginRequestDto request) { public LoginResponseDto tryLogin(LoginRequestDto request) {
SearchLoginInfoResponseDto loginInfoResponse = intranetExtensionApiClient.searchLoginInfo(request); SearchLoginInfoResponseDto loginInfoResponse = intranetExtensionApiClient.searchLoginInfo(
request);
JwtUserClaimsDto claims; JwtUserClaimsDto claims;
if (loginInfoResponse != null) { if (loginInfoResponse != null) {
@@ -30,8 +32,7 @@ public class AuthService {
.userTeam(loginInfoResponse.getUserTeam()) .userTeam(loginInfoResponse.getUserTeam())
.userRole(loginInfoResponse.getUserRole()) .userRole(loginInfoResponse.getUserRole())
.build(); .build();
} } else {
else{
TUserEntity user = userService.getUser(request.getUserId(), request.getUserPw()); TUserEntity user = userService.getUser(request.getUserId(), request.getUserPw());
claims = JwtUserClaimsDto.builder() claims = JwtUserClaimsDto.builder()
.userId(user.getUserId()) .userId(user.getUserId())

View File

@@ -2,6 +2,15 @@ package com.kri.contact.server.service;
import com.kri.common.file.FileUtil; import com.kri.common.file.FileUtil;
import com.kri.common.util.CommonUtil; import com.kri.common.util.CommonUtil;
import java.io.IOException;
import java.nio.file.DirectoryStream;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.StandardCopyOption;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
@@ -12,12 +21,9 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.nio.file.*;
import java.util.*;
@Service @Service
public class FileService { public class FileService {
private static final Logger log = LoggerFactory.getLogger(FileService.class); private static final Logger log = LoggerFactory.getLogger(FileService.class);
private final Path uploadBaseDir; // ex) /data/upload-file/contact-senario private final Path uploadBaseDir; // ex) /data/upload-file/contact-senario
private final String publicBaseUrlPrefix; // ex) /upload-file/contact-senario private final String publicBaseUrlPrefix; // ex) /upload-file/contact-senario
@@ -61,18 +67,17 @@ public class FileService {
} }
/** /**
* 컨택 시나리오 저장 시: * 컨택 시나리오 저장 시: 1) HTML 내 Temp 이미지 -> Asset으로 이동 & src 수정 2) Asset 디렉토리에서 더 이상 사용되지 않는 파일 삭제 3)
* 1) HTML 내 Temp 이미지 -> Asset으로 이동 & src 수정 * 정리된 HTML 반환
* 2) Asset 디렉토리에서 더 이상 사용되지 않는 파일 삭제
* 3) 정리된 HTML 반환
*/ */
public String syncOnSave(String prjctCd, String rawHtml) { public String syncOnSave(String prjctCd, String rawHtml) {
if (rawHtml == null) rawHtml = ""; if (rawHtml == null) {
rawHtml = "";
}
String returnHtml = rawHtml; String returnHtml = rawHtml;
try { try {
// body fragment로 파싱 (KriEditor가 body 없이 <p>...</p> 형태 저장하므로) // body fragment로 파싱 (KriEditor가 body 없이 <p>...</p> 형태 저장하므로)
Document doc = Jsoup.parseBodyFragment(rawHtml); Document doc = Jsoup.parseBodyFragment(rawHtml);
Elements imgs = doc.select("img[src]"); Elements imgs = doc.select("img[src]");
@@ -81,8 +86,12 @@ public class FileService {
for (Element img : imgs) { for (Element img : imgs) {
String src = img.attr("src"); String src = img.attr("src");
if (src == null || src.isBlank()) continue; if (src == null || src.isBlank()) {
if (!src.contains("/" + prjctCd + "/")) continue; continue;
}
if (!src.contains("/" + prjctCd + "/")) {
continue;
}
if (src.contains("/" + prjctCd + "/Temp/")) { if (src.contains("/" + prjctCd + "/Temp/")) {
// Temp → Asset 이동 // Temp → Asset 이동
@@ -104,8 +113,7 @@ public class FileService {
// body 안의 HTML만 반환 (불필요한 <html><body> wrapper 제거) // body 안의 HTML만 반환 (불필요한 <html><body> wrapper 제거)
returnHtml = doc.body().html(); returnHtml = doc.body().html();
} } catch (IOException e) {
catch (IOException e) {
log.warn("temp 파일 이동 실패: {}", rawHtml, e); log.warn("temp 파일 이동 실패: {}", rawHtml, e);
} }
@@ -129,7 +137,9 @@ public class FileService {
} }
private void moveTempToAsset(String prjctCd, String fileName) throws IOException { private void moveTempToAsset(String prjctCd, String fileName) throws IOException {
if (fileName == null || fileName.isBlank()) return; if (fileName == null || fileName.isBlank()) {
return;
}
Path tempDir = getTempDir(prjctCd); Path tempDir = getTempDir(prjctCd);
Path assetDir = getAssetDir(prjctCd); Path assetDir = getAssetDir(prjctCd);
@@ -151,11 +161,15 @@ public class FileService {
private void cleanupAssetDir(String prjctCd, Set<String> keepFileNames) throws IOException { private void cleanupAssetDir(String prjctCd, Set<String> keepFileNames) throws IOException {
Path assetDir = getAssetDir(prjctCd); Path assetDir = getAssetDir(prjctCd);
if (!Files.exists(assetDir)) return; if (!Files.exists(assetDir)) {
return;
}
try (DirectoryStream<Path> stream = Files.newDirectoryStream(assetDir)) { try (DirectoryStream<Path> stream = Files.newDirectoryStream(assetDir)) {
for (Path path : stream) { for (Path path : stream) {
if (!Files.isRegularFile(path)) continue; if (!Files.isRegularFile(path)) {
continue;
}
String fileName = path.getFileName().toString(); String fileName = path.getFileName().toString();
if (!keepFileNames.contains(fileName)) { if (!keepFileNames.contains(fileName)) {
Files.deleteIfExists(path); Files.deleteIfExists(path);

View File

@@ -1,37 +1,50 @@
package com.kri.contact.server.service; package com.kri.contact.server.service;
import com.kri.common.web.BusinessException; import com.kri.common.web.BusinessException;
import com.kri.common.webmvc.page.*; import com.kri.common.webmvc.page.PageRequestDto;
import com.kri.common.webmvc.page.PageResponseDto;
import com.kri.common.webmvc.page.Pageables;
import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.dto.*;; import com.kri.contact.server.dto.ProjectCreateRequestDto;
import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity; import com.kri.contact.server.dto.ProjectInfoDto;
import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto;
import com.kri.contact.server.dto.ProjectOwnerResponseDto;
import com.kri.contact.server.dto.ProjectSearchRequestDto;
import com.kri.contact.server.dto.ProjectUpdateRequestDto;
import com.kri.contact.server.persistence.entity.TPrjctEntity; import com.kri.contact.server.persistence.entity.TPrjctEntity;
import com.kri.contact.server.persistence.entity.TPrjctMainTmplatEntity;
import com.kri.contact.server.persistence.query.ProjectSpecs; import com.kri.contact.server.persistence.query.ProjectSpecs;
import com.kri.contact.server.persistence.repository.ProjectMainTemplateRepository; import com.kri.contact.server.persistence.repository.ProjectMainTemplateRepository;
import com.kri.contact.server.persistence.repository.ProjectRepository; import com.kri.contact.server.persistence.repository.ProjectRepository;
import org.springframework.dao.DataIntegrityViolationException; import java.time.LocalDateTime;
import org.springframework.data.domain.*; import java.util.List;
import java.util.Objects;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.dao.DataIntegrityViolationException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; ;
import java.util.*;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class ProjectService { public class ProjectService {
private static final List<Short> STATUS_0_1 = List.of((short) 0, (short) 1);
private static final List<Short> STATUS_1 = List.of((short) 1);
private final AssignService assignService; private final AssignService assignService;
private final ResultCodeService resultCodeService; private final ResultCodeService resultCodeService;
private final ProjectRepository projectRepository; private final ProjectRepository projectRepository;
private final ProjectMainTemplateRepository projectMainTemplateRepository; private final ProjectMainTemplateRepository projectMainTemplateRepository;
private static final List<Short> STATUS_0_1 = List.of((short) 0, (short) 1);
private static final List<Short> STATUS_1 = List.of((short) 1);
@Transactional @Transactional
public ProjectInfoDto createProject(ProjectCreateRequestDto req, String regUser, LocalDateTime regDt) { public ProjectInfoDto createProject(ProjectCreateRequestDto req, String regUser,
LocalDateTime regDt) {
String itrnt = req.getItrntPrjctCd(); String itrnt = req.getItrntPrjctCd();
try { try {
@@ -54,7 +67,8 @@ public class ProjectService {
return ProjectInfoDto.from(projectRepository.findByPrjctIdxAndDelFalse(prjctIdx)); return ProjectInfoDto.from(projectRepository.findByPrjctIdxAndDelFalse(prjctIdx));
} }
public List<ProjectInfoDto> getTopProject(int topCount, String keyword, String userId, Integer userRole) { public List<ProjectInfoDto> getTopProject(int topCount, String keyword, String userId,
Integer userRole) {
Specification<TPrjctEntity> spec = Specification<TPrjctEntity> spec =
ProjectSpecs.keywordLike(keyword) ProjectSpecs.keywordLike(keyword)
.and(ProjectSpecs.isDelFalse()); .and(ProjectSpecs.isDelFalse());
@@ -77,7 +91,8 @@ public class ProjectService {
.toList(); .toList();
} }
public PageResponseDto<ProjectInfoDto> searchProject(ProjectSearchRequestDto req, String userId, Integer userRole) { public PageResponseDto<ProjectInfoDto> searchProject(ProjectSearchRequestDto req, String userId,
Integer userRole) {
Specification<TPrjctEntity> spec = Specification<TPrjctEntity> spec =
ProjectSpecs.keywordLike(req.getPrjctText()) ProjectSpecs.keywordLike(req.getPrjctText())
.and(ProjectSpecs.isDelFalse()) .and(ProjectSpecs.isDelFalse())
@@ -137,7 +152,8 @@ public class ProjectService {
} }
@Transactional @Transactional
public void updateProject(long prjctIdx, ProjectUpdateRequestDto req, String modUser, LocalDateTime modDt) { public void updateProject(long prjctIdx, ProjectUpdateRequestDto req, String modUser,
LocalDateTime modDt) {
// dirty checking 업데이트 // dirty checking 업데이트
TPrjctEntity entity = projectRepository.findById(prjctIdx) TPrjctEntity entity = projectRepository.findById(prjctIdx)
.orElseThrow(() -> .orElseThrow(() ->
@@ -152,11 +168,14 @@ public class ProjectService {
} }
@Transactional @Transactional
public void updateProjectMainTemplate(ProjectMainTemplateUpdateRequestDto req, String modUser, LocalDateTime modDt) { public void updateProjectMainTemplate(ProjectMainTemplateUpdateRequestDto req, String modUser,
LocalDateTime modDt) {
Short chnnlTy = req.getChnnlTy().getCode(); Short chnnlTy = req.getChnnlTy().getCode();
projectMainTemplateRepository.deleteByIdPrjctIdxAndIdChnnlTy(req.getPrjctIdx(), chnnlTy); projectMainTemplateRepository.deleteByIdPrjctIdxAndIdChnnlTy(req.getPrjctIdx(), chnnlTy);
if(req.getTmplatIdx() == null) return; if (req.getTmplatIdx() == null) {
return;
}
TPrjctMainTmplatEntity entity = TPrjctMainTmplatEntity.create(req, modUser, modDt); TPrjctMainTmplatEntity entity = TPrjctMainTmplatEntity.create(req, modUser, modDt);
projectMainTemplateRepository.save(entity); projectMainTemplateRepository.save(entity);

View File

@@ -1,20 +1,16 @@
package com.kri.contact.server.service; package com.kri.contact.server.service;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.common.web.BusinessException;
import com.kri.contact.server.common.enums.ResultCodeType; 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.persistence.entity.TResultCodeEntity; import com.kri.contact.server.persistence.entity.TResultCodeEntity;
import com.kri.contact.server.persistence.entity.TResultCodeEntityId;
import com.kri.contact.server.persistence.repository.ResultCodeRepository; import com.kri.contact.server.persistence.repository.ResultCodeRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@@ -38,14 +34,16 @@ public class ResultCodeService {
.map(ResultCodeDto::from) .map(ResultCodeDto::from)
.toList(); .toList();
} else { } else {
return resultCodeRepository.findByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy.getCode()).stream() return resultCodeRepository.findByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy.getCode())
.stream()
.map(ResultCodeDto::from) .map(ResultCodeDto::from)
.toList(); .toList();
} }
} }
@Transactional @Transactional
public void updateResultCode(long prjctIdx, List<ResultCodeDto> resultCodeDtoList, String modUser, LocalDateTime modDt) { public void updateResultCode(long prjctIdx, List<ResultCodeDto> resultCodeDtoList, String modUser,
LocalDateTime modDt) {
if (resultCodeDtoList != null && !resultCodeDtoList.isEmpty()) { if (resultCodeDtoList != null && !resultCodeDtoList.isEmpty()) {
Map<ResultCodeType, List<ResultCodeDto>> dtoGroupByType = resultCodeDtoList.stream() Map<ResultCodeType, List<ResultCodeDto>> dtoGroupByType = resultCodeDtoList.stream()
.filter(dto -> dto.getResultCdTy() != null) .filter(dto -> dto.getResultCdTy() != null)
@@ -58,7 +56,8 @@ public class ResultCodeService {
} }
/*************************private************************************/ /*************************private************************************/
private void replaceResultCodes(long prjctIdx, ResultCodeType resultCdTy, List<ResultCodeDto> dtos, String userId, LocalDateTime modDt) { private void replaceResultCodes(long prjctIdx, ResultCodeType resultCdTy,
List<ResultCodeDto> dtos, String userId, LocalDateTime modDt) {
resultCodeRepository.deleteByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy); resultCodeRepository.deleteByIdPrjctIdxAndIdResultCdTy(prjctIdx, resultCdTy);
List<TResultCodeEntity> entities = dtos.stream() List<TResultCodeEntity> entities = dtos.stream()

View File

@@ -3,11 +3,10 @@ package com.kri.contact.server.service;
import com.kri.contact.server.common.consts.ContactConstant; import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.dto.RoleInfoDto; import com.kri.contact.server.dto.RoleInfoDto;
import com.kri.contact.server.persistence.repository.RoleRepository; import com.kri.contact.server.persistence.repository.RoleRepository;
import java.util.List;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class RoleService { public class RoleService {

View File

@@ -1,23 +1,26 @@
package com.kri.contact.server.service; package com.kri.contact.server.service;
import static com.kri.common.json.JsonUtil.toMap;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.kri.contact.server.dto.*;
import com.kri.contact.server.dto.systemlog.UploadUserContentDto;
import com.kri.contact.server.common.enums.SystemEventType; import com.kri.contact.server.common.enums.SystemEventType;
import com.kri.contact.server.dto.ProjectCreateRequestDto;
import com.kri.contact.server.dto.ProjectMainTemplateUpdateRequestDto;
import com.kri.contact.server.dto.ProjectUpdateRequestDto;
import com.kri.contact.server.dto.UserInfoDto;
import com.kri.contact.server.dto.systemlog.UploadUserContentDto;
import com.kri.contact.server.persistence.entity.TSysEventLogEntity; import com.kri.contact.server.persistence.entity.TSysEventLogEntity;
import com.kri.contact.server.persistence.repository.SystemEventLogRepository; import com.kri.contact.server.persistence.repository.SystemEventLogRepository;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import lombok.RequiredArgsConstructor;
import static com.kri.common.json.JsonUtil.toMap; import org.springframework.stereotype.Service;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class SystemEventLogService { public class SystemEventLogService {
private final ObjectMapper objectMapper; private final ObjectMapper objectMapper;
private final SystemEventLogRepository systemEventLogRepository; private final SystemEventLogRepository systemEventLogRepository;
@@ -47,19 +50,26 @@ public class SystemEventLogService {
); );
} }
public void writeCreateUserLog(String regId, LocalDateTime regDt, String clientIp, UserInfoDto userInfo) { public void writeCreateUserLog(String regId, LocalDateTime regDt, String clientIp,
writeSystemLog(SystemEventType.CREATE_USER, "Create User", null, regId, regDt, clientIp, userInfo); UserInfoDto userInfo) {
writeSystemLog(SystemEventType.CREATE_USER, "Create User", null, regId, regDt, clientIp,
userInfo);
} }
public void writeUploadUserLog(String regId, LocalDateTime regDt, String clientIp, UploadUserContentDto content) { public void writeUploadUserLog(String regId, LocalDateTime regDt, String clientIp,
writeSystemLog(SystemEventType.UPLOAD_USER, "Upload User", null, regId, regDt, clientIp, content); UploadUserContentDto content) {
writeSystemLog(SystemEventType.UPLOAD_USER, "Upload User", null, regId, regDt, clientIp,
content);
} }
public void writeUpdateUserLog(String regId, LocalDateTime regDt, String clientIp, UserInfoDto userInfo) { public void writeUpdateUserLog(String regId, LocalDateTime regDt, String clientIp,
writeSystemLog(SystemEventType.UPDATE_USER, "Update User", null, regId, regDt, clientIp, userInfo); UserInfoDto userInfo) {
writeSystemLog(SystemEventType.UPDATE_USER, "Update User", null, regId, regDt, clientIp,
userInfo);
} }
public void writeDeleteUserLog(String regId, LocalDateTime regDt, String clientIp, String userId) { public void writeDeleteUserLog(String regId, LocalDateTime regDt, String clientIp,
String userId) {
writeSystemLog( writeSystemLog(
SystemEventType.DELETE_USER, SystemEventType.DELETE_USER,
"Delete User", "Delete User",
@@ -72,19 +82,26 @@ public class SystemEventLogService {
); );
} }
public void writeCreateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ProjectCreateRequestDto req) { public void writeCreateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx,
writeSystemLog(SystemEventType.CREATE_PROJECT, "Create Project", prjctIdx, regId, regDt, clientIp, req); ProjectCreateRequestDto req) {
writeSystemLog(SystemEventType.CREATE_PROJECT, "Create Project", prjctIdx, regId, regDt,
clientIp, req);
} }
public void writeUpdateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, ProjectUpdateRequestDto req) { public void writeUpdateProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx,
writeSystemLog(SystemEventType.UPDATE_PROJECT, "Update Project", prjctIdx, regId, regDt, clientIp, req); ProjectUpdateRequestDto req) {
writeSystemLog(SystemEventType.UPDATE_PROJECT, "Update Project", prjctIdx, regId, regDt,
clientIp, req);
} }
public void writeUpdateDefaultMessageTemplate(String regId, LocalDateTime regDt, String clientIp, ProjectMainTemplateUpdateRequestDto req) { public void writeUpdateDefaultMessageTemplate(String regId, LocalDateTime regDt, String clientIp,
writeSystemLog(SystemEventType.UPDATE_PROJECT_DEFAULT_TEMPLATE, "Update Project Default Message Template", req.getPrjctIdx(), regId, regDt, clientIp, req); ProjectMainTemplateUpdateRequestDto req) {
writeSystemLog(SystemEventType.UPDATE_PROJECT_DEFAULT_TEMPLATE,
"Update Project Default Message Template", req.getPrjctIdx(), regId, regDt, clientIp, req);
} }
public void writeDeleteProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx) { public void writeDeleteProject(String regId, LocalDateTime regDt, String clientIp,
Long prjctIdx) {
writeSystemLog( writeSystemLog(
SystemEventType.DELETE_PROJECT, SystemEventType.DELETE_PROJECT,
"Delete Project", "Delete Project",
@@ -97,7 +114,8 @@ public class SystemEventLogService {
); );
} }
public void writeAssignUserProject(String regId, LocalDateTime regDt, String clientIp, Long prjctIdx, List<String> assignUserIdList) { public void writeAssignUserProject(String regId, LocalDateTime regDt, String clientIp,
Long prjctIdx, List<String> assignUserIdList) {
writeSystemLog( writeSystemLog(
SystemEventType.ASSIGN_PROJECT_USER, SystemEventType.ASSIGN_PROJECT_USER,
"Assign Project FW User", "Assign Project FW User",

View File

@@ -14,21 +14,22 @@ import com.kri.contact.server.dto.excel.UserUploadDto;
import com.kri.contact.server.dto.excel.UserUploadErrorDto; import com.kri.contact.server.dto.excel.UserUploadErrorDto;
import com.kri.contact.server.persistence.entity.TUserEntity; import com.kri.contact.server.persistence.entity.TUserEntity;
import com.kri.contact.server.persistence.repository.UserRepository; import com.kri.contact.server.persistence.repository.UserRepository;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.*;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import lombok.RequiredArgsConstructor;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.ss.usermodel.WorkbookFactory;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
public class UserService { public class UserService {
private final IntranetExtensionApiClient intranetExtensionApiClient; private final IntranetExtensionApiClient intranetExtensionApiClient;
private final RoleService roleService; private final RoleService roleService;
private final UserRepository userRepository; private final UserRepository userRepository;
@@ -40,7 +41,8 @@ public class UserService {
userInfo.setUserId(userInfo.getUserId().toLowerCase()); userInfo.setUserId(userInfo.getUserId().toLowerCase());
List<DataVerificationDto> failList = validateUserDto(userInfo, roleList, intranetUserList).stream().filter(dto -> !dto.isSuccess()).toList(); List<DataVerificationDto> failList = validateUserDto(userInfo, roleList,
intranetUserList).stream().filter(dto -> !dto.isSuccess()).toList();
if (!failList.isEmpty()) { if (!failList.isEmpty()) {
DataVerificationDto firstFail = failList.get(0); DataVerificationDto firstFail = failList.get(0);
throw BusinessException.badRequest("WRONG_USER_DATA", firstFail.getErrMessage()); throw BusinessException.badRequest("WRONG_USER_DATA", firstFail.getErrMessage());
@@ -52,7 +54,8 @@ public class UserService {
} }
@Transactional @Transactional
public ExcelUploadResponseDto createUsersFromExcel(MultipartFile file, String regUser, LocalDateTime regDt, String forceCmpn) { public ExcelUploadResponseDto createUsersFromExcel(MultipartFile file, String regUser,
LocalDateTime regDt, String forceCmpn) {
if (file == null || file.isEmpty()) { if (file == null || file.isEmpty()) {
throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다."); throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다.");
} }
@@ -88,7 +91,8 @@ public class UserService {
int rowNumber = i + 2; // 엑셀 실제 행 번호 (헤더가 1행일 때) int rowNumber = i + 2; // 엑셀 실제 행 번호 (헤더가 1행일 때)
// 1) 값 검증 // 1) 값 검증
List<UserUploadErrorDto> rowErrors = validateUserDtoForExcel(dto, rowNumber, roleList, intranetUserList); List<UserUploadErrorDto> rowErrors = validateUserDtoForExcel(dto, rowNumber, roleList,
intranetUserList);
if (!rowErrors.isEmpty()) { if (!rowErrors.isEmpty()) {
errorList.addAll(rowErrors); errorList.addAll(rowErrors);
continue; // 이 행은 DB 저장 스킵 continue; // 이 행은 DB 저장 스킵
@@ -165,10 +169,11 @@ public class UserService {
public List<UserInfoDto> getFieldworkUserListWithCmpn(String searchCmpn) { public List<UserInfoDto> getFieldworkUserListWithCmpn(String searchCmpn) {
List<TUserEntity> userList; List<TUserEntity> userList;
if (searchCmpn == null || searchCmpn.isBlank()) { if (searchCmpn == null || searchCmpn.isBlank()) {
userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(ContactConstant.FIELDWORK_USER_ROLE); userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(
} ContactConstant.FIELDWORK_USER_ROLE);
else{ } else {
userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn, ContactConstant.FIELDWORK_USER_ROLE); userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn,
ContactConstant.FIELDWORK_USER_ROLE);
} }
return userList.stream() return userList.stream()
@@ -205,7 +210,8 @@ public class UserService {
@Transactional @Transactional
public void deleteUser(String userId, String delUser) { public void deleteUser(String userId, String delUser) {
int deleteCount = userRepository.softDeleteByUserId(userId, delUser, DateTimeUtil.nowKstLocalDateTime()); int deleteCount = userRepository.softDeleteByUserId(userId, delUser,
DateTimeUtil.nowKstLocalDateTime());
if (deleteCount == 0) { if (deleteCount == 0) {
throw BusinessException.notFound("USER_NOT_FOUND", "사용자를 찾을 수 없습니다.") throw BusinessException.notFound("USER_NOT_FOUND", "사용자를 찾을 수 없습니다.")
@@ -227,7 +233,8 @@ public class UserService {
if (userRepository.existsByUserIdAndDelFalse(userId)) { if (userRepository.existsByUserIdAndDelFalse(userId)) {
return new DataVerificationDto(false, "사용자 ID", "이미 사용중인 ID입니다."); return new DataVerificationDto(false, "사용자 ID", "이미 사용중인 ID입니다.");
} }
if(intranetUserList.contains(userId) || intranetUserList.contains(String.format("%s@kric.com", userId))) { if (intranetUserList.contains(userId) || intranetUserList.contains(
String.format("%s@kric.com", userId))) {
return new DataVerificationDto(false, "사용자 ID", "이미 사용중인 직원 ID입니다."); return new DataVerificationDto(false, "사용자 ID", "이미 사용중인 직원 ID입니다.");
} }
@@ -322,7 +329,8 @@ public class UserService {
) { ) {
List<UserUploadErrorDto> errors = new ArrayList<>(); List<UserUploadErrorDto> errors = new ArrayList<>();
List<DataVerificationDto> validateUserList = this.validateUserDto(dto, roleList, intranetUserList); List<DataVerificationDto> validateUserList = this.validateUserDto(dto, roleList,
intranetUserList);
validateUserList.forEach(validateResult -> { validateUserList.forEach(validateResult -> {
if (!validateResult.isSuccess()) { if (!validateResult.isSuccess()) {

View File

@@ -18,10 +18,11 @@ spring:
hibernate: hibernate:
dialect: org.hibernate.dialect.MySQL8Dialect dialect: org.hibernate.dialect.MySQL8Dialect
format_sql: true format_sql: true
show_sql: true show_sql: false
open-in-view: false open-in-view: false
logging: logging:
level: level:
org.hibernate.SQL: debug org.hibernate.SQL: DEBUG
org.hibernate.type.descriptor.sql.BasicBinder: trace org.hibernate.orm.jdbc.bind: TRACE
org.hibernate.orm.jdbc.extract: TRACE

View File

@@ -1,5 +1,6 @@
server: server:
port: 4001 port: 4001
forward-headers-strategy: framework
spring: spring:
application: application: