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

Merge pull request '영상관리 수정' (#91) from feat/dev_251201 into develop

Browse Source 
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/91
This commit is contained in:
teddy.kim
2025-12-22 18:51:40 +09:00
parent 485b06eafe 6e94480bb0
commit 78cfc2df48
4 changed files with 22 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}

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

@@ -43,6 +43,8 @@ public interface MapSheetMngRepositoryCustom {
void updateByHstUidMngFileState(Long hstUid, String fileState);
void updateYearState(int yyyy, String status);
Page<MapSheetMngDto.ErrorDataDto> findMapSheetErrorList(
MapSheetMngDto.@Valid ErrorSearchReq searchReq);

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

@@ -5,6 +5,7 @@ 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 com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto;
import com.kamco.cd.kamcoback.postgres.entity.MapSheetMngHstEntity;
@@ -19,9 +20,8 @@ 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;
import java.util.Optional;
@@ -173,57 +173,31 @@ public class MapSheetMngRepositoryImpl extends QuerydslRepositorySupport
public List<Integer> findMapSheetMngYyyyList() {
/*
List<Integer> foundContent =
queryFactory
.select(mapSheetMngEntity.mngYyyy)
.from(mapSheetMngEntity)
.where(mapSheetMngEntity.mngState.ne("COMPLETE"))
.orderBy(mapSheetMngEntity.mngYyyy.desc())
.fetch();
*/
int currentYear = LocalDate.now().getYear();
List<Integer> foundContentCurrent =
queryFactory
.select(mapSheetMngEntity.mngYyyy)
.from(mapSheetMngEntity)
.where(mapSheetMngEntity.mngYyyy.eq(currentYear))
.orderBy(mapSheetMngEntity.mngYyyy.desc())
.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();
List<Integer> 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<Integer> 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();

85
src/main/resources/logback-spring.xml
View File

@@ -1,85 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="30 seconds">
<!-- 공통 변수 -->
<property name="LOG_PATH" value="./logs"/>
<property name="LOG_PATTERN"
value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n"/>
<!-- ========================= -->
<!-- 콘솔 로그 (공통) -->
<!-- ========================= -->
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- ========================= -->
<!-- 파일 로그 (공통) -->
<!-- ========================= -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/application.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 일 단위 로테이션 -->
<fileNamePattern>${LOG_PATH}/application.%d{yyyy-MM-dd}.log</fileNamePattern>
<!-- 보관 기간 -->
<maxHistory>30</maxHistory>
</rollingPolicy>
<encoder>
<pattern>${LOG_PATTERN}</pattern>
</encoder>
</appender>
<!-- ========================= -->
<!-- 개발 서버 설정 (local) -->
<!-- ========================= -->
<springProfile name="local">
<!-- SQL, 디버그 로그 상세 -->
<logger name="org.springframework" level="INFO"/>
<logger name="org.hibernate.SQL" level="DEBUG"/>
<logger name="org.hibernate.type.descriptor.sql" level="TRACE"/>
<logger name="com.zaxxer.hikari" level="DEBUG"/>
<logger name="jdbc.sqlonly" level="DEBUG"/>
<root level="DEBUG">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
</springProfile>
<!-- ========================= -->
<!-- 개발 서버 설정 (dev) -->
<!-- ========================= -->
<springProfile name="dev">
<!-- SQL, 디버그 로그 상세 -->
<logger name="org.springframework" level="INFO"/>
<logger name="org.hibernate.SQL" level="DEBUG"/>
<logger name="org.hibernate.type.descriptor.sql" level="TRACE"/>
<logger name="com.zaxxer.hikari" level="DEBUG"/>
<logger name="jdbc.sqlonly" level="DEBUG"/>
<root level="DEBUG">
<appender-ref ref="CONSOLE"/>
<appender-ref ref="FILE"/>
</root>
</springProfile>
<!-- ========================= -->
<!-- 운영 서버 설정 (prod) -->
<!-- ========================= -->
<springProfile name="prod">
<!-- 불필요한 로그 최소화 -->
<logger name="org.springframework" level="WARN"/>
<logger name="org.hibernate" level="WARN"/>
<logger name="com.zaxxer.hikari" level="WARN"/>
<root level="INFO">
<appender-ref ref="FILE"/>
</root>
</springProfile>
</configuration>