From d2f3f195d3a72cdb31aa7a57b48ba0ace65d8419 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 7 Jul 2026 15:08:33 +0900 Subject: [PATCH] =?UTF-8?q?260707=5F01=5FENH:=20=EC=B6=9C=EB=B0=9C=20?= =?UTF-8?q?=EB=8F=84=EC=B0=A9=20=EC=82=AD=EC=A0=9C=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- .../back/common/consts/GwcfConstant.java | 8 +++++ .../back/common/enums/SystemEventType.java | 1 + .../controller/MonitoringVisitController.java | 20 +++++++++++ .../PerformanceMonitoringVisitRepository.java | 5 +++ .../PerformanceReviewRepository.java | 7 ++++ .../review/back/service/VisitService.java | 36 ++++++++++++++++--- .../service/common/SystemEventLogService.java | 20 +++++++++++ 8 files changed, 94 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 37b3d2c..d967e00 100644 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ repositories { } } dependencies { - implementation "com.kri.common:starter:beta.1.1.29" + implementation "com.kri.common:starter:beta.1.1.33" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' diff --git a/src/main/java/com/kri/gwcf/review/back/common/consts/GwcfConstant.java b/src/main/java/com/kri/gwcf/review/back/common/consts/GwcfConstant.java index 7c57214..33ecd99 100644 --- a/src/main/java/com/kri/gwcf/review/back/common/consts/GwcfConstant.java +++ b/src/main/java/com/kri/gwcf/review/back/common/consts/GwcfConstant.java @@ -11,6 +11,14 @@ public final class GwcfConstant { public static final Integer MONITORING_USER_ROLE = 9003; public static final Short REJECT_ASSIGN_ORDER = 9999; + public static final Integer MONITORING_REVIEW_TYPE = 1; + public static final Integer MONITORING_VISIT_DEPARTURE_STATUS = 2; + public static final Integer MONITORING_VISIT_ARRIVAL_STATUS = 3; + public static final List REVIEW_TYPE = List.of(1, 3); public static final List REVIEW_CLASSIFICATION = List.of(1, 5, 99); + public static final List MONITORING_VISIT_RESETTABLE_REVIEW_STATUS = List.of( + MONITORING_VISIT_DEPARTURE_STATUS, + MONITORING_VISIT_ARRIVAL_STATUS + ); } 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 a2c7a78..7d40e42 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 @@ -32,6 +32,7 @@ public enum SystemEventType implements CodeEnum { VISIT_START((short) 2011), //모니터링 출발 VISIT_END((short) 2012), //모니터링 도착 + VISIT_RESET((short) 2099), //모니터링 출발.도착 초기화 UPLOAD_MONITORING_REVIEW((short) 2041), //모니터링 결과보고서 업로드 UPLOAD_LOCAL_GOV_REVIEW((short) 2042), //지자체 결과보고서 업로드 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 57276ad..b38cbeb 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 @@ -16,6 +16,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -79,6 +80,25 @@ public class MonitoringVisitController { return visitService.findEvidence(performanceId, userId); } + @Operation(summary = "모니터링 방문 초기화") + @DeleteMapping("/reset/{performanceId}/{userId}") + public void reset( + @PathVariable Integer performanceId, + @PathVariable String userId, + RequestUserContext ctx + ) { + LocalDateTime now = DateTimeUtil.nowKstLocalDateTime(); + visitService.reset(performanceId, userId); + + systemEventLogService.writeVisitResetLog( + ctx.getUserId(), + now, + ctx.getClientIp(), + performanceId, + userId + ); + } + @Operation(summary = "증빙 사진 ZIP 다운로드") @GetMapping("/evidence/zip/{performanceId}/{userId}") public ResponseEntity downloadEvidenceZip( 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 67e6128..b4a2c45 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 @@ -16,4 +16,9 @@ public interface PerformanceMonitoringVisitRepository extends JpaRepository findByIdPerformanceIdAndIdReviewTypeAndIdRegUserAndReviewStatusIn( + Integer performanceId, + Integer reviewType, + String regUser, + List reviewStatuses + ); + boolean existsByIdPerformanceIdAndIdReviewTypeAndIdRegUser( Integer performanceId, Integer reviewType, 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 e0575c2..f8db0f1 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,12 +1,19 @@ package com.kri.gwcf.review.back.service; +import static com.kri.gwcf.review.back.common.consts.GwcfConstant.MONITORING_REVIEW_TYPE; +import static com.kri.gwcf.review.back.common.consts.GwcfConstant.MONITORING_VISIT_ARRIVAL_STATUS; +import static com.kri.gwcf.review.back.common.consts.GwcfConstant.MONITORING_VISIT_DEPARTURE_STATUS; +import static com.kri.gwcf.review.back.common.consts.GwcfConstant.MONITORING_VISIT_RESETTABLE_REVIEW_STATUS; + 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.entity.TPerformanceReviewEntity; import com.kri.gwcf.review.back.persistence.repository.PerformanceMonitoringVisitRepository; +import com.kri.gwcf.review.back.persistence.repository.PerformanceReviewRepository; import com.kri.gwcf.review.back.service.file.AbstractFileService; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile; public class VisitService extends AbstractFileService { private final PerformanceMonitoringVisitRepository performanceMonitoringVisitRepository; + private final PerformanceReviewRepository performanceReviewRepository; private final FileStorageProperties fileStorageProperties; private final ReviewService reviewService; @@ -65,13 +73,13 @@ public class VisitService extends AbstractFileService { //validateGps(gps); TPerformanceMonitoringVisitEntity entity = saveVisit( performanceId, - 2, + MONITORING_VISIT_DEPARTURE_STATUS, "", gps, regUser, regDt ); - reviewService.saveMonitoringReviewStatus(performanceId, 2, regUser, regDt); + reviewService.saveMonitoringReviewStatus(performanceId, MONITORING_VISIT_DEPARTURE_STATUS, regUser, regDt); return PerformanceMonitoringVisitDto.from(entity); } @@ -88,16 +96,36 @@ public class VisitService extends AbstractFileService { TPerformanceMonitoringVisitEntity entity = saveVisit( performanceId, - 3, + MONITORING_VISIT_ARRIVAL_STATUS, evidenceImg, gps, regUser, regDt ); - reviewService.saveMonitoringReviewStatus(performanceId, 3, regUser, regDt); + reviewService.saveMonitoringReviewStatus(performanceId, MONITORING_VISIT_ARRIVAL_STATUS, regUser, regDt); return PerformanceMonitoringVisitDto.from(entity); } + @Transactional + public void reset(Integer performanceId, String userId) { + TPerformanceReviewEntity review = performanceReviewRepository + .findByIdPerformanceIdAndIdReviewTypeAndIdRegUserAndReviewStatusIn( + performanceId, + MONITORING_REVIEW_TYPE, + userId, + MONITORING_VISIT_RESETTABLE_REVIEW_STATUS + ) + .orElseThrow(() -> BusinessException.badRequest( + "MONITORING_VISIT_RESET_NOT_ALLOWED", + "출발 또는 도착 상태의 모니터링 방문만 초기화할 수 있습니다." + ) + .with("performanceId", performanceId) + .with("userId", userId)); + + performanceMonitoringVisitRepository.deleteByPerformanceIdAndRegUser(performanceId, userId); + performanceReviewRepository.delete(review); + } + public List findEvidence(Integer performanceId, String userId) { return performanceMonitoringVisitRepository.findByPerformanceIdAndRegUser(performanceId, userId) .stream() 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 4148182..407711e 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 @@ -175,6 +175,26 @@ public class SystemEventLogService { ); } + public void writeVisitResetLog( + String regId, + LocalDateTime regDt, + String clientIp, + Integer performanceId, + String userId + ) { + saveLog( + SystemEventType.VISIT_RESET, + "Visit Reset", + regId, + regDt, + clientIp, + Map.of( + "performanceId", performanceId, + "userId", userId + ) + ); + } + public void writeStartWrittenReviewLog( String regId, LocalDateTime regDt, -- 2.49.0.windows.1