영상관리파일삭제, 년도목록 조회 수정

2025-12-18 10:59:09 +09:00
parent 9d1d9aff69
commit 21f1e9fc3c
8 changed files with 199 additions and 193 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java
@@ -36,6 +36,11 @@ public class MapSheetMngCoreService {
    return mapSheetMngRepository.findMapSheetMngList();
  }

+  public List<Integer> findMapSheetMngYyyyList() {
+    return mapSheetMngRepository.findMapSheetMngYyyyList();
+  }
+
+
  public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {
    return mapSheetMngRepository.findMapSheetMng(mngYyyy);
  }
@@ -44,13 +49,12 @@ public class MapSheetMngCoreService {
    mapSheetMngRepository.MapSheetMngComplete(mngYyyy);
  }

-
  public Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(
      MapSheetMngDto.@Valid ErrorSearchReq searchReq) {
    return mapSheetMngRepository.findMapSheetErrorList(searchReq);
  }

-  public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid){
+  public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid) {
    return mapSheetMngRepository.findMapSheetError(hstUid);
  }

@@ -58,7 +62,6 @@ public class MapSheetMngCoreService {
    return mapSheetMngRepository.findIdToMapSheetFileList(hstUid);
  }

-
  public MapSheetMngDto.DmlReturn uploadProcess(@Valid List<Long> hstUidList) {
    int count = 0;
    if (!Objects.isNull(hstUidList) && !hstUidList.isEmpty()) {
@@ -207,8 +210,7 @@ public class MapSheetMngCoreService {
    return new MapSheetMngDto.DmlReturn("success", saved.getMngYyyy().toString());
  }

-
-  public List<MapSheetMngDto.MngFilesDto> findHstUidToMapSheetFileList(Long hstUid){
+  public List<MapSheetMngDto.MngFilesDto> findHstUidToMapSheetFileList(Long hstUid) {
    return mapSheetMngRepository.findHstUidToMapSheetFileList(hstUid);
  }

@@ -217,5 +219,4 @@ public class MapSheetMngCoreService {

    return new MapSheetMngDto.DmlReturn("success", fileUid + " : 삭제되었습니다.");
  }
-
 }
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryCustom.java
@@ -11,6 +11,8 @@ public interface MapSheetMngRepositoryCustom {

  List<MapSheetMngDto.MngDto> findMapSheetMngList();

+  List<Integer> findMapSheetMngYyyyList();
+
  MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy);

  void MapSheetMngComplete(int mngYyyy);
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/mapsheet/MapSheetMngRepositoryImpl.java
@@ -167,6 +167,18 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
    return foundContent;
  }

+  public List<Integer> findMapSheetMngYyyyList(){
+    List<Integer> foundContent =
+      queryFactory
+        .select(mapSheetMngEntity.mngYyyy)
+        .from(mapSheetMngEntity)
+        .where(mapSheetMngEntity.mngState.ne("COMPLETE"))
+        .orderBy(mapSheetMngEntity.mngYyyy.desc())
+        .fetch();
+
+    return foundContent;
+  }
+
  public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {

    BooleanBuilder whereBuilder = new BooleanBuilder();
@@ -367,72 +379,71 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
    return new PageImpl<>(foundContent, pageable, countQuery);
  }

-
  @Override
-  public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid){
+  public MapSheetMngDto.ErrorDataDto findMapSheetError(Long hstUid) {

    BooleanBuilder whereBuilder = new BooleanBuilder();
-    whereBuilder.and( mapSheetMngHstEntity.hstUid.eq(hstUid));
+    whereBuilder.and(mapSheetMngHstEntity.hstUid.eq(hstUid));

    MapSheetMngDto.ErrorDataDto foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            MapSheetMngDto.ErrorDataDto.class,
-            mapSheetMngHstEntity.hstUid,
-            mapSheetMngHstEntity.mapSheetNum,
-            Expressions.stringTemplate(
-              "concat({0},substring({1}, 0, 6))",
-              mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("map50kName"),
-            Expressions.stringTemplate(
-              "concat({0},substring({1}, 6, 8))",
-              mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("map5kName"),
-            Expressions.stringTemplate(
-              "concat({0},substring({1}, 6, 8))",
-              mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum).as("mapSrcName"),
-            mapInkx5kEntity.fid,
-            mapSheetMngHstEntity.createdDate,
-            mapSheetMngHstEntity.syncState,
-            mapSheetMngHstEntity.syncTfwFileName,
-            mapSheetMngHstEntity.syncTifFileName,
-            mapSheetMngHstEntity.syncCheckState,
-            mapSheetMngHstEntity.syncCheckTfwFileName,
-            mapSheetMngHstEntity.syncCheckTifFileName
-          )
-        )
-        .from(mapSheetMngHstEntity)
-        .innerJoin(mapInkx5kEntity).on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo))
-        .where(whereBuilder)
-        .fetchOne();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    MapSheetMngDto.ErrorDataDto.class,
+                    mapSheetMngHstEntity.hstUid,
+                    mapSheetMngHstEntity.mapSheetNum,
+                    Expressions.stringTemplate(
+                            "concat({0},substring({1}, 0, 6))",
+                            mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
+                        .as("map50kName"),
+                    Expressions.stringTemplate(
+                            "concat({0},substring({1}, 6, 8))",
+                            mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
+                        .as("map5kName"),
+                    Expressions.stringTemplate(
+                            "concat({0},substring({1}, 6, 8))",
+                            mapInkx5kEntity.mapidNm, mapSheetMngHstEntity.mapSheetNum)
+                        .as("mapSrcName"),
+                    mapInkx5kEntity.fid,
+                    mapSheetMngHstEntity.createdDate,
+                    mapSheetMngHstEntity.syncState,
+                    mapSheetMngHstEntity.syncTfwFileName,
+                    mapSheetMngHstEntity.syncTifFileName,
+                    mapSheetMngHstEntity.syncCheckState,
+                    mapSheetMngHstEntity.syncCheckTfwFileName,
+                    mapSheetMngHstEntity.syncCheckTifFileName))
+            .from(mapSheetMngHstEntity)
+            .innerJoin(mapInkx5kEntity)
+            .on(mapSheetMngHstEntity.mapSheetNum.eq(mapInkx5kEntity.mapidcdNo))
+            .where(whereBuilder)
+            .fetchOne();

    return foundContent;
  }

  @Override
-  public List<MapSheetMngDto.MngFilesDto> findIdToMapSheetFileList(Long hstUid){
+  public List<MapSheetMngDto.MngFilesDto> findIdToMapSheetFileList(Long hstUid) {

    BooleanBuilder whereBuilder = new BooleanBuilder();
-    whereBuilder.and( mapSheetMngFileEntity.hstUid.eq(hstUid) );
+    whereBuilder.and(mapSheetMngFileEntity.hstUid.eq(hstUid));

    List<MapSheetMngDto.MngFilesDto> foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            MapSheetMngDto.MngFilesDto.class,
-            mapSheetMngFileEntity.fileUid,
-            mapSheetMngFileEntity.mngYyyy,
-            mapSheetMngFileEntity.mapSheetNum,
-            mapSheetMngFileEntity.refMapSheetNum,
-            mapSheetMngFileEntity.filePath,
-            mapSheetMngFileEntity.fileName,
-            mapSheetMngFileEntity.fileExt,
-            mapSheetMngFileEntity.hstUid,
-            mapSheetMngFileEntity.fileSize
-          )
-        )
-        .from(mapSheetMngFileEntity)
-        .where(whereBuilder)
-        .fetch();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    MapSheetMngDto.MngFilesDto.class,
+                    mapSheetMngFileEntity.fileUid,
+                    mapSheetMngFileEntity.mngYyyy,
+                    mapSheetMngFileEntity.mapSheetNum,
+                    mapSheetMngFileEntity.refMapSheetNum,
+                    mapSheetMngFileEntity.filePath,
+                    mapSheetMngFileEntity.fileName,
+                    mapSheetMngFileEntity.fileExt,
+                    mapSheetMngFileEntity.hstUid,
+                    mapSheetMngFileEntity.fileSize))
+            .from(mapSheetMngFileEntity)
+            .where(whereBuilder)
+            .fetch();

    return foundContent;
  }
@@ -440,68 +451,64 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
  @Override
  public List<MapSheetMngDto.MngFilesDto> findHstUidToMapSheetFileList(Long hstUid) {
    BooleanBuilder whereBuilder = new BooleanBuilder();
-    whereBuilder.and( mapSheetMngFileEntity.hstUid.eq(hstUid) );
+    whereBuilder.and(mapSheetMngFileEntity.hstUid.eq(hstUid));

    List<MapSheetMngDto.MngFilesDto> foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            MapSheetMngDto.MngFilesDto.class,
-            mapSheetMngFileEntity.fileUid,
-            mapSheetMngFileEntity.mngYyyy,
-            mapSheetMngFileEntity.mapSheetNum,
-            mapSheetMngFileEntity.refMapSheetNum,
-            mapSheetMngFileEntity.filePath,
-            mapSheetMngFileEntity.fileName,
-            mapSheetMngFileEntity.fileExt,
-            mapSheetMngFileEntity.hstUid,
-            mapSheetMngFileEntity.fileSize
-          )
-        )
-        .from(mapSheetMngFileEntity)
-        .where(whereBuilder)
-        .orderBy(mapSheetMngFileEntity.fileExt.desc())
-        .fetch();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    MapSheetMngDto.MngFilesDto.class,
+                    mapSheetMngFileEntity.fileUid,
+                    mapSheetMngFileEntity.mngYyyy,
+                    mapSheetMngFileEntity.mapSheetNum,
+                    mapSheetMngFileEntity.refMapSheetNum,
+                    mapSheetMngFileEntity.filePath,
+                    mapSheetMngFileEntity.fileName,
+                    mapSheetMngFileEntity.fileExt,
+                    mapSheetMngFileEntity.hstUid,
+                    mapSheetMngFileEntity.fileSize))
+            .from(mapSheetMngFileEntity)
+            .where(whereBuilder)
+            .orderBy(mapSheetMngFileEntity.fileExt.desc())
+            .fetch();

    return foundContent;
  }

  @Override
-  public MapSheetMngDto.MngFilesDto findYyyyToMapSheetFilePath(int mngYyyy){
+  public MapSheetMngDto.MngFilesDto findYyyyToMapSheetFilePath(int mngYyyy) {

    BooleanBuilder whereBuilder = new BooleanBuilder();
-    whereBuilder.and( mapSheetMngFileEntity.mngYyyy.eq(mngYyyy) );
+    whereBuilder.and(mapSheetMngFileEntity.mngYyyy.eq(mngYyyy));

    MapSheetMngDto.MngFilesDto foundContent =
-      queryFactory
-        .select(
-          Projections.constructor(
-            MapSheetMngDto.MngFilesDto.class,
-            mapSheetMngFileEntity.fileUid,
-            mapSheetMngFileEntity.mngYyyy,
-            mapSheetMngFileEntity.mapSheetNum,
-            mapSheetMngFileEntity.refMapSheetNum,
-            mapSheetMngFileEntity.filePath,
-            mapSheetMngFileEntity.fileName,
-            mapSheetMngFileEntity.fileExt,
-            mapSheetMngFileEntity.hstUid,
-            mapSheetMngFileEntity.fileSize
-          )
-        )
-        .from(mapSheetMngFileEntity)
-        .where(whereBuilder)
-        .fetchOne();
+        queryFactory
+            .select(
+                Projections.constructor(
+                    MapSheetMngDto.MngFilesDto.class,
+                    mapSheetMngFileEntity.fileUid,
+                    mapSheetMngFileEntity.mngYyyy,
+                    mapSheetMngFileEntity.mapSheetNum,
+                    mapSheetMngFileEntity.refMapSheetNum,
+                    mapSheetMngFileEntity.filePath,
+                    mapSheetMngFileEntity.fileName,
+                    mapSheetMngFileEntity.fileExt,
+                    mapSheetMngFileEntity.hstUid,
+                    mapSheetMngFileEntity.fileSize))
+            .from(mapSheetMngFileEntity)
+            .where(whereBuilder)
+            .fetchOne();

    return foundContent;
  }

  public void MapSheetMngComplete(int mngYyyy) {
    long execCount =
-      queryFactory
-        .update(mapSheetMngEntity)
-        .set(mapSheetMngEntity.mngState, "COMPLETE")
-        .where(mapSheetMngEntity.mngYyyy.eq(mngYyyy))
-        .execute();
+        queryFactory
+            .update(mapSheetMngEntity)
+            .set(mapSheetMngEntity.mngState, "COMPLETE")
+            .where(mapSheetMngEntity.mngYyyy.eq(mngYyyy))
+            .execute();
  }

  @Override
@@ -557,12 +564,12 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
  }

  @Override
-  public void deleteByFileUidMngFile(Long fileUid){
+  public void deleteByFileUidMngFile(Long fileUid) {
    long deletedFileCount =
-      queryFactory
-        .delete(mapSheetMngFileEntity)
-        .where(mapSheetMngFileEntity.fileUid.eq(fileUid))
-        .execute();
+        queryFactory
+            .delete(mapSheetMngFileEntity)
+            .where(mapSheetMngFileEntity.fileUid.eq(fileUid))
+            .execute();
  }

  @Override