From 825282deab1d69dbfd42215c4b48a62c2a50d0ef Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 15 Jun 2026 11:40:02 +0900 Subject: [PATCH 1/6] =?UTF-8?q?260615=5F02=5FENH:=20kon=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EB=A7=A4=ED=8D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/controller/AssignController.java | 4 ++- .../dto/kon/PerformanceApplyCountDto.java | 17 ++++++++++++ .../persistence/mapper/kon/KonMapper.java | 14 ++++++++++ .../back/service/PerformanceService.java | 12 +++++++++ src/main/resources/application-dev.yaml | 5 +++- src/main/resources/application-local.yaml | 5 +++- src/main/resources/application-prod.yaml | 5 +++- .../mybatis/mapper/kon/KonMapper.xml | 26 +++++++++++++++++++ 8 files changed, 84 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyCountDto.java create mode 100644 src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java create mode 100644 src/main/resources/mybatis/mapper/kon/KonMapper.xml diff --git a/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java b/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java index 5a68aae..562f986 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java @@ -2,6 +2,7 @@ package com.kri.gwcf.review.back.controller; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; +import com.kri.gwcf.review.back.service.AssignService; import com.kri.gwcf.review.back.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -18,13 +19,14 @@ import org.springframework.web.bind.annotation.RestController; @Tag(name = "Assign", description = "배정 API") public class AssignController { + private final AssignService assignService; private final SystemEventLogService systemEventLogService; @Operation(summary = "참여 동의") @PostMapping("/confirm/{userId}") public boolean assignConfirm(@PathVariable String userId, RequestUserContext ctx) { final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - + //TODO: 기능 구현 필요 systemEventLogService.writeAssignConfirmLog(userId, now, ctx.getClientIp()); return false; } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyCountDto.java b/src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyCountDto.java new file mode 100644 index 0000000..2a6a7ca --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyCountDto.java @@ -0,0 +1,17 @@ +package com.kri.gwcf.review.back.dto.kon; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "KON 공연 신청 수") +public class PerformanceApplyCountDto { + + @Schema(description = "공연 ID") + private String performanceId; + + @Schema(description = "신청 수") + private Long applyCnt; +} diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java b/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java new file mode 100644 index 0000000..29f9632 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java @@ -0,0 +1,14 @@ +package com.kri.gwcf.review.back.persistence.mapper.kon; + +import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; +import java.util.List; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface KonMapper { + + List findPerformanceApplyCount( + @Param("surveyType") String surveyType + ); +} diff --git a/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java b/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java index 3eda8e3..d0f32c4 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java @@ -14,6 +14,7 @@ import com.kri.gwcf.review.back.dto.common.CodeDto; import com.kri.gwcf.review.back.dto.excel.ExcelErrorDto; import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto; import com.kri.gwcf.review.back.dto.excel.PerformanceUploadDto; +import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; import com.kri.gwcf.review.back.dto.performance.PerformanceCompactDto; import com.kri.gwcf.review.back.dto.performance.PerformanceFullDto; import com.kri.gwcf.review.back.dto.performance.PerformanceMonitoringScheduleDto; @@ -22,6 +23,7 @@ import com.kri.gwcf.review.back.persistence.entity.TPerformanceDetailEntity; import com.kri.gwcf.review.back.persistence.entity.TPerformanceEntity; import com.kri.gwcf.review.back.persistence.entity.TPerformanceMonitoringScheduleEntity; import com.kri.gwcf.review.back.persistence.entity.TPerformanceStaffEntity; +import com.kri.gwcf.review.back.persistence.mapper.kon.KonMapper; import com.kri.gwcf.review.back.persistence.repository.PerformanceDetailRepository; import com.kri.gwcf.review.back.persistence.repository.PerformanceMonitoringScheduleRepository; import com.kri.gwcf.review.back.persistence.repository.PerformanceRepository; @@ -38,6 +40,7 @@ import java.util.Objects; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -46,6 +49,7 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class PerformanceService { + private final KonMapper konMapper; private final PerformanceRepository performanceRepository; private final PerformanceDetailRepository performanceDetailRepository; private final PerformanceStaffRepository performanceStaffRepository; @@ -55,6 +59,9 @@ public class PerformanceService { private final ReviewService reviewService; private final VisitService visitService; + @Value("${kon.survey-type:LIST}") + private String surveyType; + public PerformanceFullDto getPerformance(Integer performanceId) { TPerformanceEntity performance = getPerformanceEntity(performanceId); return toFullDto(performance); @@ -200,6 +207,11 @@ public class PerformanceService { } } + @Transactional(readOnly = true, transactionManager = "konTransactionManager") + public List findPerformanceApplyCount() { + return konMapper.findPerformanceApplyCount(surveyType); + } + private PerformanceFullDto toFullDto(TPerformanceEntity performance) { Integer performanceId = performance.getId(); diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index 6f6e773..e7d5bda 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -4,4 +4,7 @@ spring: url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/test_gwcf_review?characterEncoding=UTF-8&rewriteBatchedStatements=true username: prjct_gwcf password: gwcf#260608 - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file + driver-class-name: com.mysql.cj.jdbc.Driver + +kon: + survey-type: TEST diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml index 5762fe2..f5f1c20 100644 --- a/src/main/resources/application-local.yaml +++ b/src/main/resources/application-local.yaml @@ -22,4 +22,7 @@ logging: org.hibernate.SQL: DEBUG #org.hibernate.orm.jdbc.bind: TRACE #org.hibernate.orm.jdbc.extract: TRACE - org.hibernate.engine.jdbc.batch.internal: DEBUG \ No newline at end of file + org.hibernate.engine.jdbc.batch.internal: DEBUG + +kon: + survey-type: TEST diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml index b285f7f..872f6f2 100644 --- a/src/main/resources/application-prod.yaml +++ b/src/main/resources/application-prod.yaml @@ -4,4 +4,7 @@ spring: url: jdbc:mysql://db-md87m.vpc-cdb.ntruss.com:3306/prjct_gwcf_review?characterEncoding=UTF-8&rewriteBatchedStatements=true username: prjct_gwcf password: gwcf#260608 - driver-class-name: com.mysql.cj.jdbc.Driver \ No newline at end of file + driver-class-name: com.mysql.cj.jdbc.Driver + +kon: + survey-type: LIST diff --git a/src/main/resources/mybatis/mapper/kon/KonMapper.xml b/src/main/resources/mybatis/mapper/kon/KonMapper.xml new file mode 100644 index 0000000..88fab48 --- /dev/null +++ b/src/main/resources/mybatis/mapper/kon/KonMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + -- 2.49.0.windows.1 From 06e45691572f1399865e905a43293938a1c98af7 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 17 Jun 2026 15:39:24 +0900 Subject: [PATCH 2/6] =?UTF-8?q?260617=5F01=5FENH:=20=EB=B0=B0=EC=A0=95=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=9C=84=ED=95=B4=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C=20=EC=A4=91=EB=8F=84=20=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/common/enums/SystemEventType.java | 4 +- .../back/controller/AssignController.java | 131 +++++- .../back/controller/CodeController.java | 27 ++ .../controller/MonitoringVisitController.java | 95 ++++ .../back/controller/ReviewController.java | 124 +++++ .../back/dto/assign/AssignUserCountDto.java | 16 + .../MonitoringAssignSaveRequestDto.java | 17 + .../back/dto/excel/WrittenUserAssignDto.java | 25 + .../back/dto/kon/PerformanceApplyUserDto.java | 18 + .../monitoring/MonitoringApplyUserDto.java | 21 + .../monitoring/MonitoringGpsRequestDto.java | 25 + .../PerformanceMonitoringVisitDto.java | 9 + .../dto/performance/PerformanceReviewDto.java | 4 + .../TPerformanceMonitoringVisitEntity.java | 2 + .../entity/TPerformanceReviewEntity.java | 19 +- .../persistence/entity/TUserDetailEntity.java | 2 + .../entity/id/TPerformanceReviewEntityId.java | 6 +- .../persistence/mapper/kon/KonMapper.java | 6 + .../PerformanceAssignRepository.java | 40 ++ .../PerformanceMonitoringVisitRepository.java | 5 + .../PerformanceReviewRepository.java | 15 +- .../review/back/service/AssignService.java | 428 ++++++++++++++++++ .../review/back/service/ReviewService.java | 234 +++++++++- .../review/back/service/VisitService.java | 173 ++++++- .../service/common/SystemEventLogService.java | 175 ++++++- src/main/resources/application-dev.yaml | 4 + src/main/resources/application-local.yaml | 4 + src/main/resources/application-prod.yaml | 4 + src/main/resources/application.yaml | 2 + .../mybatis/mapper/kon/KonMapper.xml | 42 +- 30 files changed, 1643 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/kri/gwcf/review/back/controller/CodeController.java create mode 100644 src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java create mode 100644 src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/assign/AssignUserCountDto.java create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/assign/MonitoringAssignSaveRequestDto.java create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyUserDto.java create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringApplyUserDto.java create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringGpsRequestDto.java diff --git a/src/main/java/com/kri/gwcf/review/back/common/enums/SystemEventType.java b/src/main/java/com/kri/gwcf/review/back/common/enums/SystemEventType.java index 2fed604..e8d17be 100644 --- a/src/main/java/com/kri/gwcf/review/back/common/enums/SystemEventType.java +++ b/src/main/java/com/kri/gwcf/review/back/common/enums/SystemEventType.java @@ -27,13 +27,15 @@ public enum SystemEventType implements CodeEnum { ASSIGN_PERFORMANCE_CONFIRM((short) 1032), //공연 배정 승인 ASSIGN_PERFORMANCE_REJECT((short) 1033), //공연 배정 거절 ASSIGN_PERFORMANCE_FORCE((short) 1034), //강제 공연 배정 + UPLOAD_WRITTEN_ASSIGN((short) 1036), VISIT_START((short) 2011), //모니터링 출발 VISIT_END((short) 2012), //모니터링 도착 UPLOAD_MONITORING_REVIEW((short) 2041), //모니터링 결과보고서 업로드 UPLOAD_LOCAL_GOV_REVIEW((short) 2042), //지자체 결과보고서 업로드 - UPDATE_WRITTEN_REVIEW((short) 2043), //지자체 결과보고서 업로드 + START_WRITTEN_REVIEW((short) 2044), // 서면 평가 시작 + END_WRITTEN_REVIEW((short) 2045), // 서면평가 종료 DUMMY((short) 9999); diff --git a/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java b/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java index 562f986..97851a7 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/AssignController.java @@ -1,17 +1,34 @@ package com.kri.gwcf.review.back.controller; +import static com.kri.gwcf.review.back.common.util.ExcelResponseBuilder.buildExcelResponse; + import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; +import com.kri.gwcf.review.back.dto.assign.AssignUserCountDto; +import com.kri.gwcf.review.back.dto.assign.MonitoringAssignSaveRequestDto; +import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto; +import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; +import com.kri.gwcf.review.back.dto.monitoring.MonitoringApplyUserDto; +import com.kri.gwcf.review.back.dto.performance.PerformanceAssignDto; +import com.kri.gwcf.review.back.dto.systemlog.UploadContentDto; import com.kri.gwcf.review.back.service.AssignService; import com.kri.gwcf.review.back.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.time.LocalDateTime; +import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +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.RequestMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; @RestController @RequestMapping("/api/v1/assign") @@ -22,12 +39,116 @@ public class AssignController { private final AssignService assignService; private final SystemEventLogService systemEventLogService; + @Operation(summary = "사용자별 배정 건수 조회") + @GetMapping("/users/count") + public List findAssignUserCounts() { + return assignService.findAssignUserCounts(); + } + + @Operation(summary = "모니터링 신청자 목록") + @GetMapping("/monitoring/apply-users/{performanceId}") + public List findMonitoringApplyUsers( + @PathVariable Integer performanceId + ) { + return assignService.findMonitoringApplyUsers(performanceId); + } + + @Operation(summary = "공연별 모니터링 신청자 수") + @GetMapping("/monitoring/apply-users/count") + public List findMonitoringApplyUsersCount() { + return assignService.findMonitoringApplyUsersCount(); + } + + @Operation(summary = "참여 동의") - @PostMapping("/confirm/{userId}") - public boolean assignConfirm(@PathVariable String userId, RequestUserContext ctx) { + @PostMapping("/confirm/{performanceId}/{userId}") + public String assignConfirm( + @PathVariable Integer performanceId, + @PathVariable String userId, + RequestUserContext ctx + ) { final LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - //TODO: 기능 구현 필요 - systemEventLogService.writeAssignConfirmLog(userId, now, ctx.getClientIp()); - return false; + String result = assignService.confirmMonitoringAssignByUser(performanceId, userId); + systemEventLogService.writeAssignConfirmLog(userId, now, ctx.getClientIp(), String.valueOf(performanceId)); + return result; + } + + @Operation(summary = "모니터링 배정 저장") + @PostMapping("/monitoring") + public List saveMonitoringAssign( + @RequestBody MonitoringAssignSaveRequestDto dto, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + List result = + assignService.saveMonitoringAssign(dto.getPerformanceId(), dto.getUserIds(), ctx.getUserId(), now); + systemEventLogService.writeAssignPerformanceRequestLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + dto.getPerformanceId(), + dto.getUserIds() + ); + return result; + } + + @Operation(summary = "서면평가위원 일괄 배정 양식 다운로드") + @PostMapping("/written/excel/template") + public ResponseEntity exportUserTemplate() { + byte[] bytes = assignService.exportAssignTemplate(); + return buildExcelResponse("user_assign_template.xlsx", bytes); + } + + @Operation(summary = "서면평가위원 일괄 배정(엑셀 업로드)") + @PostMapping(value = "/written/excel/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public ExcelUploadResultDto createWrittenAssignsFromExcel( + @RequestParam("file") MultipartFile file, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + ExcelUploadResultDto result = assignService.createWrittenAssignsFromExcel(file, ctx.getUserId(), now); + systemEventLogService.writeUploadWrittenAssignLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + UploadContentDto.from(file) + ); + return result; + } + + @Operation(summary = "배정 확정") + @PatchMapping("/confirm/{performanceId}/{userId}") + public void confirmAssign( + @PathVariable Integer performanceId, + @PathVariable String userId, + RequestUserContext ctx + ) { + assignService.confirmAssign(performanceId, userId, true); + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + systemEventLogService.writeAssignConfirmByAdminLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + performanceId, + userId + ); + } + + @Operation(summary = "배정 취소") + @PatchMapping("/cancel/{performanceId}/{userId}") + public void cancelAssign( + @PathVariable Integer performanceId, + @PathVariable String userId, + RequestUserContext ctx + ) { + assignService.confirmAssign(performanceId, userId, false); + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + systemEventLogService.writeAssignCancelLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + performanceId, + userId + ); } } diff --git a/src/main/java/com/kri/gwcf/review/back/controller/CodeController.java b/src/main/java/com/kri/gwcf/review/back/controller/CodeController.java new file mode 100644 index 0000000..8a9ffbc --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/controller/CodeController.java @@ -0,0 +1,27 @@ +package com.kri.gwcf.review.back.controller; + +import com.kri.gwcf.review.back.dto.common.CodeDto; +import com.kri.gwcf.review.back.service.CodeService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +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.RestController; + +@RestController +@RequestMapping("/api/v1/code") +@RequiredArgsConstructor +@Tag(name = "Code", description = "코드 API") +public class CodeController { + + private final CodeService codeService; + + @Operation(summary = "코드 조회") + @GetMapping("/{codeGroup}") + public List getCodeList(@PathVariable String codeGroup) { + return codeService.findByCodeGroup(codeGroup); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java b/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java new file mode 100644 index 0000000..b645112 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java @@ -0,0 +1,95 @@ +package com.kri.gwcf.review.back.controller; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.gwcf.review.back.dto.monitoring.MonitoringGpsRequestDto; +import com.kri.gwcf.review.back.dto.performance.PerformanceMonitoringVisitDto; +import com.kri.gwcf.review.back.service.VisitService; +import com.kri.gwcf.review.back.service.common.SystemEventLogService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ContentDisposition; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +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.RequestPart; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +@RestController +@RequestMapping("/api/v1/monitoring/visit") +@RequiredArgsConstructor +@Tag(name = "Monitoring Visit", description = "모니터링 방문 API") +public class MonitoringVisitController { + + private final VisitService visitService; + private final SystemEventLogService systemEventLogService; + + @Operation(summary = "모니터링 출발 저장") + @PostMapping("/departure/{performanceId}") + public PerformanceMonitoringVisitDto saveDeparture( + @PathVariable Integer performanceId, + @RequestBody MonitoringGpsRequestDto gps, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + PerformanceMonitoringVisitDto result = visitService.saveDeparture(performanceId, gps, ctx.getUserId(), now); + systemEventLogService.writeVisitStartLog(ctx.getUserId(), now, ctx.getClientIp(), performanceId); + return result; + } + + @Operation(summary = "모니터링 도착 저장 + 증빙 사진 업로드") + @PostMapping(value = "/arrival/{performanceId}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public PerformanceMonitoringVisitDto saveArrival( + @PathVariable Integer performanceId, + @RequestPart("gps") MonitoringGpsRequestDto gps, + @RequestPart(value = "files", required = false) List files, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + PerformanceMonitoringVisitDto result = visitService.saveArrival(performanceId, gps, files, ctx.getUserId(), now); + int evidenceFileCount = files == null ? 0 : (int) files.stream() + .filter(file -> file != null && !file.isEmpty()) + .count(); + systemEventLogService.writeVisitEndLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + performanceId, + evidenceFileCount + ); + return result; + } + + @Operation(summary = "증빙 사진 조회") + @GetMapping("/evidence/{performanceId}/{userId}") + public List findEvidence( + @PathVariable Integer performanceId, + @PathVariable String userId + ) { + return visitService.findEvidence(performanceId, userId); + } + + @Operation(summary = "증빙 사진 ZIP 다운로드") + @GetMapping("/evidence/zip/{performanceId}/{userId}") + public ResponseEntity downloadEvidenceZip( + @PathVariable Integer performanceId, + @PathVariable String userId + ) { + byte[] bytes = visitService.downloadEvidenceZip(performanceId, userId); + String fileName = "evidence_" + performanceId + "_" + userId + ".zip"; + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, + ContentDisposition.attachment().filename(fileName).build().toString()) + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .body(bytes); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java new file mode 100644 index 0000000..398d49a --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java @@ -0,0 +1,124 @@ +package com.kri.gwcf.review.back.controller; + +import com.kri.common.feature.datetime.DateTimeUtil; +import com.kri.common.feature.web.RequestUserContext; +import com.kri.gwcf.review.back.dto.performance.PerformanceReviewDto; +import com.kri.gwcf.review.back.dto.systemlog.UploadContentDto; +import com.kri.gwcf.review.back.service.ReviewService; +import com.kri.gwcf.review.back.service.common.SystemEventLogService; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.core.io.Resource; +import org.springframework.http.ContentDisposition; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +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 +@RequestMapping("/api/v1/review") +@RequiredArgsConstructor +@Tag(name = "Review", description = "평가/모니터링 API") +public class ReviewController { + + private final ReviewService reviewService; + private final SystemEventLogService systemEventLogService; + + @Operation(summary = "서면평가 시작 저장") + @PostMapping("/start/{performanceId}") + public PerformanceReviewDto startWrittenReview( + @PathVariable Integer performanceId, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + PerformanceReviewDto result = reviewService.saveWrittenReviewStatus(performanceId, 1, ctx.getUserId(), now); + systemEventLogService.writeStartWrittenReviewLog(ctx.getUserId(), now, ctx.getClientIp(), performanceId); + return result; + } + + @Operation(summary = "서면평가 완료 저장") + @PostMapping("/end/{performanceId}/{userId}") + public PerformanceReviewDto endWrittenReview( + @PathVariable Integer performanceId, + @PathVariable String userId, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + PerformanceReviewDto result = reviewService.saveWrittenReviewStatus(performanceId, 10, userId, now); + systemEventLogService.writeEndWrittenReviewLog(userId, now, ctx.getClientIp(), performanceId); + return result; + } + + @Operation(summary = "평가/모니터링 파일 업로드") + @PostMapping(value = "/{performanceId}/{reviewType}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public PerformanceReviewDto uploadReviewFile( + @PathVariable Integer performanceId, + @PathVariable Integer reviewType, + @RequestParam("file") MultipartFile file, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + PerformanceReviewDto result = reviewService.uploadReviewFile(performanceId, reviewType, file, ctx.getUserId(), now); + systemEventLogService.writeUploadReviewFileLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + performanceId, + reviewType, + UploadContentDto.from(file) + ); + return result; + } + + @Operation(summary = "평가/모니터링 파일 조회") + @GetMapping("/{performanceId}/{reviewType}") + public PerformanceReviewDto getReviewFile( + @PathVariable Integer performanceId, + @PathVariable Integer reviewType, + RequestUserContext ctx + ) { + return reviewService.getReviewFile(performanceId, reviewType, ctx.getUserId()); + } + + @Operation(summary = "평가/모니터링 원본 파일 다운로드") + @GetMapping("/download/{performanceId}/{reviewType}") + public ResponseEntity downloadOriginalFile( + @PathVariable Integer performanceId, + @PathVariable Integer reviewType, + RequestUserContext ctx + ) { + return download( + reviewService.getOriginalFileResource(performanceId, reviewType, ctx.getUserId()), + reviewService.getOriginalFileName(performanceId, reviewType, ctx.getUserId()) + ); + } + + @Operation(summary = "PDF 변환 파일 조회/다운로드") + @GetMapping("/pdf/{performanceId}/{reviewType}") + public ResponseEntity downloadPdfOrOriginalFile( + @PathVariable Integer performanceId, + @PathVariable Integer reviewType, + RequestUserContext ctx + ) { + return download( + reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, ctx.getUserId()), + reviewService.getPdfOrOriginalFileName(performanceId, reviewType, ctx.getUserId()) + ); + } + + private ResponseEntity download(Resource resource, String fileName) { + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, + ContentDisposition.attachment().filename(fileName).build().toString()) + .contentType(MediaType.APPLICATION_OCTET_STREAM) + .body(resource); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/assign/AssignUserCountDto.java b/src/main/java/com/kri/gwcf/review/back/dto/assign/AssignUserCountDto.java new file mode 100644 index 0000000..bd5948b --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/assign/AssignUserCountDto.java @@ -0,0 +1,16 @@ +package com.kri.gwcf.review.back.dto.assign; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class AssignUserCountDto { + + @Schema(description = "배정 사용자 ID") + private String assignUser; + + @Schema(description = "배정 건수") + private Long assignCount; +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/assign/MonitoringAssignSaveRequestDto.java b/src/main/java/com/kri/gwcf/review/back/dto/assign/MonitoringAssignSaveRequestDto.java new file mode 100644 index 0000000..a924e8d --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/assign/MonitoringAssignSaveRequestDto.java @@ -0,0 +1,17 @@ +package com.kri.gwcf.review.back.dto.assign; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MonitoringAssignSaveRequestDto { + + @Schema(description = "공연 ID") + private Integer performanceId; + + @Schema(description = "모니터링 요원 사용자 ID 목록") + private List userIds; +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java new file mode 100644 index 0000000..561a726 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java @@ -0,0 +1,25 @@ +package com.kri.gwcf.review.back.dto.excel; + +import com.kri.common.feature.excel.ExcelColumn; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@Getter +@Setter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class WrittenUserAssignDto { + + @ExcelColumn(header = "사용자 ID", order = 0, width = 11) + @Schema(description = "사용자 ID") + private String userId; + + @ExcelColumn(header = "사업 연번", order = 1, width = 10) + @Schema(description = "사업 연번") + private String performanceId; +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyUserDto.java b/src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyUserDto.java new file mode 100644 index 0000000..73e5c4c --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/kon/PerformanceApplyUserDto.java @@ -0,0 +1,18 @@ +package com.kri.gwcf.review.back.dto.kon; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "KON 공연 신청 자") +public class PerformanceApplyUserDto { + + @Schema(description = "공연 ID") + private String performanceId; + + @Schema(description = "신청자 ID") + private String userId; + +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringApplyUserDto.java b/src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringApplyUserDto.java new file mode 100644 index 0000000..217cc16 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringApplyUserDto.java @@ -0,0 +1,21 @@ +package com.kri.gwcf.review.back.dto.monitoring; + +import com.kri.gwcf.review.back.dto.user.UserCompactDto; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@Schema(description = "모니터링 신청자") +public class MonitoringApplyUserDto { + + @Schema(description = "공연 ID") + private Integer performanceId; + + @Schema(description = "신청자 ID") + private String userId; + + @Schema(description = "서비스 DB 사용자 정보") + private UserCompactDto user; +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringGpsRequestDto.java b/src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringGpsRequestDto.java new file mode 100644 index 0000000..3a256e0 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/monitoring/MonitoringGpsRequestDto.java @@ -0,0 +1,25 @@ +package com.kri.gwcf.review.back.dto.monitoring; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.math.BigDecimal; +import java.util.Map; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Schema(description = "모니터링 GPS 정보") +public class MonitoringGpsRequestDto { + + @Schema(description = "GPS 위도") + private BigDecimal gpsLatitude; + + @Schema(description = "GPS 경도") + private BigDecimal gpsLongitude; + + @Schema(description = "GPS 신뢰 반경(m)") + private BigDecimal gpsAccuracyM; + + @Schema(description = "GPS Raw Data") + private Map gpsRaw; +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java index 28f48ac..0b1045b 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java @@ -2,6 +2,7 @@ package com.kri.gwcf.review.back.dto.performance; import com.kri.gwcf.review.back.persistence.entity.TPerformanceMonitoringVisitEntity; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.Map; import lombok.AllArgsConstructor; @@ -42,6 +43,12 @@ public class PerformanceMonitoringVisitDto { @Schema(description = "GPS Raw Data") private Map gpsRaw; + @Schema(description = "등록자") + private String regUser; + + @Schema(description = "등록일시") + private LocalDateTime regDate; + public static PerformanceMonitoringVisitDto from(TPerformanceMonitoringVisitEntity entity) { if (entity == null) { return null; @@ -56,6 +63,8 @@ public class PerformanceMonitoringVisitDto { .gpsLongitude(entity.getGpsLongitude()) .gpsAccuracyM(entity.getGpsAccuracyM()) .gpsRaw(entity.getGpsRaw()) + .regUser(entity.getRegUser()) + .regDate(entity.getRegDt()) .build(); } } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java index cd38772..5993a00 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java @@ -22,6 +22,9 @@ public class PerformanceReviewDto { @Schema(description = "평가 타입") private Integer reviewType; + @Schema(description = "등록 사용자") + private String regUser; + @Schema(description = "평가 상태") private Integer reviewStatus; @@ -42,6 +45,7 @@ public class PerformanceReviewDto { return PerformanceReviewDto.builder() .performanceId(entity.getPerformanceId()) .reviewType(entity.getReviewType()) + .regUser(entity.getRegUser()) .reviewStatus(entity.getReviewStatus()) .uploadFileName(entity.getUploadFileName()) .pdfConvert(entity.getPdfConvert()) diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java index c96675c..86180f9 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java @@ -85,6 +85,8 @@ public class TPerformanceMonitoringVisitEntity { entity.setGpsLongitude(dto.getGpsLongitude()); entity.setGpsAccuracyM(dto.getGpsAccuracyM()); entity.setGpsRaw(dto.getGpsRaw()); + entity.setRegUser(dto.getRegUser()); + entity.setRegDt(dto.getRegDate()); return entity; } diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java index 7448532..770c03e 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceReviewEntity.java @@ -30,7 +30,6 @@ public class TPerformanceReviewEntity { @Column(name = "review_status", nullable = false) private Integer reviewStatus; - @Size(max = 512) @NotNull @Column(name = "upload_file_name", nullable = false, length = 512) private String uploadFileName; @@ -39,16 +38,10 @@ public class TPerformanceReviewEntity { @Column(name = "is_pdf_convert", nullable = false) private Boolean pdfConvert; - @Size(max = 512) @NotNull @Column(name = "pdf_file_name", nullable = false, length = 512) private String pdfFileName; - @Size(max = 32) - @NotNull - @Column(name = "reg_user", nullable = false, length = 32, updatable = false) - private String regUser; - @NotNull @ColumnDefault("CURRENT_TIMESTAMP") @Column(name = "reg_dt", nullable = false, updatable = false) @@ -69,6 +62,17 @@ public class TPerformanceReviewEntity { return id.getReviewType(); } + public String getRegUser() { + return id == null ? null : id.getRegUser(); + } + + public void setRegUser(String regUser) { + if (id == null) { + id = new TPerformanceReviewEntityId(); + } + id.setRegUser(regUser); + } + public static TPerformanceReviewEntity from(PerformanceReviewDto dto) { if (dto == null) { return null; @@ -78,6 +82,7 @@ public class TPerformanceReviewEntity { entity.setId(TPerformanceReviewEntityId.builder() .performanceId(dto.getPerformanceId()) .reviewType(dto.getReviewType()) + .regUser(dto.getRegUser()) .build()); entity.setReviewStatus(dto.getReviewStatus()); entity.setUploadFileName(dto.getUploadFileName()); diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TUserDetailEntity.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TUserDetailEntity.java index c85de02..d03b117 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TUserDetailEntity.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TUserDetailEntity.java @@ -86,6 +86,8 @@ public class TUserDetailEntity { .userDetailKey(userDetailKey) .build()) .userDetailValue(userDetailValue) + .regUser(modUser) + .regDt(modDt) .modUser(modUser) .modDt(modDt) .build(); diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/id/TPerformanceReviewEntityId.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/id/TPerformanceReviewEntityId.java index 136e382..fb57acf 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/id/TPerformanceReviewEntityId.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/id/TPerformanceReviewEntityId.java @@ -3,6 +3,7 @@ package com.kri.gwcf.review.back.persistence.entity.id; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.io.Serializable; import lombok.AllArgsConstructor; import lombok.Builder; @@ -27,5 +28,8 @@ public class TPerformanceReviewEntityId implements Serializable { @Column(name = "review_type", nullable = false, updatable = false) private Integer reviewType; - + @Size(max = 32) + @NotNull + @Column(name = "reg_user", nullable = false, length = 32, updatable = false) + private String regUser; } diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java b/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java index 29f9632..bcec956 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/mapper/kon/KonMapper.java @@ -1,6 +1,7 @@ package com.kri.gwcf.review.back.persistence.mapper.kon; import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; +import com.kri.gwcf.review.back.dto.kon.PerformanceApplyUserDto; import java.util.List; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -11,4 +12,9 @@ public interface KonMapper { List findPerformanceApplyCount( @Param("surveyType") String surveyType ); + + List findPerformanceApplyUser( + @Param("surveyType") String surveyType, + @Param("performanceId") String performanceId + ); } diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceAssignRepository.java b/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceAssignRepository.java index 81bba88..a7b0708 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceAssignRepository.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceAssignRepository.java @@ -1,8 +1,10 @@ package com.kri.gwcf.review.back.persistence.repository; import com.kri.gwcf.review.back.persistence.entity.TPerformanceAssignEntity; +import com.kri.gwcf.review.back.dto.assign.AssignUserCountDto; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; public interface PerformanceAssignRepository extends JpaRepository { @@ -11,4 +13,42 @@ public interface PerformanceAssignRepository extends JpaRepository findByPerformanceId(Integer performanceId); + + boolean existsByPerformanceIdAndAssignUser(Integer performanceId, String assignUser); + + boolean existsByAssignUserAndPerformanceIdNot(String assignUser, Integer performanceId); + + long countByPerformanceIdAndAssignType(Integer performanceId, Integer assignType); + + long countByPerformanceIdAndAssignTypeAndAssignConfirm( + Integer performanceId, + Integer assignType, + Boolean assignConfirm + ); + + List findByPerformanceIdAndAssignUser( + Integer performanceId, + String assignUser + ); + + List findByPerformanceIdAndAssignUserAndAssignType( + Integer performanceId, + String assignUser, + Integer assignType + ); + + List findByPerformanceIdAndAssignType( + Integer performanceId, + Integer assignType + ); + + @Query(""" + select new com.kri.gwcf.review.back.dto.assign.AssignUserCountDto( + assign.assignUser, + count(assign) + ) + from TPerformanceAssignEntity assign + group by assign.assignUser + """) + List countGroupByAssignUser(); } diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceMonitoringVisitRepository.java b/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceMonitoringVisitRepository.java index 6c3a1af..67e6128 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceMonitoringVisitRepository.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceMonitoringVisitRepository.java @@ -11,4 +11,9 @@ public interface PerformanceMonitoringVisitRepository extends JpaRepository findByPerformanceId(Integer performanceId); + + List findByPerformanceIdAndRegUser( + Integer performanceId, + String regUser + ); } diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceReviewRepository.java b/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceReviewRepository.java index dfed068..d5fd3e8 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceReviewRepository.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/repository/PerformanceReviewRepository.java @@ -3,13 +3,26 @@ package com.kri.gwcf.review.back.persistence.repository; import com.kri.gwcf.review.back.persistence.entity.TPerformanceReviewEntity; import com.kri.gwcf.review.back.persistence.entity.id.TPerformanceReviewEntityId; import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface PerformanceReviewRepository extends JpaRepository { - boolean existsByRegUserOrModUser(String regUser, String modUser); + boolean existsByIdRegUserOrModUser(String regUser, String modUser); boolean existsByIdPerformanceId(Integer performanceId); List findByIdPerformanceId(Integer performanceId); + + Optional findByIdPerformanceIdAndIdReviewTypeAndIdRegUser( + Integer performanceId, + Integer reviewType, + String regUser + ); + + boolean existsByIdPerformanceIdAndIdReviewTypeAndIdRegUser( + Integer performanceId, + Integer reviewType, + String regUser + ); } diff --git a/src/main/java/com/kri/gwcf/review/back/service/AssignService.java b/src/main/java/com/kri/gwcf/review/back/service/AssignService.java index fcdb8f7..1667f18 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/AssignService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/AssignService.java @@ -1,16 +1,62 @@ package com.kri.gwcf.review.back.service; +import static com.kri.gwcf.review.back.common.consts.GwcfConstant.MONITORING_USER_ROLE; +import static com.kri.gwcf.review.back.common.util.AppendCodeSheet.appendCodeSheet; + +import com.kri.common.feature.excel.ExcelMapper; +import com.kri.common.feature.util.NumericUtil; +import com.kri.common.feature.util.StringUtil; +import com.kri.gwcf.review.back.common.util.ExcelUploadResultUtil; +import com.kri.gwcf.review.back.dto.assign.AssignUserCountDto; +import com.kri.gwcf.review.back.dto.excel.ExcelErrorDto; +import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto; +import com.kri.gwcf.review.back.dto.excel.WrittenUserAssignDto; +import com.kri.common.feature.web.BusinessException; +import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; +import com.kri.gwcf.review.back.dto.kon.PerformanceApplyUserDto; +import com.kri.gwcf.review.back.dto.monitoring.MonitoringApplyUserDto; import com.kri.gwcf.review.back.dto.performance.PerformanceAssignDto; +import com.kri.gwcf.review.back.dto.user.UserCompactDto; +import com.kri.gwcf.review.back.persistence.entity.TPerformanceAssignEntity; +import com.kri.gwcf.review.back.persistence.entity.TUserDetailEntity; +import com.kri.gwcf.review.back.persistence.entity.TUserEntity; +import com.kri.gwcf.review.back.persistence.mapper.kon.KonMapper; import com.kri.gwcf.review.back.persistence.repository.PerformanceAssignRepository; +import com.kri.gwcf.review.back.persistence.repository.PerformanceRepository; +import com.kri.gwcf.review.back.persistence.repository.PerformanceReviewRepository; +import com.kri.gwcf.review.back.persistence.repository.UserDetailRepository; +import com.kri.gwcf.review.back.persistence.repository.UserRepository; +import java.io.ByteArrayOutputStream; +import java.util.ArrayList; +import java.time.LocalDateTime; +import java.util.Collections; import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.ss.usermodel.WorkbookFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; @Service @RequiredArgsConstructor public class AssignService { private final PerformanceAssignRepository performanceAssignRepository; + private final PerformanceReviewRepository performanceReviewRepository; + private final KonMapper konMapper; + private final PerformanceRepository performanceRepository; + private final UserRepository userRepository; + private final UserDetailRepository userDetailRepository; + + @Value("${kon.survey-type:LIST}") + private String surveyType; public boolean hasAssignWithUser(String userId) { return performanceAssignRepository.existsByAssignUser(userId); @@ -25,4 +71,386 @@ public class AssignService { .map(PerformanceAssignDto::from) .toList(); } + + public List findAssignUserCounts() { + return performanceAssignRepository.countGroupByAssignUser(); + } + + @Transactional(readOnly = true, transactionManager = "konTransactionManager") + public List findKonPerformanceApplyUser(Integer performanceId) { + return konMapper.findPerformanceApplyUser(surveyType, String.valueOf(performanceId)); + } + + public List findMonitoringApplyUsersCount() { + return konMapper.findPerformanceApplyCount(surveyType); + } + + public List findMonitoringApplyUsers(Integer performanceId) { + List applyUsers = findKonPerformanceApplyUser(performanceId); + List userIds = applyUsers.stream() + .map(PerformanceApplyUserDto::getUserId) + .distinct() + .toList(); + + Map userMap = userRepository.findAllById(userIds).stream() + .collect(Collectors.toMap(TUserEntity::getUserId, Function.identity())); + + Map> userDetailMap = userIds.stream() + .collect(Collectors.toMap( + Function.identity(), + userId -> userDetailRepository.findByIdUserId(userId).stream() + .collect(Collectors.toMap( + TUserDetailEntity::getUserDetailKey, + TUserDetailEntity::getUserDetailValue + )) + )); + + return applyUsers.stream() + .map(applyUser -> { + TUserEntity user = userMap.get(applyUser.getUserId()); + return MonitoringApplyUserDto.builder() + .performanceId(performanceId) + .userId(applyUser.getUserId()) + .user(user == null + ? null + : UserCompactDto.from( + user, + userDetailMap.getOrDefault(applyUser.getUserId(), Collections.emptyMap()) + )) + .build(); + }) + .toList(); + } + + @Transactional + public PerformanceAssignDto saveMonitoringAssign( + Integer performanceId, + String assignUser, + String regUser, + LocalDateTime regDt + ) { + if (performanceAssignRepository.existsByAssignUser(assignUser)) { + throw BusinessException.conflict("ASSIGN_ALREADY_EXISTS", "이미 배정된 사용자입니다.") + .with("performanceId", performanceId) + .with("assignUser", assignUser); + } + + long currentCount = performanceAssignRepository.countByPerformanceIdAndAssignType(performanceId, 1); + TPerformanceAssignEntity entity = new TPerformanceAssignEntity(); + entity.setPerformanceId(performanceId); + entity.setAssignType(1); + entity.setAssignOrder((short) (currentCount + 1)); + entity.setAssignUser(assignUser); + entity.setAssignConfirm(false); + entity.setRegUser(regUser); + entity.setRegDt(regDt); + + return PerformanceAssignDto.from(performanceAssignRepository.save(entity)); + } + + @Transactional + public List saveMonitoringAssign( + Integer performanceId, + List assignUsers, + String regUser, + LocalDateTime regDt + ) { + if (performanceId == null) { + throw BusinessException.badRequest("EMPTY_PERFORMANCE_ID", "공연 ID가 없습니다."); + } + if (!performanceRepository.existsById(performanceId)) { + throw BusinessException.notFound("PERFORMANCE_NOT_FOUND", "존재하지 않는 공연입니다.") + .with("performanceId", performanceId); + } + + List normalizedAssignUsers = normalizeUserIds(assignUsers); + if (normalizedAssignUsers.size() > 2) { + throw BusinessException.badRequest("MONITORING_ASSIGN_LIMIT", "모니터링 요원은 최대 2명까지 배정할 수 있습니다.") + .with("performanceId", performanceId) + .with("assignUsers", normalizedAssignUsers); + } + + for (String assignUser : normalizedAssignUsers) { + validateAssignableUser(performanceId, assignUser); + } + + List currentAssigns = + performanceAssignRepository.findByPerformanceIdAndAssignType(performanceId, 1); + Set requestedUserSet = Set.copyOf(normalizedAssignUsers); + List deleteTargets = currentAssigns.stream() + .filter(assign -> !requestedUserSet.contains(assign.getAssignUser())) + .toList(); + + for (TPerformanceAssignEntity deleteTarget : deleteTargets) { + validateNoReviewBeforeAssignRemove(deleteTarget); + } + performanceAssignRepository.deleteAll(deleteTargets); + + Set currentUserSet = currentAssigns.stream() + .filter(assign -> requestedUserSet.contains(assign.getAssignUser())) + .map(TPerformanceAssignEntity::getAssignUser) + .collect(Collectors.toSet()); + Map currentAssignMap = currentAssigns.stream() + .filter(assign -> requestedUserSet.contains(assign.getAssignUser())) + .collect(Collectors.toMap( + TPerformanceAssignEntity::getAssignUser, + Function.identity(), + (first, second) -> first + )); + + short assignOrder = 1; + for (String assignUser : normalizedAssignUsers) { + if (!currentUserSet.contains(assignUser)) { + TPerformanceAssignEntity entity = new TPerformanceAssignEntity(); + entity.setPerformanceId(performanceId); + entity.setAssignType(1); + entity.setAssignOrder(assignOrder); + entity.setAssignUser(assignUser); + entity.setAssignConfirm(false); + entity.setRegUser(regUser); + entity.setRegDt(regDt); + performanceAssignRepository.save(entity); + } else { + currentAssignMap.get(assignUser).setAssignOrder(assignOrder); + } + assignOrder++; + } + + return performanceAssignRepository.findByPerformanceIdAndAssignType(performanceId, 1).stream() + .map(PerformanceAssignDto::from) + .toList(); + } + + public byte[] exportAssignTemplate() { + try (Workbook workbook = + ExcelMapper.writeToWorkbook(Collections.emptyList(), WrittenUserAssignDto.class); + ByteArrayOutputStream out = new ByteArrayOutputStream()) { + workbook.write(out); + return out.toByteArray(); + } catch (Exception e) { + throw BusinessException.internalError("사용자 배정 템플릿 엑셀 생성 중 오류"); + } + } + + @Transactional + public ExcelUploadResultDto createWrittenAssignsFromExcel( + MultipartFile file, + String regUser, + LocalDateTime regDt + ) { + if (file == null || file.isEmpty()) { + throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다."); + } + + String fileName = file.getOriginalFilename(); + String errorFileName = fileName != null && fileName.endsWith(".xlsx") + ? fileName.substring(0, fileName.length() - 5) + "_error.xlsx" + : fileName + "_error.xlsx"; + + List rows; + try (Workbook workbook = WorkbookFactory.create(file.getInputStream())) { + rows = ExcelMapper.readFromWorkbook(workbook, WrittenUserAssignDto.class); + } catch (Exception e) { + throw BusinessException.badRequest("INVALID_EXCEL", "엑셀 파일을 읽는 중 오류가 발생했습니다.") + .with("fileName", fileName); + } + + int totalCount = rows.size(); + int successCount = 0; + List errorList = new ArrayList<>(); + Set uploadedPerformanceIds = new java.util.HashSet<>(); + + for (int i = 0; i < rows.size(); i++) { + WrittenUserAssignDto row = rows.get(i); + int rowNumber = i + 2; + + List rowErrors = validateWrittenAssignRow(row, rowNumber); + if (!rowErrors.isEmpty()) { + errorList.addAll(rowErrors); + continue; + } + + Integer performanceId = NumericUtil.parseOnlyInteger(row.getPerformanceId()); + if (!uploadedPerformanceIds.add(performanceId)) { + errorList.add(ExcelErrorDto.of(rowNumber, "사업 연번", "하나의 사업에는 서면평가위원을 1명만 배정할 수 있습니다.")); + continue; + } + + List currentAssigns = + performanceAssignRepository.findByPerformanceIdAndAssignType(performanceId, 2); + boolean sameAssignExists = currentAssigns.size() == 1 + && Objects.equals(currentAssigns.get(0).getAssignUser(), row.getUserId()); + if (!sameAssignExists && currentAssigns.stream().anyMatch(this::hasReview)) { + errorList.add(ExcelErrorDto.of(rowNumber, "사업 연번", "리뷰가 있는 배정은 변경할 수 없습니다.")); + continue; + } + + if (sameAssignExists) { + successCount++; + continue; + } + + performanceAssignRepository.deleteAll(currentAssigns); + + TPerformanceAssignEntity entity = new TPerformanceAssignEntity(); + entity.setPerformanceId(performanceId); + entity.setAssignType(2); + entity.setAssignOrder((short) 1); + entity.setAssignUser(row.getUserId()); + entity.setAssignConfirm(true); + entity.setRegUser(regUser); + entity.setRegDt(regDt); + performanceAssignRepository.save(entity); + successCount++; + } + + int failCount = errorList.stream() + .map(ExcelErrorDto::getRowNumber) + .distinct() + .toList() + .size(); + + return ExcelUploadResultUtil.buildUploadResult( + totalCount, + successCount, + failCount, + errorList, + ExcelErrorDto.class, + errorFileName + ); + } + + private List validateWrittenAssignRow( + WrittenUserAssignDto row, + int rowNumber + ) { + List errors = new ArrayList<>(); + Integer performanceId = NumericUtil.parseOnlyInteger(row.getPerformanceId()); + String userId = row.getUserId(); + + if (performanceId == null) { + errors.add(ExcelErrorDto.of(rowNumber, "사업 연번", "사업 연번은 숫자여야 합니다.")); + } else if (!performanceRepository.existsById(performanceId)) { + errors.add(ExcelErrorDto.of(rowNumber, "사업 연번", "존재하지 않는 사업 연번입니다.")); + } + + if (StringUtil.isNullOrBlank(userId)) { + errors.add(ExcelErrorDto.of(rowNumber, "사용자 ID", "사용자 ID가 비어 있습니다.")); + } else if (!userRepository.existsByUserId(userId)) { + errors.add(ExcelErrorDto.of(rowNumber, "사용자 ID", "존재하지 않는 사용자 ID입니다.")); + } + + if (StringUtil.hasText(userId) + && performanceId != null + && performanceAssignRepository.existsByAssignUserAndPerformanceIdNot(userId, performanceId)) { + errors.add(ExcelErrorDto.of(rowNumber, "사용자 ID", "이미 다른 사업에 배정된 사용자입니다.")); + } + + return errors; + } + + private List normalizeUserIds(List userIds) { + if (userIds == null) { + return List.of(); + } + + return userIds.stream() + .filter(StringUtil::hasText) + .map(String::trim) + .distinct() + .toList(); + } + + private void validateAssignableUser(Integer performanceId, String userId) { + if (StringUtil.isNullOrBlank(userId)) { + throw BusinessException.badRequest("EMPTY_USER_ID", "사용자 ID가 없습니다."); + } + if (!userRepository.existsByUserId(userId)) { + throw BusinessException.notFound("USER_NOT_FOUND", "존재하지 않는 사용자 ID입니다.") + .with("userId", userId); + } + if (performanceAssignRepository.existsByAssignUserAndPerformanceIdNot(userId, performanceId)) { + throw BusinessException.conflict("ASSIGN_ALREADY_EXISTS", "이미 다른 공연에 배정된 사용자입니다.") + .with("performanceId", performanceId) + .with("assignUser", userId); + } + } + + private boolean hasReview(TPerformanceAssignEntity assign) { + return performanceReviewRepository.existsByIdPerformanceIdAndIdReviewTypeAndIdRegUser( + assign.getPerformanceId(), + assign.getAssignType(), + assign.getAssignUser() + ); + } + + private void validateNoReviewBeforeAssignRemove(TPerformanceAssignEntity assign) { + if (hasReview(assign)) { + throw BusinessException.conflict("ASSIGN_HAS_REVIEW", "리뷰가 있는 배정은 해제하거나 삭제할 수 없습니다.") + .with("performanceId", assign.getPerformanceId()) + .with("assignType", assign.getAssignType()) + .with("assignUser", assign.getAssignUser()); + } + } + + @Transactional + public String confirmMonitoringAssignByUser(Integer performanceId, String assignUser) { + List assigns = + performanceAssignRepository.findByPerformanceIdAndAssignUserAndAssignType( + performanceId, + assignUser, + 1 + ); + + if (assigns.isEmpty()) { + return "승인 가능한 내용이 없습니다."; + } + + boolean alreadyConfirmed = assigns.stream() + .anyMatch(assign -> Boolean.TRUE.equals(assign.getAssignConfirm())); + if (alreadyConfirmed) { + return "이미 승인된 내용입니다."; + } + + long confirmedCount = performanceAssignRepository + .countByPerformanceIdAndAssignTypeAndAssignConfirm(performanceId, 1, true); + if (confirmedCount >= 2) { + return "이미 배정이 종료된 공연입니다."; + } + + assigns.stream() + .filter(assign -> Boolean.FALSE.equals(assign.getAssignConfirm())) + .forEach(assign -> assign.setAssignConfirm(true)); + + return "승인 처리 됐습니다."; + } + + @Transactional + public void confirmAssign(Integer performanceId, String assignUser, boolean confirm) { + List assigns = + performanceAssignRepository.findByPerformanceIdAndAssignUser(performanceId, assignUser); + if (assigns.isEmpty()) { + throw BusinessException.notFound("ASSIGN_NOT_FOUND", "배정 정보를 찾을 수 없습니다.") + .with("performanceId", performanceId) + .with("assignUser", assignUser); + } + + for (TPerformanceAssignEntity assign : assigns) { + if (!confirm && hasReview(assign)) { + throw BusinessException.conflict("ASSIGN_HAS_REVIEW", "리뷰가 있는 배정은 해제하거나 삭제할 수 없습니다.") + .with("performanceId", performanceId) + .with("assignType", assign.getAssignType()) + .with("assignUser", assignUser); + } + if (confirm && Boolean.FALSE.equals(assign.getAssignConfirm())) { + long confirmedCount = performanceAssignRepository + .countByPerformanceIdAndAssignTypeAndAssignConfirm(performanceId, assign.getAssignType(), true); + if (assign.getAssignType() == 1 && confirmedCount >= 2) { + throw BusinessException.conflict("MONITORING_ASSIGN_CONFIRM_LIMIT", "확정된 모니터링 요원은 최대 2명입니다.") + .with("performanceId", performanceId); + } + } + assign.setAssignConfirm(confirm); + } + } } diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java index 0b94d46..7e3e629 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java @@ -1,22 +1,49 @@ package com.kri.gwcf.review.back.service; +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.gwcf.review.back.config.FileStorageProperties; import com.kri.gwcf.review.back.dto.performance.PerformanceReviewDto; import com.kri.gwcf.review.back.persistence.entity.TPerformanceReviewEntity; +import com.kri.gwcf.review.back.persistence.entity.id.TPerformanceReviewEntityId; import com.kri.gwcf.review.back.persistence.repository.PerformanceReviewRepository; +import com.kri.gwcf.review.back.service.file.AbstractFileService; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.io.PathResource; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; @Service @RequiredArgsConstructor -public class ReviewService { +public class ReviewService extends AbstractFileService { private final PerformanceReviewRepository performanceReviewRepository; + private final FileStorageProperties fileStorageProperties; + + @Value("${kri.file.pdf-converter-command:soffice}") + private String pdfConverterCommand; + + @Override + protected Path getBaseDir() { + return Path.of(fileStorageProperties.getReviewBaseDir()) + .toAbsolutePath() + .normalize(); + } public boolean hasReviewWithUser(String userId) { - return performanceReviewRepository.existsByRegUserOrModUser(userId, userId); + return performanceReviewRepository.existsByIdRegUserOrModUser(userId, userId); } public boolean hasReviewWithPerformance(Integer performanceId) { @@ -30,4 +57,207 @@ public class ReviewService { Collectors.mapping(PerformanceReviewDto::from, Collectors.toList()) )); } + + @Transactional + public PerformanceReviewDto saveWrittenReviewStatus( + Integer performanceId, + Integer reviewStatus, + String userId, + LocalDateTime now + ) { + TPerformanceReviewEntity entity = performanceReviewRepository + .findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, 2, userId) + .orElseGet(() -> TPerformanceReviewEntity.builder() + .id(TPerformanceReviewEntityId.builder() + .performanceId(performanceId) + .reviewType(2) + .regUser(userId) + .build()) + .uploadFileName("") + .pdfConvert(false) + .pdfFileName("") + .regDt(now) + .build()); + + entity.setReviewStatus(reviewStatus); + if (entity.getRegUser() == null) { + entity.setRegUser(userId); + entity.setRegDt(now); + } else { + entity.setModUser(userId); + entity.setModDt(now); + } + + return PerformanceReviewDto.from(performanceReviewRepository.save(entity)); + } + + @Transactional + public PerformanceReviewDto saveMonitoringReviewStatus( + Integer performanceId, + Integer reviewStatus, + String userId, + LocalDateTime now + ) { + TPerformanceReviewEntity entity = performanceReviewRepository + .findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, 1, userId) + .orElseGet(() -> TPerformanceReviewEntity.builder() + .id(TPerformanceReviewEntityId.builder() + .performanceId(performanceId) + .reviewType(1) + .regUser(userId) + .build()) + .uploadFileName("") + .pdfConvert(false) + .pdfFileName("") + .regDt(now) + .build()); + + entity.setReviewStatus(reviewStatus); + entity.setModUser(userId); + entity.setModDt(now); + + return PerformanceReviewDto.from(performanceReviewRepository.save(entity)); + } + + @Transactional + public PerformanceReviewDto uploadReviewFile( + Integer performanceId, + Integer reviewType, + MultipartFile file, + String userId, + LocalDateTime now + ) { + if (file == null || file.isEmpty()) { + throw BusinessException.badRequest("EMPTY_FILE", "업로드할 파일이 없습니다."); + } + + try { + Path dir = reviewDir(performanceId, reviewType); + String uploadFileName = saveFile(dir, file); + Path uploadPath = dir.resolve(uploadFileName).normalize(); + + String pdfFileName = convertToPdfIfPossible(uploadPath, dir); + boolean pdfConvert = StringUtil.hasText(pdfFileName); + + TPerformanceReviewEntity entity = performanceReviewRepository + .findByIdPerformanceIdAndIdReviewTypeAndIdRegUser(performanceId, reviewType, userId) + .orElseGet(() -> TPerformanceReviewEntity.builder() + .id(TPerformanceReviewEntityId.builder() + .performanceId(performanceId) + .reviewType(reviewType) + .regUser(userId) + .build()) + .regDt(now) + .build()); + + entity.setReviewStatus(10); + entity.setUploadFileName(uploadFileName); + entity.setPdfConvert(pdfConvert); + entity.setPdfFileName(pdfFileName); + if (entity.getRegUser() == null) { + entity.setRegUser(userId); + entity.setRegDt(now); + } else { + entity.setModUser(userId); + entity.setModDt(now); + } + + return PerformanceReviewDto.from(performanceReviewRepository.save(entity)); + } catch (IOException e) { + throw BusinessException.internalError("REVIEW_FILE_SAVE_FAILED", "평가/모니터링 파일 저장 중 오류가 발생했습니다."); + } + } + + public PerformanceReviewDto getReviewFile(Integer performanceId, Integer reviewType, String userId) { + return PerformanceReviewDto.from(getReviewEntity(performanceId, reviewType, userId)); + } + + public PathResource getOriginalFileResource(Integer performanceId, Integer reviewType, String userId) { + TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId); + return toResource(reviewDir(performanceId, reviewType).resolve(entity.getUploadFileName())); + } + + public String getOriginalFileName(Integer performanceId, Integer reviewType, String userId) { + return getReviewEntity(performanceId, reviewType, userId).getUploadFileName(); + } + + public PathResource getPdfOrOriginalFileResource(Integer performanceId, Integer reviewType, String userId) { + TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId); + String fileName = StringUtil.isNullOrBlank(entity.getPdfFileName()) + ? entity.getUploadFileName() + : entity.getPdfFileName(); + return toResource(reviewDir(performanceId, reviewType).resolve(fileName)); + } + + public String getPdfOrOriginalFileName(Integer performanceId, Integer reviewType, String userId) { + TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId); + return StringUtil.isNullOrBlank(entity.getPdfFileName()) + ? entity.getUploadFileName() + : entity.getPdfFileName(); + } + + private TPerformanceReviewEntity getReviewEntity(Integer performanceId, Integer reviewType, String userId) { + return performanceReviewRepository.findByIdPerformanceIdAndIdReviewTypeAndIdRegUser( + performanceId, + reviewType, + userId + ) + .orElseThrow(() -> BusinessException.notFound("REVIEW_FILE_NOT_FOUND", "평가/모니터링 파일이 없습니다.") + .with("performanceId", performanceId) + .with("reviewType", reviewType) + .with("userId", userId)); + } + + private PathResource toResource(Path path) { + Path normalized = path.toAbsolutePath().normalize(); + if (!Files.exists(normalized)) { + throw BusinessException.notFound("FILE_NOT_FOUND", "파일이 없습니다."); + } + return new PathResource(normalized); + } + + private Path reviewDir(Integer performanceId, Integer reviewType) { + return getBaseDir() + .resolve(String.valueOf(performanceId)) + .resolve(String.valueOf(reviewType)) + .toAbsolutePath() + .normalize(); + } + + private String convertToPdfIfPossible(Path source, Path dir) { + String extension = extractExtension(source.getFileName().toString()).toLowerCase(); + Set targets = new HashSet<>(Set.of(".docx", ".hwpx", ".pptx", ".xlsx")); + if (!targets.contains(extension)) { + return ""; + } + + try { + Process process = new ProcessBuilder( + pdfConverterCommand, + "--headless", + "--convert-to", + "pdf", + "--outdir", + dir.toString(), + source.toString() + ).redirectErrorStream(true).start(); + + boolean finished = process.waitFor(60, TimeUnit.SECONDS); + if (!finished || process.exitValue() != 0) { + process.destroyForcibly(); + return ""; + } + + String baseName = stripExtension(source.getFileName().toString()); + Path pdf = dir.resolve(baseName + ".pdf").normalize(); + return Files.exists(pdf) ? pdf.getFileName().toString() : ""; + } catch (Exception e) { + return ""; + } + } + + private String stripExtension(String fileName) { + int dot = fileName.lastIndexOf('.'); + return dot > 0 ? fileName.substring(0, dot) : fileName; + } } diff --git a/src/main/java/com/kri/gwcf/review/back/service/VisitService.java b/src/main/java/com/kri/gwcf/review/back/service/VisitService.java index 6719fb9..c0ae38a 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/VisitService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/VisitService.java @@ -1,19 +1,43 @@ package com.kri.gwcf.review.back.service; +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.gwcf.review.back.config.FileStorageProperties; +import com.kri.gwcf.review.back.dto.monitoring.MonitoringGpsRequestDto; import com.kri.gwcf.review.back.dto.performance.PerformanceMonitoringVisitDto; import com.kri.gwcf.review.back.persistence.entity.TPerformanceMonitoringVisitEntity; import com.kri.gwcf.review.back.persistence.repository.PerformanceMonitoringVisitRepository; +import com.kri.gwcf.review.back.service.file.AbstractFileService; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import java.util.zip.ZipEntry; +import java.util.zip.ZipOutputStream; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; @Service @RequiredArgsConstructor -public class VisitService { +public class VisitService extends AbstractFileService { private final PerformanceMonitoringVisitRepository performanceMonitoringVisitRepository; + private final FileStorageProperties fileStorageProperties; + private final ReviewService reviewService; + + @Override + protected Path getBaseDir() { + return Path.of(fileStorageProperties.getVisitBaseDir()) + .toAbsolutePath() + .normalize(); + } public boolean hasVisitWithUser(String userId) { return performanceMonitoringVisitRepository.existsByRegUser(userId); @@ -30,4 +54,151 @@ public class VisitService { Collectors.mapping(PerformanceMonitoringVisitDto::from, Collectors.toList()) )); } + + @Transactional + public PerformanceMonitoringVisitDto saveDeparture( + Integer performanceId, + MonitoringGpsRequestDto gps, + String regUser, + LocalDateTime regDt + ) { + validateGps(gps); + TPerformanceMonitoringVisitEntity entity = saveVisit( + performanceId, + 2, + "", + gps, + regUser, + regDt + ); + reviewService.saveMonitoringReviewStatus(performanceId, 2, regUser, regDt); + return PerformanceMonitoringVisitDto.from(entity); + } + + @Transactional + public PerformanceMonitoringVisitDto saveArrival( + Integer performanceId, + MonitoringGpsRequestDto gps, + List files, + String regUser, + LocalDateTime regDt + ) { + validateGps(gps); + String evidenceImg = String.join("|", saveEvidenceFiles(performanceId, regUser, files)); + + TPerformanceMonitoringVisitEntity entity = saveVisit( + performanceId, + 3, + evidenceImg, + gps, + regUser, + regDt + ); + reviewService.saveMonitoringReviewStatus(performanceId, 3, regUser, regDt); + return PerformanceMonitoringVisitDto.from(entity); + } + + public List findEvidence(Integer performanceId, String userId) { + return performanceMonitoringVisitRepository.findByPerformanceIdAndRegUser(performanceId, userId) + .stream() + .map(PerformanceMonitoringVisitDto::from) + .toList(); + } + + public byte[] downloadEvidenceZip(Integer performanceId, String userId) { + List fileNames = performanceMonitoringVisitRepository + .findByPerformanceIdAndRegUser(performanceId, userId) + .stream() + .flatMap(visit -> List.of(visit.getEvidenceImg().split("\\|")).stream()) + .filter(StringUtil::hasText) + .toList(); + + try ( + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ZipOutputStream zip = new ZipOutputStream(out) + ) { + Path dir = evidenceDir(performanceId, userId); + for (String fileName : fileNames) { + Path file = dir.resolve(fileName).normalize(); + if (!file.startsWith(dir) || !Files.exists(file)) { + continue; + } + zip.putNextEntry(new ZipEntry(fileName)); + Files.copy(file, zip); + zip.closeEntry(); + } + zip.finish(); + return out.toByteArray(); + } catch (IOException e) { + throw BusinessException.internalError("EVIDENCE_ZIP_FAILED", "증빙 사진 ZIP 생성 중 오류가 발생했습니다."); + } + } + + private TPerformanceMonitoringVisitEntity saveVisit( + Integer performanceId, + Integer status, + String evidenceImg, + MonitoringGpsRequestDto gps, + String regUser, + LocalDateTime regDt + ) { + TPerformanceMonitoringVisitEntity entity = TPerformanceMonitoringVisitEntity.builder() + .performanceId(performanceId) + .monitoringVisitStatus(status) + .evidenceImg(evidenceImg) + .gpsLatitude(gps.getGpsLatitude()) + .gpsLongitude(gps.getGpsLongitude()) + .gpsAccuracyM(gps.getGpsAccuracyM()) + .gpsRaw(gps.getGpsRaw()) + .regUser(regUser) + .regDt(regDt) + .build(); + + return performanceMonitoringVisitRepository.save(entity); + } + + private List saveEvidenceFiles( + Integer performanceId, + String userId, + List files + ) { + if (files == null || files.isEmpty()) { + return List.of(); + } + + try { + Path dir = evidenceDir(performanceId, userId); + List fileNames = new ArrayList<>(); + for (MultipartFile file : files) { + if (file == null || file.isEmpty()) { + continue; + } + String fileName = saveFile(dir, file); + fileNames.add(fileName); + } + return fileNames; + } catch (IOException e) { + throw BusinessException.internalError("EVIDENCE_SAVE_FAILED", "증빙 사진 저장 중 오류가 발생했습니다."); + } + } + + private Path evidenceDir(Integer performanceId, String userId) { + return getBaseDir() + .resolve(String.valueOf(performanceId)) + .resolve(userId) + .toAbsolutePath() + .normalize(); + } + + private void validateGps(MonitoringGpsRequestDto gps) { + // GPS 필수 정책을 해제해야 하면 아래 if 블록만 주석 처리. + if (gps == null + || gps.getGpsLatitude() == null + || gps.getGpsLongitude() == null + || gps.getGpsAccuracyM() == null + || gps.getGpsRaw() == null + || gps.getGpsRaw().isEmpty()) { + throw BusinessException.badRequest("EMPTY_GPS_INFO", "GPS 정보가 없습니다."); + } + } } diff --git a/src/main/java/com/kri/gwcf/review/back/service/common/SystemEventLogService.java b/src/main/java/com/kri/gwcf/review/back/service/common/SystemEventLogService.java index 4b65a14..0e4107f 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/common/SystemEventLogService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/common/SystemEventLogService.java @@ -9,6 +9,7 @@ import com.kri.gwcf.review.back.dto.user.UserFullDto; import com.kri.gwcf.review.back.persistence.entity.TSysEventLogEntity; import com.kri.gwcf.review.back.persistence.repository.SysEventLogRepository; import java.time.LocalDateTime; +import java.util.List; import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -118,15 +119,183 @@ public class SystemEventLogService { ); } - public void writeAssignConfirmLog(String userId, LocalDateTime regDt, String clientIp) { + public void writeAssignConfirmLog(String userId, LocalDateTime regDt, String clientIp, String performanceId) { writeSystemLog( SystemEventType.ASSIGN_PERFORMANCE_CONFIRM, "Assign Confirm", userId, regDt, clientIp, - "userId", - userId + "performanceId", + performanceId + ); + } + + public void writeVisitStartLog(String regId, LocalDateTime regDt, String clientIp, Integer performanceId) { + writeSystemLog( + SystemEventType.VISIT_START, + "Visit Start", + regId, + regDt, + clientIp, + "performanceId", + performanceId + ); + } + + public void writeVisitEndLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId, + Integer evidenceFileCount + ) { + saveLog( + SystemEventType.VISIT_END, + "Visit End", + regId, + regDt, + clientIp, + Map.of( + "performanceId", performanceId, + "evidenceFileCount", evidenceFileCount + ) + ); + } + + public void writeStartWrittenReviewLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId + ) { + writeSystemLog( + SystemEventType.START_WRITTEN_REVIEW, + "Start Written Review", + regId, + regDt, + clientIp, + "performanceId", + performanceId + ); + } + + public void writeEndWrittenReviewLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId + ) { + writeSystemLog( + SystemEventType.END_WRITTEN_REVIEW, + "End Written Review", + regId, + regDt, + clientIp, + "performanceId", + performanceId + ); + } + + public void writeUploadReviewFileLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId, + Integer reviewType, + UploadContentDto content + ) { + SystemEventType eventType = Integer.valueOf(1).equals(reviewType) + ? SystemEventType.UPLOAD_MONITORING_REVIEW + : SystemEventType.UPLOAD_LOCAL_GOV_REVIEW; + + saveLog( + eventType, + "Upload Review File", + regId, + regDt, + clientIp, + Map.of( + "performanceId", performanceId, + "reviewType", reviewType, + "file", content + ) + ); + } + + public void writeAssignPerformanceRequestLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId, + List assignUsers + ) { + saveLog( + SystemEventType.ASSIGN_PERFORMANCE_REQUEST, + "Assign Performance Request", + regId, + regDt, + clientIp, + Map.of( + "performanceId", performanceId, + "assignUsers", assignUsers + ) + ); + } + + public void writeAssignConfirmByAdminLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId, + String assignUser + ) { + saveLog( + SystemEventType.ASSIGN_PERFORMANCE_CONFIRM, + "Assign Confirm", + regId, + regDt, + clientIp, + Map.of( + "performanceId", performanceId, + "assignUser", assignUser + ) + ); + } + + public void writeUploadWrittenAssignLog( + String regId, + LocalDateTime regDt, + String clientIp, + UploadContentDto content + ) { + writeSystemLog( + SystemEventType.UPLOAD_WRITTEN_ASSIGN, + "Upload Written Assign", + regId, + regDt, + clientIp, + content + ); + } + + public void writeAssignCancelLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId, + String assignUser + ) { + saveLog( + SystemEventType.ASSIGN_PERFORMANCE_REJECT, + "Assign Cancel", + regId, + regDt, + clientIp, + Map.of( + "performanceId", performanceId, + "assignUser", assignUser + ) ); } /* diff --git a/src/main/resources/application-dev.yaml b/src/main/resources/application-dev.yaml index e7d5bda..d642cbf 100644 --- a/src/main/resources/application-dev.yaml +++ b/src/main/resources/application-dev.yaml @@ -8,3 +8,7 @@ spring: kon: survey-type: TEST + +kri: + file: + pdf-converter-command: /usr/bin/soffice diff --git a/src/main/resources/application-local.yaml b/src/main/resources/application-local.yaml index f5f1c20..19199da 100644 --- a/src/main/resources/application-local.yaml +++ b/src/main/resources/application-local.yaml @@ -26,3 +26,7 @@ logging: kon: survey-type: TEST + +kri: + file: + pdf-converter-command: "C:/Program Files/LibreOffice/program/soffice.exe" diff --git a/src/main/resources/application-prod.yaml b/src/main/resources/application-prod.yaml index 872f6f2..5d2f182 100644 --- a/src/main/resources/application-prod.yaml +++ b/src/main/resources/application-prod.yaml @@ -8,3 +8,7 @@ spring: kon: survey-type: LIST + +kri: + file: + pdf-converter-command: /usr/bin/soffice diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index a48ec05..5fe8ebe 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -54,6 +54,7 @@ kri: - /api/v1/admin-cache/** - /api/v1/assign/confirm/* - /api/v1/performance/list/compact + - /api/v1/review/end/** swagger: enabled: true @@ -67,6 +68,7 @@ kri: file: visit-base-dir: ./upload-file/visit review-base-dir: ./upload-file/review + pdf-converter-command: soffice web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) diff --git a/src/main/resources/mybatis/mapper/kon/KonMapper.xml b/src/main/resources/mybatis/mapper/kon/KonMapper.xml index 88fab48..dd64557 100644 --- a/src/main/resources/mybatis/mapper/kon/KonMapper.xml +++ b/src/main/resources/mybatis/mapper/kon/KonMapper.xml @@ -5,22 +5,38 @@ + + SELECT DISTINCT + JSON_VALUE(DJ.[VALUE], '$.SC') AS IDKEY, + DV.[value] AS performance_id + FROM [DATA] DA WITH(NOLOCK) + CROSS APPLY OPENJSON([DATJSON]) DJ + CROSS APPLY OPENJSON(DJ.[value]) DV + WHERE PKEY = '2605013_B' + AND [Status] = 10 + AND JSON_VALUE(DJ.[VALUE], '$.SC') IS NOT NULL + AND JSON_VALUE(DJ.[VALUE], '$.SC') != '' + AND DV.[KEY] LIKE 'Q1%' + AND [SURVEY_TYPE] = #{surveyType} + + + + -- 2.49.0.windows.1 From db18a687e3931d804c3853e1c306291cd1996847 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 17 Jun 2026 16:03:07 +0900 Subject: [PATCH 3/6] =?UTF-8?q?260617=5F02=5FENH:=20assign=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EC=97=B4=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 5fe8ebe..affa9c7 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -52,7 +52,7 @@ kri: - /ping - /api/v1/auth/login - /api/v1/admin-cache/** - - /api/v1/assign/confirm/* + - /api/v1/assign/confirm/*/* - /api/v1/performance/list/compact - /api/v1/review/end/** -- 2.49.0.windows.1 From f428e1241bdf45dc7e6b1177cb8ffe09f7fd0e4a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 17 Jun 2026 16:25:21 +0900 Subject: [PATCH 4/6] =?UTF-8?q?260617=5F03=5FENH:=20assign=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kri/gwcf/review/back/service/AssignService.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/com/kri/gwcf/review/back/service/AssignService.java b/src/main/java/com/kri/gwcf/review/back/service/AssignService.java index 1667f18..e0dce0e 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/AssignService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/AssignService.java @@ -340,12 +340,6 @@ public class AssignService { errors.add(ExcelErrorDto.of(rowNumber, "사용자 ID", "존재하지 않는 사용자 ID입니다.")); } - if (StringUtil.hasText(userId) - && performanceId != null - && performanceAssignRepository.existsByAssignUserAndPerformanceIdNot(userId, performanceId)) { - errors.add(ExcelErrorDto.of(rowNumber, "사용자 ID", "이미 다른 사업에 배정된 사용자입니다.")); - } - return errors; } @@ -369,11 +363,6 @@ public class AssignService { throw BusinessException.notFound("USER_NOT_FOUND", "존재하지 않는 사용자 ID입니다.") .with("userId", userId); } - if (performanceAssignRepository.existsByAssignUserAndPerformanceIdNot(userId, performanceId)) { - throw BusinessException.conflict("ASSIGN_ALREADY_EXISTS", "이미 다른 공연에 배정된 사용자입니다.") - .with("performanceId", performanceId) - .with("assignUser", userId); - } } private boolean hasReview(TPerformanceAssignEntity assign) { -- 2.49.0.windows.1 From 65a543ed96bc221192ae8a76feeaaf6eb3d5aa00 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 23 Jun 2026 09:56:22 +0900 Subject: [PATCH 5/6] =?UTF-8?q?260623=5F01=5FENH:=20=EC=97=91=EC=85=80=20?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=A0=9C=EC=99=80?= =?UTF-8?q?=ED=95=9C=20=EA=B8=B0=EB=8A=A5=20=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../back/common/util/DownloadHeaderUtil.java | 14 +++ .../back/config/FileStorageProperties.java | 3 +- .../controller/MonitoringVisitController.java | 6 +- .../back/controller/ReviewController.java | 56 ++++++--- .../PerformanceMonitoringVisitDto.java | 4 +- .../dto/performance/PerformanceReviewDto.java | 7 ++ .../TPerformanceMonitoringVisitEntity.java | 2 +- .../review/back/service/ReviewService.java | 24 +++- .../back/service/ReviewTemplateService.java | 109 ++++++++++++++++++ .../review/back/service/VisitService.java | 4 +- .../service/file/AbstractFileService.java | 14 ++- src/main/resources/application.yaml | 2 + 12 files changed, 214 insertions(+), 31 deletions(-) create mode 100644 src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java create mode 100644 src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java diff --git a/src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java b/src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java new file mode 100644 index 0000000..3e58010 --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/common/util/DownloadHeaderUtil.java @@ -0,0 +1,14 @@ +package com.kri.gwcf.review.back.common.util; + +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +public final class DownloadHeaderUtil { + + public static String attachmentContentDisposition(String fileName) { + return "attachment; filename*=UTF-8''" + + URLEncoder.encode(fileName, StandardCharsets.UTF_8).replace("+", "%20"); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java b/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java index 2e465c3..fc07db4 100644 --- a/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java +++ b/src/main/java/com/kri/gwcf/review/back/config/FileStorageProperties.java @@ -10,4 +10,5 @@ import org.springframework.boot.context.properties.ConfigurationProperties; public class FileStorageProperties { private String visitBaseDir; private String reviewBaseDir; -} \ No newline at end of file + private String reviewTemplateBaseDir; +} diff --git a/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java b/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java index b645112..57276ad 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/MonitoringVisitController.java @@ -1,5 +1,7 @@ package com.kri.gwcf.review.back.controller; +import static com.kri.gwcf.review.back.common.util.DownloadHeaderUtil.attachmentContentDisposition; + import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; import com.kri.gwcf.review.back.dto.monitoring.MonitoringGpsRequestDto; @@ -11,7 +13,6 @@ import io.swagger.v3.oas.annotations.tags.Tag; import java.time.LocalDateTime; import java.util.List; import lombok.RequiredArgsConstructor; -import org.springframework.http.ContentDisposition; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -87,8 +88,7 @@ public class MonitoringVisitController { byte[] bytes = visitService.downloadEvidenceZip(performanceId, userId); String fileName = "evidence_" + performanceId + "_" + userId + ".zip"; return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, - ContentDisposition.attachment().filename(fileName).build().toString()) + .header(HttpHeaders.CONTENT_DISPOSITION, attachmentContentDisposition(fileName)) .contentType(MediaType.APPLICATION_OCTET_STREAM) .body(bytes); } diff --git a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java index 398d49a..87ae9b7 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/ReviewController.java @@ -2,16 +2,17 @@ package com.kri.gwcf.review.back.controller; import com.kri.common.feature.datetime.DateTimeUtil; import com.kri.common.feature.web.RequestUserContext; +import static com.kri.gwcf.review.back.common.util.DownloadHeaderUtil.attachmentContentDisposition; import com.kri.gwcf.review.back.dto.performance.PerformanceReviewDto; import com.kri.gwcf.review.back.dto.systemlog.UploadContentDto; import com.kri.gwcf.review.back.service.ReviewService; +import com.kri.gwcf.review.back.service.ReviewTemplateService; import com.kri.gwcf.review.back.service.common.SystemEventLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import java.time.LocalDateTime; import lombok.RequiredArgsConstructor; import org.springframework.core.io.Resource; -import org.springframework.http.ContentDisposition; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; @@ -30,17 +31,19 @@ import org.springframework.web.multipart.MultipartFile; public class ReviewController { private final ReviewService reviewService; + private final ReviewTemplateService reviewTemplateService; private final SystemEventLogService systemEventLogService; @Operation(summary = "서면평가 시작 저장") - @PostMapping("/start/{performanceId}") + @PostMapping("/start/{performanceId}/{userId}") public PerformanceReviewDto startWrittenReview( @PathVariable Integer performanceId, + @PathVariable String userId, RequestUserContext ctx ) { LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); - PerformanceReviewDto result = reviewService.saveWrittenReviewStatus(performanceId, 1, ctx.getUserId(), now); - systemEventLogService.writeStartWrittenReviewLog(ctx.getUserId(), now, ctx.getClientIp(), performanceId); + PerformanceReviewDto result = reviewService.saveWrittenReviewStatus(performanceId, 1, userId, now); + systemEventLogService.writeStartWrittenReviewLog(userId, now, ctx.getClientIp(), performanceId); return result; } @@ -79,45 +82,64 @@ public class ReviewController { } @Operation(summary = "평가/모니터링 파일 조회") - @GetMapping("/{performanceId}/{reviewType}") + @GetMapping("/{performanceId}/{reviewType}/{userId}") public PerformanceReviewDto getReviewFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, - RequestUserContext ctx + @PathVariable String userId ) { - return reviewService.getReviewFile(performanceId, reviewType, ctx.getUserId()); + return reviewService.getReviewFile(performanceId, reviewType, userId); } @Operation(summary = "평가/모니터링 원본 파일 다운로드") - @GetMapping("/download/{performanceId}/{reviewType}") + @GetMapping("/download/{performanceId}/{reviewType}/{userId}") public ResponseEntity downloadOriginalFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, - RequestUserContext ctx + @PathVariable String userId ) { return download( - reviewService.getOriginalFileResource(performanceId, reviewType, ctx.getUserId()), - reviewService.getOriginalFileName(performanceId, reviewType, ctx.getUserId()) + reviewService.getOriginalFileResource(performanceId, reviewType, userId), + reviewService.getOriginalFileName(performanceId, reviewType, userId) ); } @Operation(summary = "PDF 변환 파일 조회/다운로드") - @GetMapping("/pdf/{performanceId}/{reviewType}") + @GetMapping("/pdf/{performanceId}/{reviewType}/{userId}") public ResponseEntity downloadPdfOrOriginalFile( @PathVariable Integer performanceId, @PathVariable Integer reviewType, - RequestUserContext ctx + @PathVariable String userId ) { return download( - reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, ctx.getUserId()), - reviewService.getPdfOrOriginalFileName(performanceId, reviewType, ctx.getUserId()) + reviewService.getPdfOrOriginalFileResource(performanceId, reviewType, userId), + reviewService.getPdfOrOriginalFileName(performanceId, reviewType, userId) + ); + } + + @Operation(summary = "평가양식 업로드") + @PostMapping(value = "/template/upload/{reviewType}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) + public String uploadReviewTemplate( + @PathVariable Integer reviewType, + @RequestParam("file") MultipartFile file + ) { + return reviewTemplateService.uploadReviewTemplate(reviewType, file); + } + + @Operation(summary = "평가양식 다운로드") + @GetMapping("/template/download/{reviewType}") + public ResponseEntity downloadReviewTemplate( + @PathVariable Integer reviewType + ) { + return download( + reviewTemplateService.getReviewTemplateResource(reviewType), + reviewTemplateService.getReviewTemplateFileName(reviewType) ); } private ResponseEntity download(Resource resource, String fileName) { return ResponseEntity.ok() - .header(HttpHeaders.CONTENT_DISPOSITION, - ContentDisposition.attachment().filename(fileName).build().toString()) + .header(HttpHeaders.CONTENT_DISPOSITION, attachmentContentDisposition(fileName)) .contentType(MediaType.APPLICATION_OCTET_STREAM) .body(resource); } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java index 0b1045b..04b2ffa 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceMonitoringVisitDto.java @@ -47,7 +47,7 @@ public class PerformanceMonitoringVisitDto { private String regUser; @Schema(description = "등록일시") - private LocalDateTime regDate; + private LocalDateTime regDt; public static PerformanceMonitoringVisitDto from(TPerformanceMonitoringVisitEntity entity) { if (entity == null) { @@ -64,7 +64,7 @@ public class PerformanceMonitoringVisitDto { .gpsAccuracyM(entity.getGpsAccuracyM()) .gpsRaw(entity.getGpsRaw()) .regUser(entity.getRegUser()) - .regDate(entity.getRegDt()) + .regDt(entity.getRegDt()) .build(); } } diff --git a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java index 5993a00..e2a2e52 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/performance/PerformanceReviewDto.java @@ -2,6 +2,7 @@ package com.kri.gwcf.review.back.dto.performance; import com.kri.gwcf.review.back.persistence.entity.TPerformanceReviewEntity; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -25,6 +26,9 @@ public class PerformanceReviewDto { @Schema(description = "등록 사용자") private String regUser; + @Schema(description = "평가 일시") + private LocalDateTime reviewDt; + @Schema(description = "평가 상태") private Integer reviewStatus; @@ -42,10 +46,13 @@ public class PerformanceReviewDto { return null; } + LocalDateTime reviewDt = entity.getModDt() != null ? entity.getModDt() : entity.getRegDt(); + return PerformanceReviewDto.builder() .performanceId(entity.getPerformanceId()) .reviewType(entity.getReviewType()) .regUser(entity.getRegUser()) + .reviewDt(reviewDt) .reviewStatus(entity.getReviewStatus()) .uploadFileName(entity.getUploadFileName()) .pdfConvert(entity.getPdfConvert()) diff --git a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java index 86180f9..fce2aa8 100644 --- a/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java +++ b/src/main/java/com/kri/gwcf/review/back/persistence/entity/TPerformanceMonitoringVisitEntity.java @@ -86,7 +86,7 @@ public class TPerformanceMonitoringVisitEntity { entity.setGpsAccuracyM(dto.getGpsAccuracyM()); entity.setGpsRaw(dto.getGpsRaw()); entity.setRegUser(dto.getRegUser()); - entity.setRegDt(dto.getRegDate()); + entity.setRegDt(dto.getRegDt()); return entity; } diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java index 7e3e629..de6ddc0 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewService.java @@ -133,10 +133,13 @@ public class ReviewService extends AbstractFileService { try { Path dir = reviewDir(performanceId, reviewType); - String uploadFileName = saveFile(dir, file); + String uploadFileName = buildFileNameWithTime(file, now); + saveFile(dir, file, uploadFileName); Path uploadPath = dir.resolve(uploadFileName).normalize(); - String pdfFileName = convertToPdfIfPossible(uploadPath, dir); + String pdfFileName = isPdf(uploadFileName) + ? uploadFileName + : convertToPdfIfPossible(uploadPath, dir); boolean pdfConvert = StringUtil.hasText(pdfFileName); TPerformanceReviewEntity entity = performanceReviewRepository @@ -178,7 +181,7 @@ public class ReviewService extends AbstractFileService { } public String getOriginalFileName(Integer performanceId, Integer reviewType, String userId) { - return getReviewEntity(performanceId, reviewType, userId).getUploadFileName(); + return removeTimestampPrefix(getReviewEntity(performanceId, reviewType, userId).getUploadFileName()); } public PathResource getPdfOrOriginalFileResource(Integer performanceId, Integer reviewType, String userId) { @@ -191,9 +194,10 @@ public class ReviewService extends AbstractFileService { public String getPdfOrOriginalFileName(Integer performanceId, Integer reviewType, String userId) { TPerformanceReviewEntity entity = getReviewEntity(performanceId, reviewType, userId); - return StringUtil.isNullOrBlank(entity.getPdfFileName()) + String fileName = StringUtil.isNullOrBlank(entity.getPdfFileName()) ? entity.getUploadFileName() : entity.getPdfFileName(); + return removeTimestampPrefix(fileName); } private TPerformanceReviewEntity getReviewEntity(Integer performanceId, Integer reviewType, String userId) { @@ -260,4 +264,16 @@ public class ReviewService extends AbstractFileService { int dot = fileName.lastIndexOf('.'); return dot > 0 ? fileName.substring(0, dot) : fileName; } + + private boolean isPdf(String fileName) { + return ".pdf".equalsIgnoreCase(extractExtension(fileName)); + } + + private String removeTimestampPrefix(String fileName) { + if (StringUtil.isNullOrBlank(fileName)) { + return fileName; + } + + return fileName.replaceFirst("^\\d{4}-\\d{2}-\\d{2}_\\d{6}_", ""); + } } diff --git a/src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java b/src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java new file mode 100644 index 0000000..1e1b48d --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/service/ReviewTemplateService.java @@ -0,0 +1,109 @@ +package com.kri.gwcf.review.back.service; + +import com.kri.common.feature.util.StringUtil; +import com.kri.common.feature.web.BusinessException; +import com.kri.gwcf.review.back.config.FileStorageProperties; +import com.kri.gwcf.review.back.service.file.AbstractFileService; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Comparator; +import lombok.RequiredArgsConstructor; +import org.springframework.core.io.PathResource; +import org.springframework.stereotype.Service; +import org.springframework.web.multipart.MultipartFile; + +@Service +@RequiredArgsConstructor +public class ReviewTemplateService extends AbstractFileService { + + private final FileStorageProperties fileStorageProperties; + + @Override + protected Path getBaseDir() { + return Path.of(fileStorageProperties.getReviewTemplateBaseDir()) + .toAbsolutePath() + .normalize(); + } + + public String uploadReviewTemplate(Integer reviewType, MultipartFile file) { + validateReviewTemplateType(reviewType); + if (file == null || file.isEmpty()) { + throw BusinessException.badRequest("EMPTY_FILE", "업로드된 파일이 없습니다."); + } + + String fileName = sanitizeFileName(file.getOriginalFilename()); + Path dir = templateDir(reviewType); + + try { + deleteExistingFiles(dir); + saveFile(dir, file, fileName); + return fileName; + } catch (IOException e) { + throw BusinessException.internalError("REVIEW_TEMPLATE_SAVE_FAILED", "평가양식 파일 저장 중 오류가 발생했습니다."); + } + } + + public PathResource getReviewTemplateResource(Integer reviewType) { + Path file = findReviewTemplateFile(reviewType); + return new PathResource(file); + } + + public String getReviewTemplateFileName(Integer reviewType) { + return findReviewTemplateFile(reviewType).getFileName().toString(); + } + + private Path findReviewTemplateFile(Integer reviewType) { + validateReviewTemplateType(reviewType); + Path dir = templateDir(reviewType); + if (!Files.isDirectory(dir)) { + throw BusinessException.notFound("REVIEW_TEMPLATE_NOT_FOUND", "평가양식 파일이 없습니다.") + .with("reviewType", reviewType); + } + + try (var files = Files.list(dir)) { + return files + .filter(Files::isRegularFile) + .sorted(Comparator.comparing(path -> path.getFileName().toString())) + .findFirst() + .orElseThrow(() -> BusinessException.notFound("REVIEW_TEMPLATE_NOT_FOUND", "평가양식 파일이 없습니다.") + .with("reviewType", reviewType)); + } catch (IOException e) { + throw BusinessException.internalError("REVIEW_TEMPLATE_READ_FAILED", "평가양식 파일 조회 중 오류가 발생했습니다."); + } + } + + private void deleteExistingFiles(Path dir) throws IOException { + if (!Files.isDirectory(dir)) { + return; + } + + try (var files = Files.list(dir)) { + for (Path file : files.filter(Files::isRegularFile).toList()) { + Files.deleteIfExists(file); + } + } + } + + private Path templateDir(Integer reviewType) { + return getBaseDir() + .resolve(String.valueOf(reviewType)) + .toAbsolutePath() + .normalize(); + } + + private void validateReviewTemplateType(Integer reviewType) { + if (!Integer.valueOf(1).equals(reviewType) && !Integer.valueOf(3).equals(reviewType)) { + throw BusinessException.badRequest("INVALID_REVIEW_TEMPLATE_TYPE", "유효하지 않은 평가양식 타입입니다.") + .with("reviewType", reviewType); + } + } + + private String sanitizeFileName(String originalFileName) { + if (StringUtil.isNullOrBlank(originalFileName)) { + return "review-template"; + } + + return Path.of(originalFileName).getFileName().toString(); + } +} diff --git a/src/main/java/com/kri/gwcf/review/back/service/VisitService.java b/src/main/java/com/kri/gwcf/review/back/service/VisitService.java index c0ae38a..e0575c2 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/VisitService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/VisitService.java @@ -62,7 +62,7 @@ public class VisitService extends AbstractFileService { String regUser, LocalDateTime regDt ) { - validateGps(gps); + //validateGps(gps); TPerformanceMonitoringVisitEntity entity = saveVisit( performanceId, 2, @@ -83,7 +83,7 @@ public class VisitService extends AbstractFileService { String regUser, LocalDateTime regDt ) { - validateGps(gps); + //validateGps(gps); String evidenceImg = String.join("|", saveEvidenceFiles(performanceId, regUser, files)); TPerformanceMonitoringVisitEntity entity = saveVisit( diff --git a/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java b/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java index 32b8cec..fff406e 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/file/AbstractFileService.java @@ -8,6 +8,8 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.StandardCopyOption; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.Optional; import org.springframework.web.multipart.MultipartFile; @@ -54,11 +56,20 @@ public abstract class AbstractFileService { String ext = extractExtension(original); String timestamp = DateTimeUtil.nowKstLocalDateTime() - .format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); + .format(DateTimeFormatter.ofPattern("yyyyMMdd_HHmmss")); return prefix + "_" + timestamp + "_" + baseName + ext; } + protected String buildFileNameWithTime(MultipartFile file, LocalDateTime now) { + String original = Optional.ofNullable(file.getOriginalFilename()).orElse("file"); + String baseName = extractBaseName(original); + String ext = extractExtension(original); + String timestamp = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd_hhmmss")); + + return timestamp + "_" + baseName + ext; + } + protected Path createDirectories(Path dir) throws IOException { return Files.createDirectories(dir.toAbsolutePath().normalize()); } @@ -92,6 +103,7 @@ public abstract class AbstractFileService { throw BusinessException.internalError("WRONG_DIRECTORY","잘못된 파일 경로입니다."); } + Files.deleteIfExists(target); file.transferTo(target.toFile()); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index affa9c7..c2b4c28 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -54,6 +54,7 @@ kri: - /api/v1/admin-cache/** - /api/v1/assign/confirm/*/* - /api/v1/performance/list/compact + - /api/v1/review/start/** - /api/v1/review/end/** swagger: @@ -68,6 +69,7 @@ kri: file: visit-base-dir: ./upload-file/visit review-base-dir: ./upload-file/review + review-template-base-dir: ./upload-file/review-template pdf-converter-command: soffice web: -- 2.49.0.windows.1 From 5f8cade0b8531d8b2e5d75e3aa5cc77d144b9a90 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 23 Jun 2026 11:39:19 +0900 Subject: [PATCH 6/6] =?UTF-8?q?260623=5F02=5FENH:=20=EC=97=91=EC=85=80=20?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=EB=A5=BC=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=ED=95=9C=201=EC=B0=A8=20=EA=B0=9C=EB=B0=9C=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PerformanceController.java | 10 + .../back/controller/UserController.java | 11 + .../performance/PerformanceDownloadDto.java | 65 ++++++ .../PerformanceUploadDto.java | 6 +- .../{ => user}/MonitoringUserUploadDto.java | 2 +- .../excel/{ => user}/UserUploadBaseDto.java | 2 +- .../{ => user}/WrittenUserAssignDto.java | 2 +- .../{ => user}/WrittenUserUploadDto.java | 2 +- .../review/back/dto/user/UserFullDto.java | 2 +- .../review/back/service/AssignService.java | 5 +- .../back/service/PerformanceService.java | 190 +++++++++++++++++- .../gwcf/review/back/service/UserService.java | 84 +++++++- 12 files changed, 365 insertions(+), 16 deletions(-) create mode 100644 src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceDownloadDto.java rename src/main/java/com/kri/gwcf/review/back/dto/excel/{ => performance}/PerformanceUploadDto.java (97%) rename src/main/java/com/kri/gwcf/review/back/dto/excel/{ => user}/MonitoringUserUploadDto.java (97%) rename src/main/java/com/kri/gwcf/review/back/dto/excel/{ => user}/UserUploadBaseDto.java (72%) rename src/main/java/com/kri/gwcf/review/back/dto/excel/{ => user}/WrittenUserAssignDto.java (92%) rename src/main/java/com/kri/gwcf/review/back/dto/excel/{ => user}/WrittenUserUploadDto.java (96%) diff --git a/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java b/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java index 77f0ed8..1ff246c 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/PerformanceController.java @@ -64,6 +64,16 @@ public class PerformanceController { return buildExcelResponse("performance_upload_template.xlsx", bytes); } + @Operation(summary = "공연정보 엑셀 다운로드") + @PostMapping("/excel/download") + public ResponseEntity exportPerformance( + @RequestBody String[] performanceIds + ) { + byte[] bytes = performanceService.exportPerformance(performanceIds); + + return buildExcelResponse("performance.xlsx", bytes); + } + @Operation( summary = "공연 일괄 생성(엑셀 업로드)", description = "성공하면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환" diff --git a/src/main/java/com/kri/gwcf/review/back/controller/UserController.java b/src/main/java/com/kri/gwcf/review/back/controller/UserController.java index d399661..1c9a0a3 100644 --- a/src/main/java/com/kri/gwcf/review/back/controller/UserController.java +++ b/src/main/java/com/kri/gwcf/review/back/controller/UserController.java @@ -59,6 +59,17 @@ public class UserController { return buildExcelResponse("user_upload_template.xlsx", bytes); } + @Operation(summary = "사용자 엑셀 다운로드") + @PostMapping("/excel/download/{userRole}") + public ResponseEntity exportUser( + @PathVariable Integer userRole, + @RequestBody String[] userIds + ) { + byte[] bytes = userService.exportUser(userRole, userIds); + + return buildExcelResponse("user.xlsx", bytes); + } + @Operation( summary = "사용자 일괄 생성(엑셀 업로드)", description = "성공하면 JSON, 실패가 있으면 실패 내역 엑셀(xlsx) 반환" diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceDownloadDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceDownloadDto.java new file mode 100644 index 0000000..16c680f --- /dev/null +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceDownloadDto.java @@ -0,0 +1,65 @@ +package com.kri.gwcf.review.back.dto.excel.performance; + +import com.kri.common.feature.excel.ExcelColumn; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; +import lombok.experimental.SuperBuilder; + +@Getter +@Setter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class PerformanceDownloadDto extends PerformanceUploadDto { + + @ExcelColumn(header = "지자체 평가자", order = 24, width = 16) + @Schema(description = "지자체 평가자") + private String localReviewUser; + + @ExcelColumn(header = "지자체 평가 상태", order = 25, width = 16) + @Schema(description = "지자체 평가 상태") + private String localReviewStatus; + + @ExcelColumn(header = "지자체 평가 일시", order = 26, width = 16) + @Schema(description = "지자체 평가 일시") + private String localReviewDt; + + @ExcelColumn(header = "모니터링1 평가자", order = 27, width = 16) + @Schema(description = "모니터링1 평가자") + private String monitoringReviewUser1; + + @ExcelColumn(header = "모니터링1 평가 상태", order = 28, width = 16) + @Schema(description = "모니터링1 평가 상태") + private String monitoringReviewStatus1; + + @ExcelColumn(header = "모니터링1 평가 일시", order = 29, width = 16) + @Schema(description = "모니터링1 평가 일시") + private String monitoringReviewDt1; + + @ExcelColumn(header = "모니터링2 평가자", order = 30, width = 16) + @Schema(description = "모니터링2 평가자") + private String monitoringReviewUser2; + + @ExcelColumn(header = "모니터링2 평가 상태", order = 31, width = 16) + @Schema(description = "모니터링2 평가 상태") + private String monitoringReviewStatus2; + + @ExcelColumn(header = "모니터링2 평가 일시", order = 32, width = 16) + @Schema(description = "모니터링2 평가 일시") + private String monitoringReviewDt2; + + @ExcelColumn(header = "서면 평가 위원", order = 33, width = 16) + @Schema(description = "서면 평가 위원") + private String writtenReviewUser; + + @ExcelColumn(header = "서면 평가 상태", order = 34, width = 16) + @Schema(description = "서면 평가 상태") + private String writtenReviewStatus; + + @ExcelColumn(header = "서면 평가 일시", order = 35, width = 16) + @Schema(description = "서면 평가 일시") + private String writtenReviewDt; +} diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/PerformanceUploadDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceUploadDto.java similarity index 97% rename from src/main/java/com/kri/gwcf/review/back/dto/excel/PerformanceUploadDto.java rename to src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceUploadDto.java index 99d57e8..39d0728 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/excel/PerformanceUploadDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/performance/PerformanceUploadDto.java @@ -1,16 +1,16 @@ -package com.kri.gwcf.review.back.dto.excel; +package com.kri.gwcf.review.back.dto.excel.performance; import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; +import lombok.experimental.SuperBuilder; @Getter @Setter -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor public class PerformanceUploadDto { diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/MonitoringUserUploadDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/MonitoringUserUploadDto.java similarity index 97% rename from src/main/java/com/kri/gwcf/review/back/dto/excel/MonitoringUserUploadDto.java rename to src/main/java/com/kri/gwcf/review/back/dto/excel/user/MonitoringUserUploadDto.java index 52f940a..a35b4bb 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/excel/MonitoringUserUploadDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/MonitoringUserUploadDto.java @@ -1,4 +1,4 @@ -package com.kri.gwcf.review.back.dto.excel; +package com.kri.gwcf.review.back.dto.excel.user; import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/UserUploadBaseDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/UserUploadBaseDto.java similarity index 72% rename from src/main/java/com/kri/gwcf/review/back/dto/excel/UserUploadBaseDto.java rename to src/main/java/com/kri/gwcf/review/back/dto/excel/user/UserUploadBaseDto.java index 6b757b3..6ebd41e 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/excel/UserUploadBaseDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/UserUploadBaseDto.java @@ -1,4 +1,4 @@ -package com.kri.gwcf.review.back.dto.excel; +package com.kri.gwcf.review.back.dto.excel.user; public interface UserUploadBaseDto { diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/WrittenUserAssignDto.java similarity index 92% rename from src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java rename to src/main/java/com/kri/gwcf/review/back/dto/excel/user/WrittenUserAssignDto.java index 561a726..597bad5 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserAssignDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/WrittenUserAssignDto.java @@ -1,4 +1,4 @@ -package com.kri.gwcf.review.back.dto.excel; +package com.kri.gwcf.review.back.dto.excel.user; import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserUploadDto.java b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/WrittenUserUploadDto.java similarity index 96% rename from src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserUploadDto.java rename to src/main/java/com/kri/gwcf/review/back/dto/excel/user/WrittenUserUploadDto.java index 535b32e..bf8c5da 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/excel/WrittenUserUploadDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/excel/user/WrittenUserUploadDto.java @@ -1,4 +1,4 @@ -package com.kri.gwcf.review.back.dto.excel; +package com.kri.gwcf.review.back.dto.excel.user; import com.kri.common.feature.excel.ExcelColumn; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/kri/gwcf/review/back/dto/user/UserFullDto.java b/src/main/java/com/kri/gwcf/review/back/dto/user/UserFullDto.java index 626999a..5182517 100644 --- a/src/main/java/com/kri/gwcf/review/back/dto/user/UserFullDto.java +++ b/src/main/java/com/kri/gwcf/review/back/dto/user/UserFullDto.java @@ -2,7 +2,7 @@ package com.kri.gwcf.review.back.dto.user; import static com.kri.gwcf.review.back.common.util.MakeExtraFieldMap.toExtraFieldMap; -import com.kri.gwcf.review.back.dto.excel.UserUploadBaseDto; +import com.kri.gwcf.review.back.dto.excel.user.UserUploadBaseDto; import com.kri.gwcf.review.back.persistence.entity.TUserEntity; import java.util.Collection; diff --git a/src/main/java/com/kri/gwcf/review/back/service/AssignService.java b/src/main/java/com/kri/gwcf/review/back/service/AssignService.java index e0dce0e..40431ef 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/AssignService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/AssignService.java @@ -1,8 +1,5 @@ package com.kri.gwcf.review.back.service; -import static com.kri.gwcf.review.back.common.consts.GwcfConstant.MONITORING_USER_ROLE; -import static com.kri.gwcf.review.back.common.util.AppendCodeSheet.appendCodeSheet; - import com.kri.common.feature.excel.ExcelMapper; import com.kri.common.feature.util.NumericUtil; import com.kri.common.feature.util.StringUtil; @@ -10,7 +7,7 @@ import com.kri.gwcf.review.back.common.util.ExcelUploadResultUtil; import com.kri.gwcf.review.back.dto.assign.AssignUserCountDto; import com.kri.gwcf.review.back.dto.excel.ExcelErrorDto; import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto; -import com.kri.gwcf.review.back.dto.excel.WrittenUserAssignDto; +import com.kri.gwcf.review.back.dto.excel.user.WrittenUserAssignDto; import com.kri.common.feature.web.BusinessException; import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; import com.kri.gwcf.review.back.dto.kon.PerformanceApplyUserDto; diff --git a/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java b/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java index d0f32c4..427ab2a 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/PerformanceService.java @@ -13,11 +13,14 @@ import com.kri.gwcf.review.back.common.util.TelUtil; import com.kri.gwcf.review.back.dto.common.CodeDto; import com.kri.gwcf.review.back.dto.excel.ExcelErrorDto; import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto; -import com.kri.gwcf.review.back.dto.excel.PerformanceUploadDto; +import com.kri.gwcf.review.back.dto.excel.performance.PerformanceDownloadDto; +import com.kri.gwcf.review.back.dto.excel.performance.PerformanceUploadDto; import com.kri.gwcf.review.back.dto.kon.PerformanceApplyCountDto; import com.kri.gwcf.review.back.dto.performance.PerformanceCompactDto; +import com.kri.gwcf.review.back.dto.performance.PerformanceAssignDto; import com.kri.gwcf.review.back.dto.performance.PerformanceFullDto; import com.kri.gwcf.review.back.dto.performance.PerformanceMonitoringScheduleDto; +import com.kri.gwcf.review.back.dto.performance.PerformanceReviewDto; import com.kri.gwcf.review.back.dto.performance.PerformanceStaffDto; import com.kri.gwcf.review.back.persistence.entity.TPerformanceDetailEntity; import com.kri.gwcf.review.back.persistence.entity.TPerformanceEntity; @@ -30,6 +33,7 @@ import com.kri.gwcf.review.back.persistence.repository.PerformanceRepository; import com.kri.gwcf.review.back.persistence.repository.PerformanceStaffRepository; import java.io.ByteArrayOutputStream; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -37,6 +41,8 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.ss.usermodel.WorkbookFactory; @@ -49,6 +55,9 @@ import org.springframework.web.multipart.MultipartFile; @RequiredArgsConstructor public class PerformanceService { + private static final DateTimeFormatter REVIEW_DT_FORMATTER = + DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + private final KonMapper konMapper; private final PerformanceRepository performanceRepository; private final PerformanceDetailRepository performanceDetailRepository; @@ -207,6 +216,185 @@ public class PerformanceService { } } + public byte[] exportPerformance(String[] performanceIds) { + Set selectedPerformanceIds = performanceIds == null + ? Collections.emptySet() + : Arrays.stream(performanceIds).collect(Collectors.toSet()); + List performanceList = getPerformanceList().stream() + .filter(performance -> selectedPerformanceIds.contains(String.valueOf(performance.getId()))) + .map(this::toPerformanceDownloadRow) + .toList(); + + List businessTypeList = codeService.findByCodeGroup("business_type"); + List genreList = codeService.findByCodeGroup("genre"); + List areaList = codeService.findByCodeGroup("area"); + List ticketReservationStatusList = + codeService.findByCodeGroup("ticket_reservation_status"); + List reviewStatusList = codeService.findByCodeGroup("review_status"); + + try (Workbook workbook = + ExcelMapper.writeToWorkbook(performanceList, PerformanceDownloadDto.class); + ByteArrayOutputStream out = new ByteArrayOutputStream()) { + + appendCodeSheet(workbook, businessTypeList, "사업유형"); + appendCodeSheet(workbook, genreList, "장르"); + appendCodeSheet(workbook, areaList, "지역"); + appendCodeSheet(workbook, ticketReservationStatusList, "티켓 예약"); + appendCodeSheet(workbook, reviewStatusList, "평가 상태"); + + workbook.write(out); + return out.toByteArray(); + } catch (Exception e) { + throw BusinessException.internalError("공연 엑셀 생성 중 오류"); + } + } + + private PerformanceDownloadDto toPerformanceDownloadRow(PerformanceFullDto performance) { + Map detail = performance.getPerformanceDetail() == null + ? Collections.emptyMap() + : performance.getPerformanceDetail(); + PerformanceMonitoringScheduleDto schedule = performance.getPerformanceMonitoringSchedule(); + PerformanceStaffDto ownStaff = findStaff(performance, 1); + PerformanceStaffDto contactStaff = findStaff(performance, 2); + PerformanceAssignDto monitoringAssign1 = findAssign(performance, 1, (short) 1); + PerformanceAssignDto monitoringAssign2 = findAssign(performance, 1, (short) 2); + PerformanceAssignDto writtenAssign = findFirstAssign(performance, 2); + + PerformanceReviewDto localReview = findFirstReview(performance, 3); + PerformanceReviewDto monitoringReview1 = findReview( + performance, + 1, + monitoringAssign1 == null ? null : monitoringAssign1.getAssignUser() + ); + PerformanceReviewDto monitoringReview2 = findReview( + performance, + 1, + monitoringAssign2 == null ? null : monitoringAssign2.getAssignUser() + ); + PerformanceReviewDto writtenReview = findReview( + performance, + 2, + writtenAssign == null ? null : writtenAssign.getAssignUser() + ); + + return PerformanceDownloadDto.builder() + .performanceId(toStringValue(performance.getId())) + .businessType(toStringValue(performance.getBusinessType())) + .genre(toStringValue(performance.getPerformanceGenre())) + .performanceArea(toStringValue(performance.getPerformanceArea())) + .artistName(performance.getArtistName()) + .performanceName(performance.getPerformanceName()) + .performanceStartMonth(toStringValue(performance.getPerformanceStartMonth())) + .performanceDtInfo(performance.getPerformanceDtInfo()) + .performanceTimeInfo(performance.getPerformanceTimeInfo()) + .ticketReservationStatus(toStringValue(performance.getTicketReservationStatus())) + .ticketReservationMemo(performance.getTicketReservationMemo()) + .monitoringDate(schedule == null ? null : toStringValue(schedule.getMonitoringDate())) + .monitoringTimeInfo(schedule == null ? null : schedule.getMonitoringTimeInfo()) + .monitoringAddress(schedule == null ? null : schedule.getMonitoringAddress()) + .ownStaffName(ownStaff == null ? null : ownStaff.getStaffName()) + .ownStaffTel1(ownStaff == null ? null : ownStaff.getStaffTel1()) + .ownStaffTel2(ownStaff == null ? null : ownStaff.getStaffTel2()) + .ownStaffEmail(ownStaff == null ? null : ownStaff.getStaffEmail()) + .contactStaffName(contactStaff == null ? null : contactStaff.getStaffName()) + .contactStaffTel1(contactStaff == null ? null : contactStaff.getStaffTel1()) + .contactStaffTel2(contactStaff == null ? null : contactStaff.getStaffTel2()) + .contactStaffEmail(contactStaff == null ? null : contactStaff.getStaffEmail()) + .performanceMemo(performance.getPerformanceMemo()) + .monitoringPaymentDate(detail.get("monitoringPaymentDate")) + .localReviewUser(localReview == null ? null : localReview.getRegUser()) + .localReviewStatus(localReview == null ? null : toStringValue(localReview.getReviewStatus())) + .localReviewDt(formatReviewDt(localReview)) + .monitoringReviewUser1(monitoringAssign1 == null ? null : monitoringAssign1.getAssignUser()) + .monitoringReviewStatus1(monitoringReview1 == null ? null : toStringValue(monitoringReview1.getReviewStatus())) + .monitoringReviewDt1(formatReviewDt(monitoringReview1)) + .monitoringReviewUser2(monitoringAssign2 == null ? null : monitoringAssign2.getAssignUser()) + .monitoringReviewStatus2(monitoringReview2 == null ? null : toStringValue(monitoringReview2.getReviewStatus())) + .monitoringReviewDt2(formatReviewDt(monitoringReview2)) + .writtenReviewUser(writtenAssign == null ? null : writtenAssign.getAssignUser()) + .writtenReviewStatus(writtenReview == null ? null : toStringValue(writtenReview.getReviewStatus())) + .writtenReviewDt(formatReviewDt(writtenReview)) + .build(); + } + + private PerformanceStaffDto findStaff(PerformanceFullDto performance, Integer staffType) { + if (performance.getPerformanceStaff() == null) { + return null; + } + + return performance.getPerformanceStaff().stream() + .filter(staff -> Objects.equals(staff.getStaffType(), staffType)) + .findFirst() + .orElse(null); + } + + private PerformanceAssignDto findAssign( + PerformanceFullDto performance, + Integer assignType, + Short assignOrder + ) { + if (performance.getPerformanceAssignList() == null) { + return null; + } + + return performance.getPerformanceAssignList().stream() + .filter(assign -> Objects.equals(assign.getAssignType(), assignType)) + .filter(assign -> Objects.equals(assign.getAssignOrder(), assignOrder)) + .findFirst() + .orElse(null); + } + + private PerformanceAssignDto findFirstAssign(PerformanceFullDto performance, Integer assignType) { + if (performance.getPerformanceAssignList() == null) { + return null; + } + + return performance.getPerformanceAssignList().stream() + .filter(assign -> Objects.equals(assign.getAssignType(), assignType)) + .findFirst() + .orElse(null); + } + + private PerformanceReviewDto findFirstReview(PerformanceFullDto performance, Integer reviewType) { + if (performance.getPerformanceReviewMap() == null) { + return null; + } + + return performance.getPerformanceReviewMap().values().stream() + .flatMap(List::stream) + .filter(review -> Objects.equals(review.getReviewType(), reviewType)) + .findFirst() + .orElse(null); + } + + private PerformanceReviewDto findReview( + PerformanceFullDto performance, + Integer reviewType, + String regUser + ) { + if (StringUtil.isNullOrBlank(regUser) || performance.getPerformanceReviewMap() == null) { + return null; + } + + return performance.getPerformanceReviewMap() + .getOrDefault(regUser, Collections.emptyList()) + .stream() + .filter(review -> Objects.equals(review.getReviewType(), reviewType)) + .filter(review -> Objects.equals(review.getRegUser(), regUser)) + .findFirst() + .orElse(null); + } + + private String formatReviewDt(PerformanceReviewDto review) { + return review == null || review.getReviewDt() == null + ? null + : review.getReviewDt().format(REVIEW_DT_FORMATTER); + } + + private String toStringValue(Object value) { + return value == null ? null : String.valueOf(value); + } + @Transactional(readOnly = true, transactionManager = "konTransactionManager") public List findPerformanceApplyCount() { return konMapper.findPerformanceApplyCount(surveyType); diff --git a/src/main/java/com/kri/gwcf/review/back/service/UserService.java b/src/main/java/com/kri/gwcf/review/back/service/UserService.java index 5fa4fcc..4093f1d 100644 --- a/src/main/java/com/kri/gwcf/review/back/service/UserService.java +++ b/src/main/java/com/kri/gwcf/review/back/service/UserService.java @@ -16,9 +16,9 @@ import com.kri.gwcf.review.back.dto.common.CodeDto; import com.kri.gwcf.review.back.dto.common.DataVerificationDto; import com.kri.gwcf.review.back.dto.excel.ExcelErrorDto; import com.kri.gwcf.review.back.dto.excel.ExcelUploadResultDto; -import com.kri.gwcf.review.back.dto.excel.MonitoringUserUploadDto; -import com.kri.gwcf.review.back.dto.excel.UserUploadBaseDto; -import com.kri.gwcf.review.back.dto.excel.WrittenUserUploadDto; +import com.kri.gwcf.review.back.dto.excel.user.MonitoringUserUploadDto; +import com.kri.gwcf.review.back.dto.excel.user.UserUploadBaseDto; +import com.kri.gwcf.review.back.dto.excel.user.WrittenUserUploadDto; import com.kri.gwcf.review.back.dto.user.UserCompactDto; import com.kri.gwcf.review.back.dto.user.UserFullDto; import com.kri.gwcf.review.back.persistence.entity.TUserDetailEntity; @@ -28,10 +28,12 @@ import com.kri.gwcf.review.back.persistence.repository.UserRepository; import java.io.ByteArrayOutputStream; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Set; import java.util.stream.Collectors; import org.apache.poi.ss.usermodel.Workbook; import lombok.RequiredArgsConstructor; @@ -99,6 +101,11 @@ public class UserService { return exportUserTemplate(userRole, getUserUploadClass(userRole)); } + public byte[] exportUser(Integer userRole, String[] userIds) { + validateUserRole(userRole); + return exportUser(userRole, getUserUploadClass(userRole), userIds); + } + private Class getUserUploadClass(Integer userRole) { if (Objects.equals(userRole, MONITORING_USER_ROLE)) { return MonitoringUserUploadDto.class; @@ -132,6 +139,77 @@ public class UserService { } } + private byte[] exportUser(Integer userRole, Class clazz, String[] userIds) { + Set selectedUserIds = userIds == null + ? Collections.emptySet() + : Arrays.stream(userIds).collect(Collectors.toSet()); + + List userList = getUserList(userRole).stream() + .filter(user -> selectedUserIds.contains(user.getUserId())) + .toList(); + List exportRows = userList.stream() + .map(user -> toUserUploadRow(clazz, user)) + .toList(); + + List genreList = codeService.findByCodeGroup("genre"); + List areaList = codeService.findByCodeGroup("area"); + List genderList = codeService.findByCodeGroup("gender"); + List hasCarList = codeService.findByCodeGroup("has_car"); + + try (Workbook workbook = + ExcelMapper.writeToWorkbook(exportRows, clazz); + ByteArrayOutputStream out = new ByteArrayOutputStream()) { + + if (Objects.equals(userRole, MONITORING_USER_ROLE)) { + appendCodeSheet(workbook, areaList, "지역"); + appendCodeSheet(workbook, genderList, "성별"); + appendCodeSheet(workbook, hasCarList, "자차유무"); + } else { + appendCodeSheet(workbook, genreList, "장르"); + } + + workbook.write(out); + return out.toByteArray(); + } catch (Exception e) { + throw BusinessException.internalError("사용자 엑셀 생성 중 오류"); + } + } + + private T toUserUploadRow(Class clazz, UserFullDto user) { + if (clazz == MonitoringUserUploadDto.class) { + return clazz.cast(MonitoringUserUploadDto.builder() + .userId(user.getUserId()) + .userPw(user.getUserPw()) + .userName(user.getUserName()) + .userArea(getUserDetailValue(user, "userArea")) + .userGender(getUserDetailValue(user, "userGender")) + .userAge(getUserDetailValue(user, "userAge")) + .userTel(getUserDetailValue(user, "userTel")) + .userEmail(getUserDetailValue(user, "userEmail")) + .userHasCar(getUserDetailValue(user, "userHasCar")) + .memo(user.getMemo()) + .build()); + } + + if (clazz == WrittenUserUploadDto.class) { + return clazz.cast(WrittenUserUploadDto.builder() + .userId(user.getUserId()) + .userPw(user.getUserPw()) + .userName(user.getUserName()) + .userGenre(getUserDetailValue(user, "userGenre")) + .userTel(getUserDetailValue(user, "userTel")) + .userEmail(getUserDetailValue(user, "userEmail")) + .memo(user.getMemo()) + .build()); + } + + throw BusinessException.internalError("지원하지 않는 사용자 엑셀 형식입니다."); + } + + private String getUserDetailValue(UserFullDto user, String key) { + return getUserDetail(user).get(key); + } + private List readUserUploadRows( -- 2.49.0.windows.1