Merge branch 'feat/infer_dev_260107' of https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107

# Conflicts: # src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java
2026-01-12 22:35:39 +09:00
parent d5a36cb381 502ec621cb
commit ee7101de8c
9 changed files with 411 additions and 231 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java
@@ -29,20 +29,22 @@ public class InferenceDetailDto {
    private String dataName;
    private Long mapSheepNum;
    private Long detectingCnt;
-    @JsonFormatDttm private ZonedDateTime analStrtDttm;
-    @JsonFormatDttm private ZonedDateTime analEndDttm;
+    @JsonFormatDttm
+    private ZonedDateTime analStrtDttm;
+    @JsonFormatDttm
+    private ZonedDateTime analEndDttm;
    private Long analSec;
    private String analState;

    public Basic(
-        Long id,
-        String dataName,
-        Long mapSheepNum,
-        Long detectingCnt,
-        ZonedDateTime analStrtDttm,
-        ZonedDateTime analEndDttm,
-        Long analSec,
-        String analState) {
+      Long id,
+      String dataName,
+      Long mapSheepNum,
+      Long detectingCnt,
+      ZonedDateTime analStrtDttm,
+      ZonedDateTime analEndDttm,
+      Long analSec,
+      String analState) {
      this.id = id;
      this.dataName = dataName;
      this.mapSheepNum = mapSheepNum;
@@ -61,8 +63,10 @@ public class InferenceDetailDto {
    private Long id;
    private String analTitle;
    private Long detectingCnt;
-    @JsonFormatDttm private ZonedDateTime analStrtDttm;
-    @JsonFormatDttm private ZonedDateTime analEndDttm;
+    @JsonFormatDttm
+    private ZonedDateTime analStrtDttm;
+    @JsonFormatDttm
+    private ZonedDateTime analEndDttm;
    private Long analSec;
    private Long analPredSec;
    private String analState;
@@ -70,16 +74,16 @@ public class InferenceDetailDto {
    private String gukyuinUsed;

    public AnalResList(
-        Long id,
-        String analTitle,
-        Long detectingCnt,
-        ZonedDateTime analStrtDttm,
-        ZonedDateTime analEndDttm,
-        Long analSec,
-        Long analPredSec,
-        String analState,
-        String analStateNm,
-        String gukyuinUsed) {
+      Long id,
+      String analTitle,
+      Long detectingCnt,
+      ZonedDateTime analStrtDttm,
+      ZonedDateTime analEndDttm,
+      Long analSec,
+      Long analPredSec,
+      String analState,
+      String analStateNm,
+      String gukyuinUsed) {
      this.id = id;
      this.analTitle = analTitle;
      this.detectingCnt = detectingCnt;
@@ -102,8 +106,10 @@ public class InferenceDetailDto {
    private String modelInfo;
    private Integer targetYyyy;
    private Integer compareYyyy;
-    @JsonFormatDttm private ZonedDateTime analStrtDttm;
-    @JsonFormatDttm private ZonedDateTime analEndDttm;
+    @JsonFormatDttm
+    private ZonedDateTime analStrtDttm;
+    @JsonFormatDttm
+    private ZonedDateTime analEndDttm;
    private Long analSec;
    private Long analPredSec;
    private String resultUrl;
@@ -113,20 +119,20 @@ public class InferenceDetailDto {
    private String analStateNm;

    public AnalResSummary(
-        Long id,
-        String analTitle,
-        String modelInfo,
-        Integer targetYyyy,
-        Integer compareYyyy,
-        ZonedDateTime analStrtDttm,
-        ZonedDateTime analEndDttm,
-        Long analSec,
-        Long analPredSec,
-        String resultUrl,
-        Long detectingCnt,
-        Double accuracy,
-        String analState,
-        String analStateNm) {
+      Long id,
+      String analTitle,
+      String modelInfo,
+      Integer targetYyyy,
+      Integer compareYyyy,
+      ZonedDateTime analStrtDttm,
+      ZonedDateTime analEndDttm,
+      Long analSec,
+      Long analPredSec,
+      String resultUrl,
+      Long detectingCnt,
+      Double accuracy,
+      String analState,
+      String analStateNm) {
      this.id = id;
      this.analTitle = analTitle;
      this.modelInfo = modelInfo;
@@ -183,16 +189,17 @@ public class InferenceDetailDto {
    private Clazzes target;
    private MapSheet mapSheet;
    private Coordinate center;
-    @JsonFormatDttm private ZonedDateTime updatedDttm;
+    @JsonFormatDttm
+    private ZonedDateTime updatedDttm;

    public DetailListEntity(
-        UUID uuid,
-        Double detectionScore,
-        Clazzes compare,
-        Clazzes target,
-        MapSheet mapSheet,
-        Coordinate center,
-        ZonedDateTime updatedDttm) {
+      UUID uuid,
+      Double detectionScore,
+      Clazzes compare,
+      Clazzes target,
+      MapSheet mapSheet,
+      Coordinate center,
+      ZonedDateTime updatedDttm) {
      this.code = new Uid(uuid);
      this.detectionScore = detectionScore;
      this.compare = compare;
@@ -233,7 +240,8 @@ public class InferenceDetailDto {

    private String code;
    private String name;
-    @JsonIgnore private Double score;
+    @JsonIgnore
+    private Double score;

    public Clazz(String code, Double score) {
      this.code = code;
@@ -300,21 +308,23 @@ public class InferenceDetailDto {
    String classAfterName;
    Double classAfterProb;
    Long mapSheetNum;
-    @JsonIgnore String gemoStr;
-    @JsonIgnore String geomCenterStr;
+    @JsonIgnore
+    String gemoStr;
+    @JsonIgnore
+    String geomCenterStr;
    JsonNode gemo;
    JsonNode geomCenter;

    public Geom(
-        Integer compareYyyy,
-        Integer targetYyyy,
-        String classBeforeCd,
-        Double classBeforeProb,
-        String classAfterCd,
-        Double classAfterProb,
-        Long mapSheetNum,
-        String gemoStr,
-        String geomCenterStr) {
+      Integer compareYyyy,
+      Integer targetYyyy,
+      String classBeforeCd,
+      Double classBeforeProb,
+      String classAfterCd,
+      Double classAfterProb,
+      Long mapSheetNum,
+      String gemoStr,
+      String geomCenterStr) {
      this.compareYyyy = compareYyyy;
      this.targetYyyy = targetYyyy;
      this.classBeforeCd = classBeforeCd;
@@ -385,7 +395,7 @@ public class InferenceDetailDto {
        String[] sortParams = sort.split(",");
        String property = sortParams[0];
        Sort.Direction direction =
-            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
+          sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
        return PageRequest.of(page, size, Sort.by(direction, property));
      }
      return PageRequest.of(page, size);
@@ -399,10 +409,14 @@ public class InferenceDetailDto {
  public static class InferenceBatchSheet {

    private Long id;
+    private UUID uuid;
    private Long m1BatchId;
    private Long m2BatchId;
    private Long m3BatchId;
    private String status;
    private String runningModelType;
+    private UUID m1ModelUuid;
+    private UUID m2ModelUuid;
+    private UUID m3ModelUuid;
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceProgressDto.java
@@ -11,36 +11,36 @@ import lombok.Setter;
 public class InferenceProgressDto {

  private InferenceProgressDto.pred_requests_areas pred_requests_areas;
-  private String model1_version;
-  private String model2_version;
-  private String model3_version;
-  private String cd_model_path;
-  private String cd_model_config;
-  private String cls_model_path;
-  private String cls_model_version;
-  private String cd_model_type;
+  private String modelVersion;
+  private String cdModelPath;
+  private String cdModelFileName;
+  private String cdModelConfigPath;
+  private String cdModelConfigFileName;
+  private String cdModelClsPath;
+  private String cdModelClsFileName;
+  private String clsModelVersion;
  private Integer priority;

  public InferenceProgressDto(
-      InferenceProgressDto.pred_requests_areas pred_requests_areas,
-      String model1_version,
-      String model2_version,
-      String model3_version,
-      String cd_model_path,
-      String cd_model_config,
-      String cls_model_path,
-      String cls_model_version,
-      String cd_model_type,
-      Integer priority) {
+    InferenceProgressDto.pred_requests_areas pred_requests_areas,
+    String modelVersion,
+    String cdModelPath,
+    String cdModelFileName,
+    String cdModelConfigPath,
+    String cdModelConfigFileName,
+    String cdModelClsPath,
+    String cdModelClsFileName,
+    String clsModelVersion,
+    Integer priority) {
    this.pred_requests_areas = pred_requests_areas;
-    this.model1_version = model1_version;
-    this.model2_version = model2_version;
-    this.model3_version = model3_version;
-    this.cd_model_path = cd_model_path;
-    this.cd_model_config = cd_model_config;
-    this.cls_model_path = cls_model_path;
-    this.cls_model_version = cls_model_version;
-    this.cd_model_type = cd_model_type;
+    this.modelVersion = modelVersion;
+    this.cdModelPath = cdModelPath;
+    this.cdModelFileName = cdModelFileName;
+    this.cdModelConfigPath = cdModelConfigPath;
+    this.cdModelConfigFileName = cdModelConfigFileName;
+    this.cdModelClsPath = cdModelClsPath;
+    this.cdModelClsFileName = cdModelClsFileName;
+    this.clsModelVersion = clsModelVersion;
    this.priority = priority;
  }

--- 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,7 +23,9 @@ import org.springframework.data.domain.Pageable;

 public class InferenceResultDto {

-  /** 목록조회 dto */
+  /**
+   * 목록조회 dto
+   */
  @Getter
  @Setter
  @AllArgsConstructor
@@ -35,11 +37,15 @@ 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() {
@@ -47,7 +53,9 @@ public class InferenceResultDto {
    }
  }

-  /** 목록조회 검색 조건 dto */
+  /**
+   * 목록조회 검색 조건 dto
+   */
  @Getter
  @Setter
  @NoArgsConstructor
@@ -201,6 +209,7 @@ public class InferenceResultDto {
  @NoArgsConstructor
  @AllArgsConstructor
  public static class InferenceStatusDetailDto {
+
    private String title;
    private Integer compareYyyy;
    private Integer targetYyyy;
@@ -337,9 +346,12 @@ 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;

@@ -444,7 +456,13 @@ public class InferenceResultDto {
    private String status;
    private String type;
    private ZonedDateTime inferStartDttm;
+    private ZonedDateTime inferEndDttm;
+    private Long detectEndCnt;
    private String modelComparePath;
    private String modelTargetPath;
+    private String modelModelPath;
+    private ZonedDateTime modelStartDttm;
+    private ZonedDateTime modelEndDttm;
+    private Long updateUid;
  }
 }
--- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java
@@ -96,7 +96,7 @@ public class InferenceResultService {

      // 기준년도 조회
      List<MngListDto> targetList =
-          mapSheetMngCoreService.getHstMapSheetList(req.getTargetYyyy(), mapTargetIds);
+        mapSheetMngCoreService.getHstMapSheetList(req.getTargetYyyy(), mapTargetIds);
      req.setMapSheetNum(this.createdMngDto(req, targetList));
    }

@@ -109,19 +109,19 @@ public class InferenceResultService {

  // 비교년도 탐지 제이터 옵션 별로 조회하여 req에 적용
  private List<MapSheetNumDto> createdMngDto(
-      InferenceResultDto.RegReq req, List<MngListDto> targetList) {
+    InferenceResultDto.RegReq req, List<MngListDto> targetList) {
    List<String> mapTargetIds = new ArrayList<>();

    targetList.forEach(
-        hstMapSheet -> {
-          // 비교년도는 target 년도 기준으로 가져옴 파라미터 만들기
-          mapTargetIds.add(hstMapSheet.getMapSheetNum());
-        });
+      hstMapSheet -> {
+        // 비교년도는 target 년도 기준으로 가져옴 파라미터 만들기
+        mapTargetIds.add(hstMapSheet.getMapSheetNum());
+      });

    // 비교년도 조회
    List<String> mapCompareIds = new ArrayList<>();
    List<MngListCompareDto> compareList =
-        mapSheetMngCoreService.getByHstMapSheetCompareList(req.getCompareYyyy(), mapTargetIds);
+      mapSheetMngCoreService.getByHstMapSheetCompareList(req.getCompareYyyy(), mapTargetIds);

    for (MngListCompareDto dto : compareList) {
      // 추론 제외일때 이전년도 파일이 없으면 제외
@@ -136,35 +136,35 @@ public class InferenceResultService {
    }

    Set<String> compareSet =
-        mapCompareIds.stream()
-            .filter(Objects::nonNull)
-            .map(String::trim) // 공백/개행 방지
-            .collect(Collectors.toSet());
+      mapCompareIds.stream()
+        .filter(Objects::nonNull)
+        .map(String::trim) // 공백/개행 방지
+        .collect(Collectors.toSet());

    // target 기준 compare 비교하여 서로 있는것만 저장
    List<String> commonIds =
-        mapTargetIds.stream()
-            .filter(Objects::nonNull)
-            .map(String::trim)
-            .filter(compareSet::contains)
-            .toList();
+      mapTargetIds.stream()
+        .filter(Objects::nonNull)
+        .map(String::trim)
+        .filter(compareSet::contains)
+        .toList();

    Set<String> commonIdSet =
-        commonIds.stream().filter(Objects::nonNull).map(String::trim).collect(Collectors.toSet());
+      commonIds.stream().filter(Objects::nonNull).map(String::trim).collect(Collectors.toSet());

    // 저장하기위해 파라미터 다시 구성
    List<MapSheetNumDto> mapSheetNum =
-        targetList.stream()
-            .filter(dto -> dto.getMapSheetNum() != null)
-            .filter(dto -> commonIdSet.contains(dto.getMapSheetNum().trim()))
-            .map(
-                dto -> {
-                  MapSheetNumDto mapSheetNumDto = new MapSheetNumDto();
-                  mapSheetNumDto.setMapSheetNum(dto.getMapSheetNum());
-                  mapSheetNumDto.setMapSheetName(dto.getMapSheetName());
-                  return mapSheetNumDto;
-                })
-            .toList();
+      targetList.stream()
+        .filter(dto -> dto.getMapSheetNum() != null)
+        .filter(dto -> commonIdSet.contains(dto.getMapSheetNum().trim()))
+        .map(
+          dto -> {
+            MapSheetNumDto mapSheetNumDto = new MapSheetNumDto();
+            mapSheetNumDto.setMapSheetNum(dto.getMapSheetNum());
+            mapSheetNumDto.setMapSheetName(dto.getMapSheetName());
+            return mapSheetNumDto;
+          })
+        .toList();

    return mapSheetNum;
  }
@@ -184,9 +184,9 @@ public class InferenceResultService {
    }

    String modelComparePath =
-        this.getSceneInference(String.valueOf(req.getCompareYyyy()), mapSheetNumList);
+      this.getSceneInference(String.valueOf(req.getCompareYyyy()), mapSheetNumList);
    String modelTargetPath =
-        this.getSceneInference(String.valueOf(req.getTargetYyyy()), mapSheetNumList);
+      this.getSceneInference(String.valueOf(req.getTargetYyyy()), mapSheetNumList);

    pred_requests_areas predRequestsAreas = new pred_requests_areas();
    predRequestsAreas.setInput1_year(req.getCompareYyyy());
@@ -212,6 +212,7 @@ public class InferenceResultService {
    saveInferenceAiDto.setInferStartDttm(ZonedDateTime.now());
    saveInferenceAiDto.setModelComparePath(modelComparePath);
    saveInferenceAiDto.setModelTargetPath(modelTargetPath);
+    saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
    inferenceResultCoreService.update(saveInferenceAiDto);
  }

@@ -240,7 +241,7 @@ public class InferenceResultService {
    }

    ExternalCallResult<String> result =
-        externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class);
+      externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class);

    int status = result.statusCode();
    String body = result.body();
@@ -253,7 +254,8 @@ public class InferenceResultService {

    try {
      List<Map<String, Object>> list =
-          om.readValue(body, new TypeReference<List<Map<String, Object>>>() {});
+        om.readValue(body, new TypeReference<List<Map<String, Object>>>() {
+        });

      Integer batchIdInt = (Integer) list.get(0).get("batch_id");
      batchId = batchIdInt.longValue();
@@ -352,7 +354,7 @@ public class InferenceResultService {
   * @return
   */
  public Page<InferenceDetailDto.Geom> getInferenceResultGeomList(
-      Long id, InferenceDetailDto.SearchGeoReq searchGeoReq) {
+    Long id, InferenceDetailDto.SearchGeoReq searchGeoReq) {
    return inferenceResultCoreService.getInferenceResultGeomList(id, searchGeoReq);
  }

@@ -363,7 +365,7 @@ public class InferenceResultService {
   * @return
   */
  public Page<InferenceDetailDto.DetailListEntity> listInferenceResultWithGeom(
-      @NotNull Long id, InferenceDetailDto.SearchGeoReq searchReq) {
+    @NotNull Long id, InferenceDetailDto.SearchGeoReq searchReq) {

    return inferenceResultCoreService.listInferenceResultWithGeom(id, searchReq);
  }
@@ -408,12 +410,15 @@ public class InferenceResultService {
  public InferenceStatusDetailDto getInferenceStatus(UUID uuid) {

    List<InferenceServerStatusDto> servers =
-        inferenceResultCoreService.getInferenceServerStatusList();
+      inferenceResultCoreService.getInferenceServerStatusList();

    String serverNames = "";
    for (InferenceServerStatusDto server : servers) {
-      if (serverNames.equals("")) serverNames = server.getServerName();
-      else serverNames = serverNames + "," + server.getServerName();
+      if (serverNames.equals("")) {
+        serverNames = server.getServerName();
+      } else {
+        serverNames = serverNames + "," + server.getServerName();
+      }
    }

    InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid);