자동 추론제외, spotless 적용

This commit is contained in:
2026-01-22 21:12:08 +09:00
parent eb93091b3e
commit cbbb0cadab
6 changed files with 45 additions and 53 deletions

View File

@@ -1,6 +1,5 @@
package com.kamco.cd.kamcoback.postgres.core; package com.kamco.cd.kamcoback.postgres.core;
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngFileEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngFileEntity;
import com.kamco.cd.kamcoback.postgres.repository.scheduler.MapSheetMngFileJobRepository; import com.kamco.cd.kamcoback.postgres.repository.scheduler.MapSheetMngFileJobRepository;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto;
@@ -66,11 +65,11 @@ public class MapSheetMngFileJobCoreService {
} }
public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum) { public Long findByHstMapSheetBeforeYyyyListCount(int strtYyyy, int endYyyy, String mapSheetNum) {
return mapSheetMngFileJobRepository.findByHstMapSheetBeforeYyyyListCount(strtYyyy, endYyyy, mapSheetNum); return mapSheetMngFileJobRepository.findByHstMapSheetBeforeYyyyListCount(
strtYyyy, endYyyy, mapSheetNum);
} }
public void updateException5kMapSheet(String mapSheetNum) { public void updateException5kMapSheet(String mapSheetNum) {
mapSheetMngFileJobRepository.updateException5kMapSheet(mapSheetNum); mapSheetMngFileJobRepository.updateException5kMapSheet(mapSheetNum);
} }
} }

View File

@@ -1,6 +1,5 @@
package com.kamco.cd.kamcoback.postgres.repository.scheduler; package com.kamco.cd.kamcoback.postgres.repository.scheduler;
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto;
import java.util.List; import java.util.List;

View File

@@ -5,7 +5,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngEntity.mapSheet
import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity;
import com.kamco.cd.kamcoback.common.enums.CommonUseStatus; import com.kamco.cd.kamcoback.common.enums.CommonUseStatus;
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity; import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto;
@@ -18,7 +17,6 @@ import com.querydsl.jpa.impl.JPAQueryFactory;
import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext; import jakarta.persistence.PersistenceContext;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
@@ -241,13 +239,18 @@ public class MapSheetMngFileJobRepositoryImpl extends QuerydslRepositorySupport
queryFactory queryFactory
.select(mapSheetMngHstEntity.mngYyyy.count()) .select(mapSheetMngHstEntity.mngYyyy.count())
.from(mapSheetMngHstEntity) .from(mapSheetMngHstEntity)
.where(mapSheetMngHstEntity.mngYyyy.goe(strtYyyy) .where(
mapSheetMngHstEntity
.mngYyyy
.goe(strtYyyy)
.and(mapSheetMngHstEntity.mngYyyy.loe(endYyyy)) .and(mapSheetMngHstEntity.mngYyyy.loe(endYyyy))
.and(mapSheetMngHstEntity.mapSheetNum.eq(mapSheetNum)) .and(mapSheetMngHstEntity.mapSheetNum.eq(mapSheetNum))
.and(mapSheetMngHstEntity.useInference.eq("USE")) .and(mapSheetMngHstEntity.useInference.eq("USE"))
.and(mapSheetMngHstEntity.syncState.eq("DONE") .and(
.or(mapSheetMngHstEntity.syncCheckState.eq("DONE"))) mapSheetMngHstEntity
) .syncState
.eq("DONE")
.or(mapSheetMngHstEntity.syncCheckState.eq("DONE"))))
.fetchOne(); .fetchOne();
return countQuery; return countQuery;

View File

@@ -50,7 +50,6 @@ public class MapSheetMngFileJobController {
mapSheetMngFileJobService.checkMapSheetFileProcess(0, mngSyncPageSize); mapSheetMngFileJobService.checkMapSheetFileProcess(0, mngSyncPageSize);
} }
@Scheduled(fixedDelay = 1000 * 5) @Scheduled(fixedDelay = 1000 * 5)
public void mngFileSyncJob01() { public void mngFileSyncJob01() {
if (!isSchedulerEnabled || !isFileSyncSchedulerEnabled) return; if (!isSchedulerEnabled || !isFileSyncSchedulerEnabled) return;
@@ -123,8 +122,6 @@ public class MapSheetMngFileJobController {
mapSheetMngFileJobService.checkMapSheetFileProcess(9, mngSyncPageSize); mapSheetMngFileJobService.checkMapSheetFileProcess(9, mngSyncPageSize);
} }
// 3. 외부에서 플래그를 변경할 수 있는 Setter 메서드 // 3. 외부에서 플래그를 변경할 수 있는 Setter 메서드
public void setSchedulerEnabled(boolean enabled) { public void setSchedulerEnabled(boolean enabled) {
this.isSchedulerEnabled = enabled; this.isSchedulerEnabled = enabled;

View File

@@ -4,11 +4,9 @@ import static java.lang.String.CASE_INSENSITIVE_ORDER;
import com.kamco.cd.kamcoback.common.utils.FIleChecker; import com.kamco.cd.kamcoback.common.utils.FIleChecker;
import com.kamco.cd.kamcoback.common.utils.FIleChecker.Basic; import com.kamco.cd.kamcoback.common.utils.FIleChecker.Basic;
import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto;
import com.kamco.cd.kamcoback.postgres.core.MapSheetMngFileJobCoreService; import com.kamco.cd.kamcoback.postgres.core.MapSheetMngFileJobCoreService;
import com.kamco.cd.kamcoback.scheduler.dto.FileDto; import com.kamco.cd.kamcoback.scheduler.dto.FileDto;
import com.kamco.cd.kamcoback.scheduler.dto.FileDto.SrchFilesDepthDto; import com.kamco.cd.kamcoback.scheduler.dto.FileDto.SrchFilesDepthDto;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.DmlReturn; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.DmlReturn;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngFileAddReq; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngFileAddReq;
import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto; import com.kamco.cd.kamcoback.scheduler.dto.MapSheetMngDto.MngHstDto;
@@ -55,8 +53,6 @@ public class MapSheetMngFileJobService {
@Value("${file.sync-auto-exception-before-year-cnt}") @Value("${file.sync-auto-exception-before-year-cnt}")
private int syncAutoExceptionBeforeYearCnt; private int syncAutoExceptionBeforeYearCnt;
public Integer checkMngFileSync() { public Integer checkMngFileSync() {
return mapSheetMngFileJobCoreService.findNotYetMapSheetMng(); return mapSheetMngFileJobCoreService.findNotYetMapSheetMng();
} }
@@ -83,7 +79,8 @@ public class MapSheetMngFileJobService {
for (MngHstDto item : mapSheetFileNotYetList) { for (MngHstDto item : mapSheetFileNotYetList) {
// 5K도엽 자동추론제외 // 5K도엽 자동추론제외
Long exceptCheckCnt = this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum()); Long exceptCheckCnt =
this.mapSheetAutoExceptionUpdate(item.getMngYyyy(), item.getMapSheetNum());
// 도엽별 파일 체크 진행중으로 변경 // 도엽별 파일 체크 진행중으로 변경
item.setDataState("PROCESSING"); item.setDataState("PROCESSING");
@@ -202,9 +199,6 @@ public class MapSheetMngFileJobService {
item.setSyncState(syncState); item.setSyncState(syncState);
mngHstDataSyncStateUpdate(item); mngHstDataSyncStateUpdate(item);
} }
Long notyetCnt = this.mngDataStateDoneUpdate(mngYyyy); Long notyetCnt = this.mngDataStateDoneUpdate(mngYyyy);
@@ -245,14 +239,15 @@ public class MapSheetMngFileJobService {
int endYyyy = mngYyyy - 1; int endYyyy = mngYyyy - 1;
// 이전년도가 3개년인 도엽 확인 // 이전년도가 3개년인 도엽 확인
Long beforeCnt = mapSheetMngFileJobCoreService.findByHstMapSheetBeforeYyyyListCount(strtYyyy, endYyyy, mapSheetNum); Long beforeCnt =
mapSheetMngFileJobCoreService.findByHstMapSheetBeforeYyyyListCount(
strtYyyy, endYyyy, mapSheetNum);
System.out.println("mapSheetAutoExceptionUpdate mapSheetNum == " + mapSheetNum); System.out.println("mapSheetAutoExceptionUpdate mapSheetNum == " + mapSheetNum);
System.out.println("mapSheetAutoExceptionUpdate strtYyyy == " + strtYyyy); System.out.println("mapSheetAutoExceptionUpdate strtYyyy == " + strtYyyy);
System.out.println("mapSheetAutoExceptionUpdate endYyyy == " + endYyyy); System.out.println("mapSheetAutoExceptionUpdate endYyyy == " + endYyyy);
System.out.println("mapSheetAutoExceptionUpdate beforeCnt == " + beforeCnt); System.out.println("mapSheetAutoExceptionUpdate beforeCnt == " + beforeCnt);
if( beforeCnt == 0 ) if (beforeCnt == 0) {
{
System.out.println("mapSheetAutoExceptionUpdate inference == 자동추론제외"); System.out.println("mapSheetAutoExceptionUpdate inference == 자동추론제외");
mapSheetMngFileJobCoreService.updateException5kMapSheet(mapSheetNum); mapSheetMngFileJobCoreService.updateException5kMapSheet(mapSheetNum);
} }
@@ -268,9 +263,6 @@ public class MapSheetMngFileJobService {
return mapSheetMngFileJobCoreService.findByMngYyyyTargetMapSheetNotYetCount(mngYyyy); return mapSheetMngFileJobCoreService.findByMngYyyyTargetMapSheetNotYetCount(mngYyyy);
} }
public DmlReturn mngHstDataSyncStateUpdate(MngHstDto UpdateReq) { public DmlReturn mngHstDataSyncStateUpdate(MngHstDto UpdateReq) {
return mapSheetMngFileJobCoreService.mngHstDataSyncStateUpdate(UpdateReq); return mapSheetMngFileJobCoreService.mngHstDataSyncStateUpdate(UpdateReq);
} }

View File

@@ -47,6 +47,8 @@ file:
sync-root-dir: /kamco-nfs/images/ sync-root-dir: /kamco-nfs/images/
sync-tmp-dir: ${file.sync-root-dir}/tmp sync-tmp-dir: ${file.sync-root-dir}/tmp
sync-file-extention: tfw,tif sync-file-extention: tfw,tif
sync-auto-exception-start-year: 2025
sync-auto-exception-before-year-cnt: 3
#dataset-dir: D:/kamco-nfs/dataset/ #dataset-dir: D:/kamco-nfs/dataset/
dataset-dir: /kamco-nfs/dataset/export/ dataset-dir: /kamco-nfs/dataset/export/