[KC-103] spot less 적용

2026-01-14 15:24:45 +09:00
parent d417972a5a
commit 1ae69e5665
4 changed files with 161 additions and 186 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java
@@ -23,9 +23,7 @@ import org.springframework.data.domain.Pageable;

 public class InferenceResultDto {

-  /**
-   * 목록조회 dto
-   */
+  /** 목록조회 dto */
  @Getter
  @Setter
  @AllArgsConstructor
@@ -37,15 +35,11 @@ public class InferenceResultDto {
    private String status;
    private String mapSheetCnt;
    private Long detectingCnt;
-    @JsonFormatDttm
-    private ZonedDateTime startTime;
-    @JsonFormatDttm
-    private ZonedDateTime endTime;
-    @JsonFormatDttm
-    private ZonedDateTime elapsedTime;
+    @JsonFormatDttm private ZonedDateTime startTime;
+    @JsonFormatDttm private ZonedDateTime endTime;
+    @JsonFormatDttm private ZonedDateTime elapsedTime;
    private Boolean applyYn;
-    @JsonFormatDttm
-    private ZonedDateTime applyDttm;
+    @JsonFormatDttm private ZonedDateTime applyDttm;

    @JsonProperty("statusName")
    public String statusName() {
@@ -53,9 +47,7 @@ public class InferenceResultDto {
    }
  }

-  /**
-   * 목록조회 검색 조건 dto
-   */
+  /** 목록조회 검색 조건 dto */
  @Getter
  @Setter
  @NoArgsConstructor
@@ -77,9 +69,7 @@ public class InferenceResultDto {
    }
  }

-  /**
-   * 탐지 데이터 옵션 dto
-   */
+  /** 탐지 데이터 옵션 dto */
  @Getter
  @AllArgsConstructor
  public enum MapSheetScope implements EnumType {
@@ -100,9 +90,7 @@ public class InferenceResultDto {
    }
  }

-  /**
-   * 분석대상 도엽 enum
-   */
+  /** 분석대상 도엽 enum */
  @Getter
  @AllArgsConstructor
  public enum DetectOption implements EnumType {
@@ -150,9 +138,7 @@ public class InferenceResultDto {
    }
  }

-  /**
-   * 변화탐지 실행 정보 저장 요청 정보
-   */
+  /** 변화탐지 실행 정보 저장 요청 정보 */
  @Getter
  @Setter
  @NoArgsConstructor
@@ -219,25 +205,17 @@ public class InferenceResultDto {
    private Integer targetYyyy;
    private String detectOption;
    private String mapSheetScope;
-    @JsonFormatDttm
-    private ZonedDateTime inferStartDttm;
-    @JsonFormatDttm
-    private ZonedDateTime inferEndDttm;
+    @JsonFormatDttm private ZonedDateTime inferStartDttm;
+    @JsonFormatDttm private ZonedDateTime inferEndDttm;
    private Long detectingCnt = 0L;
    private Long detectingEndCnt = 0L;

-    @JsonFormatDttm
-    private ZonedDateTime m1ModelStartDttm;
-    @JsonFormatDttm
-    private ZonedDateTime m1ModelEndDttm;
-    @JsonFormatDttm
-    private ZonedDateTime m2ModelStartDttm;
-    @JsonFormatDttm
-    private ZonedDateTime m2ModelEndDttm;
-    @JsonFormatDttm
-    private ZonedDateTime m3ModelStartDttm;
-    @JsonFormatDttm
-    private ZonedDateTime m3ModelEndDttm;
+    @JsonFormatDttm private ZonedDateTime m1ModelStartDttm;
+    @JsonFormatDttm private ZonedDateTime m1ModelEndDttm;
+    @JsonFormatDttm private ZonedDateTime m2ModelStartDttm;
+    @JsonFormatDttm private ZonedDateTime m2ModelEndDttm;
+    @JsonFormatDttm private ZonedDateTime m3ModelStartDttm;
+    @JsonFormatDttm private ZonedDateTime m3ModelEndDttm;

    private String model1Ver;
    private String model2Ver;
@@ -364,12 +342,9 @@ public class InferenceResultDto {
  public static class InferenceServerStatusDto {

    private String serverName;
-    @JsonIgnore
-    private float cpu_user;
-    @JsonIgnore
-    private float cpu_system;
-    @JsonIgnore
-    private float memused;
+    @JsonIgnore private float cpu_user;
+    @JsonIgnore private float cpu_system;
+    @JsonIgnore private float memused;
    private Long kbmemused;
    private float gpuUtil;

--- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
@@ -305,8 +305,7 @@ public class InferenceResultService {
    // 4) 응답 파싱
    try {
      List<Map<String, Object>> list =
-        objectMapper.readValue(result.body(), new TypeReference<>() {
-        });
+          objectMapper.readValue(result.body(), new TypeReference<>() {});

      if (list.isEmpty()) {
        throw new IllegalStateException("Inference response is empty");
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java
@@ -243,7 +243,8 @@ public class InferenceResultCoreService {
   */
  public void update(SaveInferenceAiDto request) {
    MapSheetLearnEntity entity =
-      mapSheetLearnRepository.getInferenceResultByUuid(request.getUuid())
+        mapSheetLearnRepository
+            .getInferenceResultByUuid(request.getUuid())
            .orElseThrow(EntityNotFoundException::new);

    // M1/M2/M3 영역 업데이트
@@ -266,7 +267,8 @@ public class InferenceResultCoreService {

  private void applyModelUpdate(MapSheetLearnEntity entity, SaveInferenceAiDto request) {
    switch (request.getType()) {
-      case "M1" -> applyModelFields(
+      case "M1" ->
+          applyModelFields(
              request,
              entity::setM1ModelBatchId,
              entity::setM1ModelStartDttm,
@@ -274,9 +276,9 @@ public class InferenceResultCoreService {
              entity::setM1PendingJobs,
              entity::setM1RunningJobs,
              entity::setM1CompletedJobs,
-        entity::setM1FailedJobs
-      );
-      case "M2" -> applyModelFields(
+              entity::setM1FailedJobs);
+      case "M2" ->
+          applyModelFields(
              request,
              entity::setM2ModelBatchId,
              entity::setM2ModelStartDttm,
@@ -284,9 +286,9 @@ public class InferenceResultCoreService {
              entity::setM2PendingJobs,
              entity::setM2RunningJobs,
              entity::setM2CompletedJobs,
-        entity::setM2FailedJobs
-      );
-      case "M3" -> applyModelFields(
+              entity::setM2FailedJobs);
+      case "M3" ->
+          applyModelFields(
              request,
              entity::setM3ModelBatchId,
              entity::setM3ModelStartDttm,
@@ -294,8 +296,7 @@ public class InferenceResultCoreService {
              entity::setM3PendingJobs,
              entity::setM3RunningJobs,
              entity::setM3CompletedJobs,
-        entity::setM3FailedJobs
-      );
+              entity::setM3FailedJobs);
      default -> throw new IllegalArgumentException("Unknown type: " + request.getType());
    }
  }
@@ -308,8 +309,7 @@ public class InferenceResultCoreService {
      Consumer<Integer> setPending,
      Consumer<Integer> setRunning,
      Consumer<Integer> setCompleted,
-    Consumer<Integer> setFailed
-  ) {
+      Consumer<Integer> setFailed) {
    applyIfNotNull(request.getBatchId(), setBatchId);
    applyIfNotNull(request.getModelStartDttm(), setStart);
    applyIfNotNull(request.getModelEndDttm(), setEnd);
--- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java
@@ -47,9 +47,7 @@ public class MapSheetInferenceJobService {
  @Value("${inference.url}")
  private String inferenceUrl;

-  /**
-   * 추론 진행 배치 1분
-   */
+  /** 추론 진행 배치 1분 */
  @Scheduled(fixedDelay = 60_000)
  @Transactional
  public void runBatch() {
@@ -271,18 +269,23 @@ public class MapSheetInferenceJobService {
    // ai 에 맞는 모델 명으로 변경
    String inferenceType = modelToInferenceType(type);

-    InferenceSendDto.pred_requests_areas predRequestsAreas = new InferenceSendDto.pred_requests_areas();
+    InferenceSendDto.pred_requests_areas predRequestsAreas =
+        new InferenceSendDto.pred_requests_areas();
    predRequestsAreas.setInput1_year(progressDto.getPred_requests_areas().getInput1_year());
    predRequestsAreas.setInput2_year(progressDto.getPred_requests_areas().getInput2_year());
-    predRequestsAreas.setInput1_scene_path(progressDto.getPred_requests_areas().getInput1_scene_path());
-    predRequestsAreas.setInput2_scene_path(progressDto.getPred_requests_areas().getInput2_scene_path());
+    predRequestsAreas.setInput1_scene_path(
+        progressDto.getPred_requests_areas().getInput1_scene_path());
+    predRequestsAreas.setInput2_scene_path(
+        progressDto.getPred_requests_areas().getInput2_scene_path());

    InferenceSendDto m = new InferenceSendDto();
    m.setPred_requests_areas(predRequestsAreas);
    m.setModel_version(progressDto.getModelVersion());
    m.setCd_model_path(progressDto.getCdModelPath() + "/" + progressDto.getCdModelFileName());
-    m.setCd_model_config(progressDto.getCdModelConfigPath() + "/" + progressDto.getCdModelConfigFileName());
-    m.setCls_model_path(progressDto.getCdModelClsPath() + "/" + progressDto.getCdModelClsFileName());
+    m.setCd_model_config(
+        progressDto.getCdModelConfigPath() + "/" + progressDto.getCdModelConfigFileName());
+    m.setCls_model_path(
+        progressDto.getCdModelClsPath() + "/" + progressDto.getCdModelClsFileName());
    m.setCls_model_version(progressDto.getClsModelVersion());
    m.setCd_model_type(inferenceType);
    m.setPriority(progressDto.getPriority());
@@ -363,8 +366,7 @@ public class MapSheetInferenceJobService {
    // 4) 응답 파싱
    try {
      List<Map<String, Object>> list =
-        objectMapper.readValue(result.body(), new TypeReference<>() {
-        });
+          objectMapper.readValue(result.body(), new TypeReference<>() {});

      if (list.isEmpty()) {
        throw new IllegalStateException("Inference response is empty");
@@ -392,10 +394,9 @@ public class MapSheetInferenceJobService {
    return "local".equalsIgnoreCase(profile);
  }

-  /**
-   * 모델별 추론 종료 update
-   */
-  private void updateProcessingEndTimeByModel(JobStatusDto dto, UUID uuid, ZonedDateTime dateTime, String type) {
+  /** 모델별 추론 종료 update */
+  private void updateProcessingEndTimeByModel(
+      JobStatusDto dto, UUID uuid, ZonedDateTime dateTime, String type) {
    SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
    saveInferenceAiDto.setUuid(uuid);
    saveInferenceAiDto.setUpdateUid(0L);