영상관리리스트 추가

src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java

@@ -18,4 +18,8 @@ public class MapSheetMngCoreService {
   public Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(MapSheetMngDto.@Valid searchReq searchReq) {
     return mapSheetMngRepository.findMapSheetErrorList(searchReq);
   }
+
+  public Page<MapSheetMngDto.MngDto> findMapSheetMngList(MapSheetMngDto.@Valid searchReq searchReq) {
+    return mapSheetMngRepository.findMapSheetMngList(searchReq);
+  }
 }

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

@@ -1,42 +1,54 @@
 package com.kamco.cd.kamcoback.postgres.entity;
 
-import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
-import com.kamco.cd.kamcoback.postgres.CommonDateEntity;
-import jakarta.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+import jakarta.validation.constraints.Size;
+import java.time.OffsetDateTime;
 import lombok.Getter;
 import lombok.Setter;
-
-import java.time.ZonedDateTime;
+import org.hibernate.annotations.ColumnDefault;
 
 @Getter
 @Setter
 @Entity
 @Table(name = "tb_map_sheet_mng")
-public class MapSheetMngEntity extends CommonDateEntity {
+public class MapSheetMngEntity {
+
   @Id
-  @Column(name = "mng_yyyy")
-  private Integer mngYyyy;
+  @Column(name = "mng_yyyy", nullable = false)
+  private Integer id;
 
-  @Column(name = "mng_state")
-  @Enumerated(EnumType.STRING)
-  private MapSheetMngDto.MngState mngState;
+  @Size(max = 20)
+  @Column(name = "mng_state", length = 20)
+  private String mngState;
 
-  @Column(name = "sync_state")
-  @Enumerated(EnumType.STRING)
-  private MapSheetMngDto.SyncState syncState;
+  @Size(max = 20)
+  @Column(name = "sync_state", length = 20)
+  private String syncState;
 
   @Column(name = "mng_state_dttm")
-  private ZonedDateTime mngStateDttm;
+  private OffsetDateTime mngStateDttm;
 
   @Column(name = "sync_state_dttm")
-  private ZonedDateTime syncStateDttm;
+  private OffsetDateTime syncStateDttm;
+
+  @Column(name = "created_dttm")
+  private OffsetDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
 
+  @Column(name = "updated_dttm")
+  private OffsetDateTime updatedDttm;
+
   @Column(name = "updated_uid")
   private Long updatedUid;
 
+  @Size(max = 255)
+  @ColumnDefault("'NULL::character varying'")
   @Column(name = "mng_path")
   private String mngPath;
+
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java

@@ -1,12 +1,12 @@
 package com.kamco.cd.kamcoback.postgres.repository.mapsheet;
 
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
-import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngEntity;
 import jakarta.validation.Valid;
 import org.springframework.data.domain.Page;
 
-import java.util.List;
-
 public interface MapSheetMngRepositoryCustom {
   Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(MapSheetMngDto.@Valid searchReq searchReq);
+
+  Page<MapSheetMngDto.MngDto> findMapSheetMngList(MapSheetMngDto.@Valid searchReq searchReq);
+
 }

src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java

@@ -2,6 +2,7 @@ package com.kamco.cd.kamcoback.postgres.repository.mapsheet;
 
 import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
 import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity;
+import com.querydsl.core.types.Expression;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.Expressions;
@@ -84,6 +85,55 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
     return new PageImpl<>(foundContent, pageable, countQuery);
   }
 
+
+  @Override
+  public Page<MapSheetMngDto.MngDto> findMapSheetMngList(MapSheetMngDto.@Valid searchReq searchReq) {
+
+    Pageable pageable = PageRequest.of(searchReq.getPage(), searchReq.getSize());
+    List<MapSheetMngDto.MngDto> foundContent = queryFactory
+      .select(
+        Projections.constructor(
+          MapSheetMngDto.MngDto.class,
+          Expressions.numberTemplate(Integer.class, "row_number() over(order by {0} desc)", mapSheetMngEntity.createdDttm)
+          /*
+          mapSheetMngEntity.id,
+          mapSheetMngEntity.mngState,
+          mapSheetMngEntity.syncState,
+          Expressions.stringTemplate("to_char({0}, 'YYYY-MM-DD HH24:MI:SS')", mapSheetMngEntity.mngStateDttm),
+          Expressions.stringTemplate("to_char({0}, 'YYYY-MM-DD HH24:MI:SS')", mapSheetMngEntity.syncStateDttm),
+          10,
+          20,
+          (Expression<?>) mapSheetMngEntity.mngPath,
+          Expressions.stringTemplate("to_char({0}, 'YYYY-MM-DD HH24:MI:SS')", mapSheetMngEntity.createdDttm),
+          mapSheetMngEntity.createdUid,
+          Expressions.stringTemplate("to_char({0}, 'YYYY-MM-DD HH24:MI:SS')", mapSheetMngEntity.updatedDttm),
+          mapSheetMngEntity.updatedUid
+
+           */
+        )
+      )
+      .from(mapSheetMngEntity)
+      .where(
+        mapSheetMngEntity.id.eq(searchReq.getMngYyyy()),
+        mapSheetErrorSearchValue(searchReq)
+      )
+      .offset(pageable.getOffset())
+      .limit(pageable.getPageSize())
+      .orderBy(mapSheetMngEntity.createdDttm.desc())
+      .fetch();
+
+    Long countQuery = queryFactory
+      .select(mapSheetMngEntity.id.count())
+      .from(mapSheetMngEntity)
+      .where(
+        mapSheetMngEntity.id.eq(searchReq.getMngYyyy()),
+        mapSheetErrorSearchValue(searchReq)
+      )
+      .fetchOne();
+
+    return new PageImpl<>(foundContent, pageable, countQuery);
+  }
+
   private NumberExpression<Integer> rowNum(){
     return Expressions.numberTemplate(Integer.class, "row_number() over(order by {0} desc)", mapSheetMngHstEntity.createdDate);
   }
@@ -97,4 +147,18 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
     return Expressions.booleanTemplate("{0} like '%" + searchReq.getSearchValue() + "%'", mapSheetMngHstEntity.mapSheetName)
       .or(Expressions.booleanTemplate("{0} like '%" + searchReq.getSearchValue() + "%'", mapSheetMngHstEntity.mapSheetNum));
   }
+
+
+  private NumberExpression<Integer> mngRowNum(){
+    return Expressions.numberTemplate(Integer.class, "row_number() over(order by {0} desc)", mapSheetMngEntity.createdDttm);
+  }
+
+  private BooleanExpression mapSheetMngSearchValue(MapSheetMngDto.searchReq searchReq) {
+    if (Objects.isNull(searchReq.getSearchValue())) {
+      return null;
+    }
+
+    // 검색어 1개 값이 도엽명 or 도엽번호 like 검색
+    return Expressions.booleanTemplate("{0} = " + searchReq.getSearchValue() , mapSheetMngEntity.id);
+  }
 }