Merge pull request '학습관리 수정' (#136) from feat/dev_251201 into develop

Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/136
2026-01-05 10:18:47 +09:00
parent 34bbadc04a 6a77d0f447
commit a4471b186f
9 changed files with 289 additions and 85 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java
@@ -1,6 +1,7 @@
 package com.kamco.cd.kamcoback.postgres.core;

 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
@@ -20,13 +21,17 @@ public class LabelAllocateCoreService {

  private final LabelAllocateRepository labelAllocateRepository;

-  public List<Long> fetchNextIds(
+  public List<AllocateInfoDto> fetchNextIds(
      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
    return labelAllocateRepository.fetchNextIds(lastId, batchSize, compareYyyy, targetYyyy, stage);
  }

  public void assignOwner(
-      List<Long> ids, String userId, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+      List<AllocateInfoDto> ids,
+      String userId,
+      Integer compareYyyy,
+      Integer targetYyyy,
+      Integer stage) {
    labelAllocateRepository.assignOwner(ids, userId, compareYyyy, targetYyyy, stage);
  }

--- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalInferenceEntity.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalInferenceEntity.java
@@ -0,0 +1,152 @@
+package com.kamco.cd.kamcoback.postgres.entity;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Size;
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import lombok.Getter;
+import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
+
+@Getter
+@Setter
+@Entity
+@Table(name = "tb_map_sheet_anal_inference")
+public class MapSheetAnalInferenceEntity {
+
+  @Id
+  @GeneratedValue(
+      strategy = GenerationType.SEQUENCE,
+      generator = "tb_map_sheet_anal_inference_id_gen")
+  @SequenceGenerator(
+      name = "tb_map_sheet_anal_inference_id_gen",
+      sequenceName = "tb_map_sheet_anal_inference_uid",
+      allocationSize = 1)
+  @Column(name = "anal_uid", nullable = false)
+  private Long id;
+
+  @Column(name = "compare_yyyy")
+  private Integer compareYyyy;
+
+  @Column(name = "target_yyyy")
+  private Integer targetYyyy;
+
+  @Column(name = "model_uid")
+  private Long modelUid;
+
+  @Size(max = 100)
+  @Column(name = "server_ids", length = 100)
+  private String serverIds;
+
+  @Column(name = "anal_strt_dttm")
+  private ZonedDateTime analStrtDttm;
+
+  @Column(name = "anal_end_dttm")
+  private ZonedDateTime analEndDttm;
+
+  @Column(name = "anal_sec")
+  private Long analSec;
+
+  @Size(max = 20)
+  @Column(name = "anal_state", length = 20)
+  private String analState;
+
+  @Size(max = 20)
+  @Column(name = "gukyuin_used", length = 20)
+  private String gukyuinUsed;
+
+  @Column(name = "accuracy")
+  private Double accuracy;
+
+  @Size(max = 255)
+  @Column(name = "result_url")
+  private String resultUrl;
+
+  @ColumnDefault("now()")
+  @Column(name = "created_dttm")
+  private ZonedDateTime createdDttm;
+
+  @Column(name = "created_uid")
+  private Long createdUid;
+
+  @ColumnDefault("now()")
+  @Column(name = "updated_dttm")
+  private ZonedDateTime updatedDttm;
+
+  @Column(name = "updated_uid")
+  private Long updatedUid;
+
+  @Size(max = 255)
+  @Column(name = "anal_title")
+  private String analTitle;
+
+  @Column(name = "detecting_cnt")
+  private Long detectingCnt;
+
+  @Column(name = "anal_pred_sec")
+  private Long analPredSec;
+
+  @Column(name = "model_ver_uid")
+  private Long modelVerUid;
+
+  @Column(name = "hyper_params")
+  @JdbcTypeCode(SqlTypes.JSON)
+  private Map<String, Object> hyperParams;
+
+  @Column(name = "tranning_rate")
+  private List<Double> tranningRate;
+
+  @Column(name = "validation_rate")
+  private List<Double> validationRate;
+
+  @Column(name = "test_rate", length = Integer.MAX_VALUE)
+  private String testRate;
+
+  @Size(max = 128)
+  @Column(name = "detecting_description", length = 128)
+  private String detectingDescription;
+
+  @Size(max = 12)
+  @Column(name = "base_map_sheet_num", length = 12)
+  private String baseMapSheetNum;
+
+  @ColumnDefault("gen_random_uuid()")
+  @Column(name = "uuid")
+  private UUID uuid;
+
+  @Size(max = 50)
+  @Column(name = "model_m1_ver", length = 50)
+  private String modelM1Ver;
+
+  @Size(max = 50)
+  @Column(name = "model_m2_ver", length = 50)
+  private String modelM2Ver;
+
+  @Size(max = 50)
+  @Column(name = "model_m3_ver", length = 50)
+  private String modelM3Ver;
+
+  @Size(max = 20)
+  @Column(name = "anal_target_type", length = 20)
+  private String analTargetType;
+
+  @Column(name = "gukyuin_apply_dttm")
+  private ZonedDateTime gukyuinApplyDttm;
+
+  @Size(max = 20)
+  @Column(name = "detection_data_option", length = 20)
+  private String detectionDataOption;
+
+  @Column(name = "stage")
+  private Integer stage;
+}
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/InferenceResultRepositoryImpl.java
@@ -36,23 +36,18 @@ public class InferenceResultRepositoryImpl implements InferenceResultRepositoryC
    String sql =
        """
        INSERT INTO tb_map_sheet_anal_inference (
-            compare_yyyy,
-            target_yyyy,
-            anal_map_sheet,
-            stage,
-            anal_title
-        )
-        SELECT
-                    r.input1 AS compare_yyyy,
-                    r.input2 AS target_yyyy,
-                    r.map_id AS anal_map_sheet,
-                    r.stage,
-                    CONCAT(r.stage ,'_', r.input1 ,'_', r.input2 ,'_', r.map_id) as anal_title
-                FROM inference_results r
-                GROUP BY r.stage, r.input1, r.input2, r.map_id
-        ON CONFLICT (compare_yyyy, target_yyyy, anal_map_sheet, stage)
-        DO UPDATE SET
-            updated_dttm  = now()
+                   compare_yyyy,
+                   target_yyyy,
+                   stage,
+                   anal_title
+               )
+               SELECT
+                   r.input1 AS compare_yyyy,
+                   r.input2 AS target_yyyy,
+                   r.stage,
+                   CONCAT(r.stage ,'_', r.input1 ,'_', r.input2) AS anal_title
+               FROM inference_results r
+               GROUP BY r.stage, r.input1, r.input2;
        """;

    return em.createNativeQuery(sql).executeUpdate();
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java
@@ -1,5 +1,6 @@
 package com.kamco.cd.kamcoback.postgres.repository.label;

+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
@@ -12,11 +13,15 @@ import java.util.UUID;

 public interface LabelAllocateRepositoryCustom {

-  List<Long> fetchNextIds(
+  List<AllocateInfoDto> fetchNextIds(
      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage);

  void assignOwner(
-      List<Long> ids, String userId, Integer compareYyyy, Integer targetYyyy, Integer stage);
+      List<AllocateInfoDto> ids,
+      String userId,
+      Integer compareYyyy,
+      Integer targetYyyy,
+      Integer stage);

  List<LabelingAssignmentEntity> findAssignedLabelerList(
      Integer compareYyyy, Integer targetYyyy, Integer stage);
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
@@ -7,6 +7,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalEntity.mapShee
 import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity;

 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto;
+import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.AllocateInfoDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InspectState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
@@ -17,6 +18,7 @@ import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalDataInferenceEntity;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetAnalEntity;
+import com.kamco.cd.kamcoback.postgres.entity.QMemberEntity;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.CaseBuilder;
@@ -49,11 +51,15 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
  @PersistenceContext private EntityManager em;

  @Override
-  public List<Long> fetchNextIds(
+  public List<AllocateInfoDto> fetchNextIds(
      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {

    return queryFactory
-        .select(mapSheetAnalDataInferenceGeomEntity.geoUid)
+        .select(
+            Projections.constructor(
+                AllocateInfoDto.class,
+                mapSheetAnalDataInferenceGeomEntity.geoUid,
+                mapSheetAnalDataInferenceGeomEntity.mapSheetNum))
        .from(mapSheetAnalDataInferenceGeomEntity)
        .where(
            lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
@@ -68,7 +74,11 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

  @Override
  public void assignOwner(
-      List<Long> ids, String userId, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+      List<AllocateInfoDto> ids,
+      String userId,
+      Integer compareYyyy,
+      Integer targetYyyy,
+      Integer stage) {

    // analUid로 분석 정보 조회
    MapSheetAnalDataInferenceEntity analEntity =
@@ -87,13 +97,16 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
    }

    // data_geom 테이블에 label state 를 ASSIGNED 로 update
+    List<Long> geoUidList =
+        ids.stream().map(AllocateInfoDto::getGeoUid).filter(Objects::nonNull).toList();
+
    queryFactory
        .update(mapSheetAnalDataInferenceGeomEntity)
        .set(mapSheetAnalDataInferenceGeomEntity.labelState, LabelState.ASSIGNED.getId())
        .set(mapSheetAnalDataInferenceGeomEntity.labelStateDttm, ZonedDateTime.now())
        .set(mapSheetAnalDataInferenceGeomEntity.testState, InspectState.UNCONFIRM.getId())
        .set(mapSheetAnalDataInferenceGeomEntity.testStateDttm, ZonedDateTime.now())
-        .where(mapSheetAnalDataInferenceGeomEntity.geoUid.in(ids))
+        .where(mapSheetAnalDataInferenceGeomEntity.geoUid.in(geoUidList))
        .execute();

    // 라벨러 할당 테이블에 insert
@@ -105,13 +118,13 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
        values (?, ?, ?, ?, ?, ?)
        """;

-    for (Long geoUid : ids) {
+    for (AllocateInfoDto info : ids) {
      em.createNativeQuery(sql)
          .setParameter(1, UUID.randomUUID())
-          .setParameter(2, geoUid)
+          .setParameter(2, info.getGeoUid())
          .setParameter(3, userId)
          .setParameter(4, LabelState.ASSIGNED.getId())
-          .setParameter(5, "")
+          .setParameter(5, info.getMapSheetNum())
          .setParameter(6, analEntity.getAnalUid())
          .executeUpdate();
    }
@@ -572,24 +585,32 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
      throw new EntityNotFoundException("MapSheetAnalEntity not found for analUid: ");
    }

+    QMemberEntity worker = QMemberEntity.memberEntity;
+    QMemberEntity inspector = new QMemberEntity("inspector");
+
    return queryFactory
        .select(
            Projections.constructor(
                LabelerDetail.class,
-                memberEntity.userRole,
-                memberEntity.name,
-                memberEntity.employeeNo,
+                worker.userRole,
+                worker.name,
+                worker.employeeNo,
                assignedCnt,
                skipCnt,
                completeCnt,
-                percent))
-        .from(memberEntity)
+                percent,
+                Expressions.constant(0), // TODO: 순위, 꼭 해야할지?
+                labelingAssignmentEntity.createdDate.min(),
+                inspector.name.min()))
+        .from(worker)
        .innerJoin(labelingAssignmentEntity)
        .on(
-            memberEntity.employeeNo.eq(labelingAssignmentEntity.workerUid),
+            worker.employeeNo.eq(labelingAssignmentEntity.workerUid),
            labelingAssignmentEntity.analUid.eq(analEntity.getAnalUid()))
-        .where(memberEntity.employeeNo.eq(userId))
-        .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.employeeNo)
+        .leftJoin(inspector)
+        .on(labelingAssignmentEntity.inspectorUid.eq(inspector.employeeNo))
+        .where(worker.employeeNo.eq(userId))
+        .groupBy(worker.userRole, worker.name, worker.employeeNo)
        .fetchOne();
  }
 }