MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

Browse Source 
# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/common/utils/FIleChecker.java
#	src/main/java/com/kamco/cd/kamcoback/mapsheet/service/MapSheetMngService.java
This commit is contained in:
Moon
2025-12-26 08:50:58 +09:00
parent 5707a31309 8aeac2002a
commit 8b6f68e3ca
3 changed files with 113 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/kamco/cd/kamcoback/mapsheet/MapSheetMngApiController.java
View File

@@ -182,9 +182,8 @@ public class MapSheetMngApiController {
@RequestParam(value = "hstUid", required = false) Long hstUid, @RequestParam(value = "hstUid", required = false) Long hstUid,
@RequestParam(value = "overwrite", required = false) boolean overwrite) { @RequestParam(value = "overwrite", required = false) boolean overwrite) {
return ApiResponseDto.createOK(
mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid, overwrite));
return ApiResponseDto.createOK(mapSheetMngService.uploadPair(tfwFile, tifFile, hstUid, overwrite));
} }
@Operation(summary = "영상관리 > 파일조회", description = "영상관리 > 파일조회") @Operation(summary = "영상관리 > 파일조회", description = "영상관리 > 파일조회")

19
src/main/java/com/kamco/cd/kamcoback/mapsheet/dto/MapSheetMngDto.java
View File

@@ -92,26 +92,27 @@ public class MapSheetMngDto {
public String getMngState() { public String getMngState() {
if (this.syncStateDoneCnt == 0)return "NOTYET"; if (this.syncStateDoneCnt == 0) return "NOTYET";
else if (this.syncStateDoneCnt < this.syncTotCnt)return "PROCESSING"; else if (this.syncStateDoneCnt < this.syncTotCnt) return "PROCESSING";
if( (this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt) > 0 )return "TAKINGERROR"; if ((this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt) > 0)
return "TAKINGERROR";
return "DONE"; return "DONE";
} }
public String getSyncState() { public String getSyncState() {
if (this.syncStateDoneCnt == 0)return "NOTYET"; if (this.syncStateDoneCnt == 0) return "NOTYET";
else if (this.syncStateDoneCnt < this.syncTotCnt)return "PROCESSING"; else if (this.syncStateDoneCnt < this.syncTotCnt) return "PROCESSING";
return "DONE"; return "DONE";
} }
public String getDataCheckState() { public String getDataCheckState() {
if (this.syncDataCheckDoneCnt == 0)return "NOTYET"; if (this.syncDataCheckDoneCnt == 0) return "NOTYET";
else if (this.syncDataCheckDoneCnt < this.syncTotCnt)return "PROCESSING"; else if (this.syncDataCheckDoneCnt < this.syncTotCnt) return "PROCESSING";
return "DONE"; return "DONE";
} }
@@ -138,8 +139,6 @@ public class MapSheetMngDto {
return this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt; return this.syncNotPaireExecCnt + this.syncDuplicateExecCnt + this.syncFaultExecCnt;
} }
public String getMngStateName() { public String getMngStateName() {
String enumId = this.mngState; String enumId = this.mngState;
if (enumId == null || enumId.isEmpty()) { if (enumId == null || enumId.isEmpty()) {
@@ -254,8 +253,6 @@ public class MapSheetMngDto {
this.errorCheckTifFileName = errorCheckTifFileName; this.errorCheckTifFileName = errorCheckTifFileName;
} }
private String getSyncStateName(String enumId) { private String getSyncStateName(String enumId) {
if (enumId == null || enumId.isEmpty()) { if (enumId == null || enumId.isEmpty()) {
enumId = "NOTYET"; enumId = "NOTYET";

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

@@ -79,7 +79,6 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
mapSheetMngEntity.mngState, mapSheetMngEntity.mngState,
mapSheetMngEntity.syncState, mapSheetMngEntity.syncState,
mapSheetMngEntity.syncCheckState, mapSheetMngEntity.syncCheckState,
mapSheetMngHstEntity.count().as("syncTotalCnt"), mapSheetMngHstEntity.count().as("syncTotalCnt"),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.dataState.eq("DONE")) .when(mapSheetMngHstEntity.dataState.eq("DONE"))
@@ -87,13 +86,11 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.otherwise(0L) .otherwise(0L)
.sum() .sum()
.as("syncStateDoneCnt"), .as("syncStateDoneCnt"),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.ne("NOTYET")) .when(mapSheetMngHstEntity.syncState.ne("NOTYET"))
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.eq("NOTPAIR")) .when(mapSheetMngHstEntity.syncState.eq("NOTPAIR"))
.then(1L) .then(1L)
@@ -108,7 +105,6 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder() new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.eq("DUPLICATE")) .when(mapSheetMngHstEntity.syncState.eq("DUPLICATE"))
.then(1L) .then(1L)
@@ -123,7 +119,6 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder() new CaseBuilder()
.when( .when(
mapSheetMngHstEntity mapSheetMngHstEntity
@@ -146,23 +141,20 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder()
new CaseBuilder() .when(mapSheetMngHstEntity.syncState.eq("NOFILE"))
.when(mapSheetMngHstEntity.syncState.eq("NOFILE")) .then(1L)
.then(1L) .otherwise(0L)
.otherwise(0L) .sum(),
.sum(), new CaseBuilder()
new CaseBuilder() .when(
.when( mapSheetMngHstEntity
mapSheetMngHstEntity .syncCheckState
.syncCheckState .eq("DONE")
.eq("DONE") .and(mapSheetMngHstEntity.syncState.eq("NOFILE")))
.and(mapSheetMngHstEntity.syncState.eq("NOFILE"))) .then(1L)
.then(1L) .otherwise(0L)
.otherwise(0L) .sum(),
.sum(),
mapSheetMngEntity.createdDttm, mapSheetMngEntity.createdDttm,
mapSheetMngHstEntity.syncEndDttm.max())) mapSheetMngHstEntity.syncEndDttm.max()))
.from(mapSheetMngEntity) .from(mapSheetMngEntity)
@@ -221,102 +213,94 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
queryFactory queryFactory
.select( .select(
Projections.constructor( Projections.constructor(
MapSheetMngDto.MngDto.class, MapSheetMngDto.MngDto.class,
Expressions.numberTemplate( Expressions.numberTemplate(
Integer.class, Integer.class,
"row_number() over(order by {0} desc)", "row_number() over(order by {0} desc)",
mapSheetMngEntity.createdDttm), mapSheetMngEntity.createdDttm),
mapSheetMngEntity.mngYyyy, mapSheetMngEntity.mngYyyy,
mapSheetMngEntity.mngPath, mapSheetMngEntity.mngPath,
mapSheetMngEntity.mngState, mapSheetMngEntity.mngState,
mapSheetMngEntity.syncState, mapSheetMngEntity.syncState,
mapSheetMngEntity.syncCheckState, mapSheetMngEntity.syncCheckState,
mapSheetMngHstEntity.count().as("syncTotalCnt"),
mapSheetMngHstEntity.count().as("syncTotalCnt"), new CaseBuilder()
new CaseBuilder() .when(mapSheetMngHstEntity.dataState.eq("DONE"))
.when(mapSheetMngHstEntity.dataState.eq("DONE")) .then(1L)
.then(1L) .otherwise(0L)
.otherwise(0L) .sum()
.sum() .as("syncStateDoneCnt"),
.as("syncStateDoneCnt"), new CaseBuilder()
.when(mapSheetMngHstEntity.syncState.ne("NOTYET"))
new CaseBuilder() .then(1L)
.when(mapSheetMngHstEntity.syncState.ne("NOTYET")) .otherwise(0L)
.then(1L) .sum(),
.otherwise(0L) new CaseBuilder()
.sum(), .when(mapSheetMngHstEntity.syncState.eq("NOTPAIR"))
.then(1L)
new CaseBuilder() .otherwise(0L)
.when(mapSheetMngHstEntity.syncState.eq("NOTPAIR")) .sum(),
.then(1L) new CaseBuilder()
.otherwise(0L) .when(
.sum(), mapSheetMngHstEntity
new CaseBuilder() .syncCheckState
.when( .eq("DONE")
mapSheetMngHstEntity .and(mapSheetMngHstEntity.syncState.eq("NOTPAIR")))
.syncCheckState .then(1L)
.eq("DONE") .otherwise(0L)
.and(mapSheetMngHstEntity.syncState.eq("NOTPAIR"))) .sum(),
.then(1L) new CaseBuilder()
.otherwise(0L) .when(mapSheetMngHstEntity.syncState.eq("DUPLICATE"))
.sum(), .then(1L)
.otherwise(0L)
new CaseBuilder() .sum(),
.when(mapSheetMngHstEntity.syncState.eq("DUPLICATE")) new CaseBuilder()
.then(1L) .when(
.otherwise(0L) mapSheetMngHstEntity
.sum(), .syncCheckState
new CaseBuilder() .eq("DONE")
.when( .and(mapSheetMngHstEntity.syncState.eq("DUPLICATE")))
mapSheetMngHstEntity .then(1L)
.syncCheckState .otherwise(0L)
.eq("DONE") .sum(),
.and(mapSheetMngHstEntity.syncState.eq("DUPLICATE"))) new CaseBuilder()
.then(1L) .when(
.otherwise(0L) mapSheetMngHstEntity
.sum(), .syncState
.eq("TYPEERROR")
new CaseBuilder() .or(mapSheetMngHstEntity.syncState.eq("SIZEERROR")))
.when( .then(1L)
mapSheetMngHstEntity .otherwise(0L)
.syncState .sum(),
.eq("TYPEERROR") new CaseBuilder()
.or(mapSheetMngHstEntity.syncState.eq("SIZEERROR"))) .when(
.then(1L) mapSheetMngHstEntity
.otherwise(0L) .syncCheckState
.sum(), .eq("DONE")
new CaseBuilder() .and(
.when( mapSheetMngHstEntity
mapSheetMngHstEntity .syncState
.syncCheckState .eq("TYPEERROR")
.eq("DONE") .or(mapSheetMngHstEntity.syncState.eq("SIZEERROR"))))
.and( .then(1L)
mapSheetMngHstEntity .otherwise(0L)
.syncState .sum(),
.eq("TYPEERROR") new CaseBuilder()
.or(mapSheetMngHstEntity.syncState.eq("SIZEERROR")))) .when(mapSheetMngHstEntity.syncState.eq("NOFILE"))
.then(1L) .then(1L)
.otherwise(0L) .otherwise(0L)
.sum(), .sum(),
new CaseBuilder()
new CaseBuilder() .when(
.when(mapSheetMngHstEntity.syncState.eq("NOFILE")) mapSheetMngHstEntity
.then(1L) .syncCheckState
.otherwise(0L) .eq("DONE")
.sum(), .and(mapSheetMngHstEntity.syncState.eq("NOFILE")))
new CaseBuilder() .then(1L)
.when( .otherwise(0L)
mapSheetMngHstEntity .sum(),
.syncCheckState mapSheetMngEntity.createdDttm,
.eq("DONE") mapSheetMngHstEntity.syncEndDttm.max()))
.and(mapSheetMngHstEntity.syncState.eq("NOFILE")))
.then(1L)
.otherwise(0L)
.sum(),
mapSheetMngEntity.createdDttm,
mapSheetMngHstEntity.syncEndDttm.max()))
.from(mapSheetMngEntity) .from(mapSheetMngEntity)
.leftJoin(mapSheetMngHstEntity) .leftJoin(mapSheetMngHstEntity)
.on(mapSheetMngEntity.mngYyyy.eq(mapSheetMngHstEntity.mngYyyy)) .on(mapSheetMngEntity.mngYyyy.eq(mapSheetMngHstEntity.mngYyyy))
@@ -339,7 +323,7 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
mapSheetMngHstEntity.syncState.ne("DONE").and(mapSheetMngHstEntity.syncState.ne("NOTYET"))); mapSheetMngHstEntity.syncState.ne("DONE").and(mapSheetMngHstEntity.syncState.ne("NOTYET")));
if (searchReq.getSyncState() != null && !searchReq.getSyncState().isEmpty()) { if (searchReq.getSyncState() != null && !searchReq.getSyncState().isEmpty()) {
whereBuilder.and(mapSheetMngHstEntity.syncState.eq(searchReq.getSyncState())); whereBuilder.and(mapSheetMngHstEntity.syncState.eq(searchReq.getSyncState()));
} }
if (searchReq.getSyncCheckState() != null && !searchReq.getSyncCheckState().isEmpty()) { if (searchReq.getSyncCheckState() != null && !searchReq.getSyncCheckState().isEmpty()) {