추론 결과 조회 수정

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceDetailDto.java

@@ -29,10 +29,8 @@ 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;
 
@@ -63,10 +61,8 @@ 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;
@@ -106,10 +102,8 @@ 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;
@@ -189,8 +183,7 @@ public class InferenceDetailDto {
     private Clazzes target;
     private MapSheet mapSheet;
     private Coordinate center;
-    @JsonFormatDttm
-    private ZonedDateTime updatedDttm;
+    @JsonFormatDttm private ZonedDateTime updatedDttm;
 
     public DetailListEntity(
         UUID uuid,
@@ -240,8 +233,7 @@ 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;
@@ -436,10 +428,8 @@ public class InferenceDetailDto {
     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 Integer stage;
     private String elapsedDuration;
     private String subUid;

src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java

@@ -23,9 +23,7 @@ import org.springframework.data.domain.Pageable;
 
 public class InferenceResultDto {
 
-  /**
-   * 분석대상 도엽 enum
-   */
+  /** 분석대상 도엽 enum */
   @Getter
   @AllArgsConstructor
   public enum MapSheetScope implements EnumType {
@@ -54,9 +52,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
-   * 탐지 데이터 옵션 dto
-   */
+  /** 탐지 데이터 옵션 dto */
   @Getter
   @AllArgsConstructor
   public enum DetectOption implements EnumType {
@@ -133,9 +129,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
-   * 목록조회 dto
-   */
+  /** 목록조회 dto */
   @Schema(name = "ResultList", description = "추론관리 목록")
   @Getter
   @Setter
@@ -219,9 +213,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
-   * 목록조회 검색 조건 dto
-   */
+  /** 목록조회 검색 조건 dto */
   @Getter
   @Setter
   @NoArgsConstructor
@@ -243,9 +235,7 @@ public class InferenceResultDto {
     }
   }
 
-  /**
-   * 변화탐지 실행 정보 저장 요청 정보
-   */
+  /** 변화탐지 실행 정보 저장 요청 정보 */
   @Getter
   @Setter
   @NoArgsConstructor
@@ -529,12 +519,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;
 

src/main/java/com/kamco/cd/kamcoback/postgres/entity/PnuEntity.java

@@ -47,5 +47,4 @@ public class PnuEntity {
   @ColumnDefault("false")
   @Column(name = "del_yn")
   private Boolean delYn;
-
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearn5kRepositoryImpl.java

@@ -213,17 +213,17 @@ public class MapSheetLearn5kRepositoryImpl implements MapSheetLearn5kRepositoryC
     return queryFactory
         .select(mapInkx50kEntity.mapidNm.concat(mapInkx50kEntity.mapidcdNo))
         .from(mapInkx50kEntity)
-      .join(mapInkx5kEntity).on(mapInkx5kEntity.mapInkx50k.fid.eq(mapInkx50kEntity.fid))
+        .join(mapInkx5kEntity)
+        .on(mapInkx5kEntity.mapInkx50k.fid.eq(mapInkx50kEntity.fid))
         .where(
             mapInkx5kEntity.mapidcdNo.in(
                 select(
-            Expressions.stringTemplate("CAST({0} AS text)", mapSheetLearn5kEntity.mapSheetNum)
-          )
+                        Expressions.stringTemplate(
+                            "CAST({0} AS text)", mapSheetLearn5kEntity.mapSheetNum))
                     .from(mapSheetLearnEntity)
-            .join(mapSheetLearn5kEntity).on(mapSheetLearn5kEntity.learn.id.eq(mapSheetLearnEntity.id))
-            .where(mapSheetLearnEntity.uuid.eq(uuid))
-        )
-      )
+                    .join(mapSheetLearn5kEntity)
+                    .on(mapSheetLearn5kEntity.learn.id.eq(mapSheetLearnEntity.id))
+                    .where(mapSheetLearnEntity.uuid.eq(uuid))))
         .groupBy(mapInkx50kEntity.mapidcdNo, mapInkx50kEntity.mapidNm)
         .orderBy(mapInkx50kEntity.mapidNm.asc())
         .fetch();

src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java

@@ -417,11 +417,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
     StringExpression pnu =
         Expressions.stringTemplate(
             "coalesce(({0}), '')",
-        JPAExpressions
-          .select(Expressions.stringTemplate("string_agg({0}, ',')", pnuEntity.pnu))
+            JPAExpressions.select(Expressions.stringTemplate("string_agg({0}, ',')", pnuEntity.pnu))
                 .from(pnuEntity)
-          .where(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntity.geoUid))
-      );
+                .where(pnuEntity.geo.geoUid.eq(mapSheetAnalDataInferenceGeomEntity.geoUid)));
 
     // 4) content
     List<Geom> content =
@@ -442,8 +440,8 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
                     mapInkx5kEntity.mapidNm,
                     Expressions.stringTemplate(
                         "substring({0} from 1 for 8)",
-              mapSheetAnalDataInferenceGeomEntity.resultUid
-            ), pnu))
+                        mapSheetAnalDataInferenceGeomEntity.resultUid),
+                    pnu))
             .from(mapSheetAnalInferenceEntity)
             .join(mapSheetAnalDataInferenceEntity)
             .on(mapSheetAnalDataInferenceEntity.analUid.eq(mapSheetAnalInferenceEntity.id))