영상관리 파일중복처리 수정

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

@@ -52,6 +52,8 @@ public class MapSheetMngCoreService {
     mapSheetMngRepository.deleteByHstUidMngFile(hstUid);
   }
 
+
+
   public int findByYearFileNameFileCount(int mngYyyy, String fileName) {
     return mapSheetMngRepository.findByYearFileNameFileCount(mngYyyy, fileName);
   }
@@ -85,8 +87,8 @@ public class MapSheetMngCoreService {
     return mapSheetMngRepository.findYyyyToMapSheetFilePathRefer(mngYyyy);
   }
 
-  public MapSheetMngDto.MngFilesDto findIdToMapSheetFile(Long fileUid) {
-    return mapSheetMngRepository.findIdToMapSheetFile(fileUid);
+  public MapSheetMngDto.MngFilesDto findByFileUidMapSheetFile(Long fileUid) {
+    return mapSheetMngRepository.findByFileUidMapSheetFile(fileUid);
   }
 
   public MapSheetMngDto.DmlReturn uploadProcess(@Valid List<Long> hstUidList) {
@@ -242,11 +244,8 @@ public class MapSheetMngCoreService {
     return mapSheetMngRepository.findHstUidToMapSheetFileList(hstUid);
   }
 
-  public MapSheetMngDto.DmlReturn deleteByFileUidMngFile(Long fileUid) {
-
+  public void deleteByFileUidMngFile(Long fileUid) {
     mapSheetMngRepository.deleteByFileUidMngFile(fileUid);
-
-    return new MapSheetMngDto.DmlReturn("success", fileUid + " : 삭제되었습니다.");
   }
 
   public MapSheetMngDto.DmlReturn updateByHstUidSyncCheckState(Long hstUid) {
@@ -273,4 +272,18 @@ public class MapSheetMngCoreService {
 
     return new MapSheetMngDto.DmlReturn("success", hstUid + " : 상태변경되었습니다.");
   }
+
+
+  public MapSheetMngDto.DmlReturn updateByFileUidFileState(Long fileUid, String fileState) {
+
+    mapSheetMngRepository.updateByFileUidMngFileState(fileUid, fileState);
+
+    return new MapSheetMngDto.DmlReturn("success", fileUid + " : 상태변경되었습니다.");
+  }
+
+  public void deleteByNotInFileUidMngFile(Long hstUid, List<Long> fileUids){
+    mapSheetMngRepository.deleteByNotInFileUidMngFile(hstUid, fileUids);
+  }
+
+
 }

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

@@ -10,6 +10,7 @@ import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import lombok.Getter;
 import lombok.Setter;
+import org.hibernate.annotations.ColumnDefault;
 
 @Getter
 @Setter
@@ -54,4 +55,10 @@ public class MapSheetMngFileEntity {
   @Size(max = 20)
   @Column(name = "file_state", length = 20)
   private String fileState;
+
+  @NotNull
+  @ColumnDefault("false")
+  @Column(name = "file_del", nullable = false)
+  private Boolean fileDel = false;
+
 }

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

@@ -43,6 +43,10 @@ public interface MapSheetMngRepositoryCustom {
 
   void updateByHstUidMngFileState(Long hstUid, String fileState);
 
+  void updateByFileUidMngFileState(Long fileUid, String fileState);
+
+  void deleteByNotInFileUidMngFile(Long hstUid, List<Long> fileUids);
+
   void updateYearState(int yyyy, String status);
 
   Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(
@@ -52,7 +56,7 @@ public interface MapSheetMngRepositoryCustom {
 
   List<MapSheetMngDto.MngFilesDto> findIdToMapSheetFileList(Long hstUid);
 
-  MapSheetMngDto.MngFilesDto findIdToMapSheetFile(Long fileUid);
+  MapSheetMngDto.MngFilesDto findByFileUidMapSheetFile(Long fileUid);
 
   void updateHstFileSizes(Long hstUid, long tifSizeBytes, long tfwSizeBytes, long totalSizeBytes);
 

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

@@ -478,6 +478,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   public List<MapSheetMngDto.MngFilesDto> findHstUidToMapSheetFileList(Long hstUid) {
     BooleanBuilder whereBuilder = new BooleanBuilder();
     whereBuilder.and(mapSheetMngFileEntity.hstUid.eq(hstUid));
+    whereBuilder.and(mapSheetMngFileEntity.fileDel.eq(false));
 
     List<MapSheetMngDto.MngFilesDto> foundContent =
         queryFactory
@@ -531,7 +532,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   }
 
   @Override
-  public MapSheetMngDto.MngFilesDto findIdToMapSheetFile(Long fileUid) {
+  public MapSheetMngDto.MngFilesDto findByFileUidMapSheetFile(Long fileUid) {
 
     MapSheetMngDto.MngFilesDto foundContent =
         queryFactory
@@ -636,8 +637,9 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   public void deleteByHstUidMngFile(Long hstUid) {
     long deletedFileCount =
         queryFactory
-            .delete(mapSheetMngFileEntity)
-            .where(mapSheetMngFileEntity.fileUid.eq(hstUid))
+            .update(mapSheetMngFileEntity)
+            .set(mapSheetMngFileEntity.fileDel, true)
+            .where(mapSheetMngFileEntity.hstUid.eq(hstUid))
             .execute();
   }
 
@@ -645,7 +647,8 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
   public void deleteByFileUidMngFile(Long fileUid) {
     long fileCount =
         queryFactory
-            .delete(mapSheetMngFileEntity)
+          .update(mapSheetMngFileEntity)
+          .set(mapSheetMngFileEntity.fileDel, true)
             .where(mapSheetMngFileEntity.fileUid.eq(fileUid))
             .execute();
   }
@@ -660,6 +663,27 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
             .execute();
   }
 
+  @Override
+  public void deleteByNotInFileUidMngFile(Long hstUid, List<Long> fileUids){
+    long execCount =
+      queryFactory
+        .update(mapSheetMngFileEntity)
+        .set(mapSheetMngFileEntity.fileDel, true)
+        .where(mapSheetMngFileEntity.hstUid.eq(hstUid)
+          .and(mapSheetMngFileEntity.fileUid.notIn(fileUids)))
+        .execute();
+  }
+
+  @Override
+  public void updateByFileUidMngFileState(Long fileUid, String fileState) {
+    long execCount =
+      queryFactory
+        .update(mapSheetMngFileEntity)
+        .set(mapSheetMngFileEntity.fileState, fileState)
+        .where(mapSheetMngFileEntity.fileUid.eq(fileUid))
+        .execute();
+  }
+
   @Override
   public int findByYearFileNameFileCount(int mngYyyy, String fileName){
     Long execCount = queryFactory