From 1f381459d6b0edda5a37c2bcf99f598470eb7254 Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 22 Dec 2025 18:36:07 +0900 Subject: [PATCH 1/3] =?UTF-8?q?log=20=ED=8C=8C=EC=9D=BC=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/logback-spring.xml | 85 --------------------------- 1 file changed, 85 deletions(-) delete mode 100644 src/main/resources/logback-spring.xml diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml deleted file mode 100644 index 0a37bd4a..00000000 --- a/src/main/resources/logback-spring.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - ${LOG_PATTERN} - - - - - - - - ${LOG_PATH}/application.log - - - - ${LOG_PATH}/application.%d{yyyy-MM-dd}.log - - 30 - - - - ${LOG_PATTERN} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 783aede6236904e7301937deb048becddc444aa0 Mon Sep 17 00:00:00 2001 From: Moon Date: Mon, 22 Dec 2025 18:49:51 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=85=84=EB=8F=84=EB=B3=84=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../postgres/core/MapSheetMngCoreService.java | 1 + .../mapsheet/MapSheetMngRepositoryCustom.java | 2 + .../mapsheet/MapSheetMngRepositoryImpl.java | 65 +++++++------------ 3 files changed, 25 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java index 4ae78bf3..047b5231 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/MapSheetMngCoreService.java @@ -229,6 +229,7 @@ public class MapSheetMngCoreService { MapSheetMngEntity saved = mapSheetMngRepository.save(entity); int hstCnt = mapSheetMngRepository.insertMapSheetOrgDataToMapSheetMngHst(saved.getMngYyyy()); + mapSheetMngRepository.updateYearState(saved.getMngYyyy(), "DONE"); return new MapSheetMngDto.DmlReturn("success", saved.getMngYyyy().toString()); } diff --git 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 index 114cbdea..b26508da 100644 --- 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 @@ -43,6 +43,8 @@ public interface MapSheetMngRepositoryCustom { void updateByHstUidMngFileState(Long hstUid, String fileState); + void updateYearState(int yyyy, String status); + Page findMapSheetErrorList( MapSheetMngDto.@Valid ErrorSearchReq searchReq); diff --git 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 index 165bbc8e..c06debf0 100644 --- 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 @@ -5,7 +5,10 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapInkx5kEntity.mapInkx5kE import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngEntity.mapSheetMngEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngFileEntity.mapSheetMngFileEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity; +import static com.kamco.cd.kamcoback.postgres.entity.QYearEntity.yearEntity; +import static java.lang.String.CASE_INSENSITIVE_ORDER; +import com.kamco.cd.kamcoback.common.utils.FIleChecker.Folder; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity; import com.querydsl.core.BooleanBuilder; @@ -22,6 +25,7 @@ import jakarta.validation.Valid; import java.time.LocalDate; import java.time.ZonedDateTime; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.Optional; @@ -173,57 +177,32 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport public List findMapSheetMngYyyyList() { - /* List foundContent = - queryFactory - .select(mapSheetMngEntity.mngYyyy) - .from(mapSheetMngEntity) - .where(mapSheetMngEntity.mngState.ne("COMPLETE")) - .orderBy(mapSheetMngEntity.mngYyyy.desc()) - .fetch(); - */ + queryFactory + .select(yearEntity.yyyy) + .from(yearEntity) + .leftJoin(mapSheetMngEntity).on(mapSheetMngEntity.mngYyyy.eq(yearEntity.yyyy)) + .where(yearEntity.status.eq("NOTYET")) + .orderBy(yearEntity.yyyy.asc()) + .limit(10) + .fetch(); - int currentYear = LocalDate.now().getYear(); - List foundContentCurrent = - queryFactory - .select(mapSheetMngEntity.mngYyyy) - .from(mapSheetMngEntity) - .where(mapSheetMngEntity.mngYyyy.eq(currentYear)) - .orderBy(mapSheetMngEntity.mngYyyy.desc()) - .fetch(); - List foundContent1 = - queryFactory - .select(mapSheetMngEntity.mngYyyy) - .from(mapSheetMngEntity) - .where( - mapSheetMngEntity - .mngYyyy - .ne(currentYear) - .and( - mapSheetMngEntity - .mngState - .ne("NOTYET") - .or(mapSheetMngEntity.mngState.ne("DELETE")))) - .orderBy(mapSheetMngEntity.mngYyyy.desc()) - .fetch(); - - // if( foundContentCurrent == null || foundContentCurrent.size() == 0) - // { - // foundContent.add(currentYear); - // } - - List foundContent = new ArrayList<>(); - - foundContent.add(2025); - foundContent.add(2024); - foundContent.add(2023); - foundContent.add(2022); + foundContent.sort(Comparator.reverseOrder()); return foundContent; } + public void updateYearState(int yyyy, String status){ + long execCount = + queryFactory + .update(yearEntity) + .set(yearEntity.status, status) + .where(yearEntity.yyyy.eq(yyyy)) + .execute(); + } + public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) { BooleanBuilder whereBuilder = new BooleanBuilder(); From 6e94480bb03ebacf9f61ec77c32673ff9de7f209 Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 22 Dec 2025 18:51:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=98=81=EC=83=81=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapsheet/MapSheetMngRepositoryImpl.java | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git 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 index c06debf0..dd22e418 100644 --- 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 @@ -6,9 +6,7 @@ import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngEntity.mapSheet import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngFileEntity.mapSheetMngFileEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetMngHstEntity.mapSheetMngHstEntity; import static com.kamco.cd.kamcoback.postgres.entity.QYearEntity.yearEntity; -import static java.lang.String.CASE_INSENSITIVE_ORDER; -import com.kamco.cd.kamcoback.common.utils.FIleChecker.Folder; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto; import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity; import com.querydsl.core.BooleanBuilder; @@ -22,9 +20,7 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import jakarta.validation.Valid; -import java.time.LocalDate; import java.time.ZonedDateTime; -import java.util.ArrayList; import java.util.Comparator; import java.util.List; import java.util.Objects; @@ -178,29 +174,28 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport public List findMapSheetMngYyyyList() { List foundContent = - queryFactory - .select(yearEntity.yyyy) - .from(yearEntity) - .leftJoin(mapSheetMngEntity).on(mapSheetMngEntity.mngYyyy.eq(yearEntity.yyyy)) - .where(yearEntity.status.eq("NOTYET")) - .orderBy(yearEntity.yyyy.asc()) - .limit(10) - .fetch(); - - + queryFactory + .select(yearEntity.yyyy) + .from(yearEntity) + .leftJoin(mapSheetMngEntity) + .on(mapSheetMngEntity.mngYyyy.eq(yearEntity.yyyy)) + .where(yearEntity.status.eq("NOTYET")) + .orderBy(yearEntity.yyyy.asc()) + .limit(10) + .fetch(); foundContent.sort(Comparator.reverseOrder()); return foundContent; } - public void updateYearState(int yyyy, String status){ + public void updateYearState(int yyyy, String status) { long execCount = - queryFactory - .update(yearEntity) - .set(yearEntity.status, status) - .where(yearEntity.yyyy.eq(yyyy)) - .execute(); + queryFactory + .update(yearEntity) + .set(yearEntity.status, status) + .where(yearEntity.yyyy.eq(yyyy)) + .execute(); } public MapSheetMngDto.MngDto findMapSheetMng(int mngYyyy) {