diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java index 43f1ddb..ac9bafd 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java @@ -1870,9 +1870,22 @@ public List listCntrlHstry(String id){ String idntfNum = result.getName(); - result.setDay(getFltTimeDay(idntfNum, authCheck, groupId)); - result.setYear(getFltTimeYear(idntfNum, authCheck, groupId)); - result.setMonth(getFltTimeMonth(idntfNum, authCheck, groupId)); + String day = getFltTimeDay(idntfNum, authCheck, groupId); + String month = getFltTimeMonth(idntfNum, authCheck, groupId); + String year = getFltTimeYear(idntfNum, authCheck, groupId); + + day = day == null | day.equals("null") ? "00:00:00" : day; + month = month == null | month.equals("null") ? "00:00:00" : month; + year = year == null | year.equals("null") ? "00:00:00" : year; + + + log.warn("day => {}", day); + log.warn("month => {}", month); + log.warn("day => {}", day); + + result.setDay(day); + result.setYear(year); + result.setMonth(month); } else { FlightStcsValueModel node = new FlightStcsValueModel(); @@ -1888,18 +1901,21 @@ public List listCntrlHstry(String id){ return result; } - private Long getFltTimeDay(String idntfNum, boolean authCheck, String groupId){ + private String getFltTimeDay(String idntfNum, boolean authCheck, String groupId){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); - builder.and(qCtrCntrlBas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); + builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlBas.createDt, dateFormat) + .eq(LocalDate.now().toString())); - return Long.parseLong(query + return String.valueOf(query .select( Expressions.stringTemplate( "CONCAT(SEC_TO_TIME(SUM(TIME_TO_SEC(TIMEDIFF({0}, {1})))))", @@ -1916,11 +1932,13 @@ public List listCntrlHstry(String id){ .fetchOne()); } - private Long getFltTimeMonth(String idntfNum, boolean authCheck, String groupId){ + private String getFltTimeMonth(String idntfNum, boolean authCheck, String groupId){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); @@ -1928,7 +1946,7 @@ public List listCntrlHstry(String id){ if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); - return Long.parseLong(query + return String.valueOf(query .select( Expressions.stringTemplate( "CONCAT(SEC_TO_TIME(SUM(TIME_TO_SEC(TIMEDIFF({0}, {1})))))", @@ -1945,7 +1963,7 @@ public List listCntrlHstry(String id){ .fetchOne()); } - private Long getFltTimeYear(String idntfNum, boolean authCheck, String groupId){ + private String getFltTimeYear(String idntfNum, boolean authCheck, String groupId){ QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; @@ -1957,7 +1975,7 @@ public List listCntrlHstry(String id){ if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); - return Long.parseLong(query + return String.valueOf(query .select( Expressions.stringTemplate( "CONCAT(SEC_TO_TIME(SUM(TIME_TO_SEC(TIMEDIFF({0}, {1})))))", @@ -2012,9 +2030,18 @@ public List listCntrlHstry(String id){ String idntfNum = result.getName(); - result.setYear(getFltDistanceYear(idntfNum, authCheck, groupId)); - result.setMonth(getFltDistanceMonth(idntfNum, authCheck, groupId)); - result.setDay(getFltDistanceDay(idntfNum, authCheck, groupId)); + Double year = getFltDistanceYear(idntfNum, authCheck, groupId); + Double month = getFltDistanceMonth(idntfNum, authCheck, groupId); + Double day =getFltDistanceDay(idntfNum, authCheck, groupId); + + year = year == null ? 0.0 : year; + month = month == null ? 0.0 : month; + day = day == null ? 0.0 : day; + + + result.setYear(year); + result.setMonth(month); + result.setDay(day); } else { FlightStcsValueModel node = new FlightStcsValueModel(); node.setName("-"); @@ -2033,11 +2060,14 @@ public List listCntrlHstry(String id){ QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); - builder.and(qCtrCntrlBas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); + builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlBas.createDt, dateFormat) + .eq(LocalDate.now().toString())); return query .select( @@ -2162,9 +2192,16 @@ public List listCntrlHstry(String id){ QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); - builder.and(qCtrCntrlBas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); + builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlBas.createDt, dateFormat) + .eq(LocalDate.now().toString())); + + + + log.warn("LocalDate.now().atStartOfDay() => {}", LocalDate.now().atStartOfDay()); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java index 2cd4d36..8039004 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java @@ -97,12 +97,15 @@ public class CtrCntrlWarnLogQueryRepository { QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(bas.idntfNum.eq(idntfNum)); - builder.and(bas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - builder.and(bas.warnType.eq(cate)); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); + builder.and(bas.idntfNum.eq(idntfNum)); + builder.and(bas.warnType.eq(cate)); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", bas.createDt, dateFormat) + .eq(LocalDate.now().toString())); return query .select( diff --git a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java index bb96b93..98a65b0 100644 --- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java +++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java @@ -62,11 +62,6 @@ import com.querydsl.core.types.ConstantImpl; import com.querydsl.core.types.Expression; import com.querydsl.core.types.ExpressionUtils; import com.querydsl.core.types.Projections; -import com.querydsl.core.types.dsl.CaseBuilder; -import com.querydsl.core.types.dsl.ComparableExpressionBase; -import com.querydsl.core.types.dsl.DateTemplate; -import com.querydsl.core.types.dsl.Expressions; -import com.querydsl.core.types.dsl.StringTemplate; import com.querydsl.jpa.JPAExpressions; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -1248,12 +1243,15 @@ public class FltPlanQueryRepository { QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(qFltPlanCtrCntrlRel.idntfNum.eq(idntfNum)); - builder.and(qFltPlanBas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); - builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull()); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); + builder.and(qFltPlanCtrCntrlRel.idntfNum.eq(idntfNum)); + builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull()); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qFltPlanBas.createDt, dateFormat) + .eq(LocalDate.now().toString())); return query .select( @@ -1370,11 +1368,14 @@ public class FltPlanQueryRepository { QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(bas.idntfNum.eq(idntfNum.trim())); - builder.and(bas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); + builder.and(bas.idntfNum.eq(idntfNum.trim())); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", bas.createDt, dateFormat) + .eq(LocalDate.now().toString())); return query .select( @@ -1491,12 +1492,15 @@ public class FltPlanQueryRepository { QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft; QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; + String dateFormat = "%Y-%m-%d"; + BooleanBuilder builder = new BooleanBuilder(); - builder.and(qFltPlanArcrft.idntfNum.eq(idntfNum)); - builder.and(qFltPlanBas.aprvlYn.eq("Y")); - builder.and(qFltPlanBas.createDt.eq(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); + builder.and(qFltPlanArcrft.idntfNum.eq(idntfNum)); + builder.and(qFltPlanBas.aprvlYn.eq("Y")); + builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qFltPlanBas.createDt, dateFormat) + .eq(LocalDate.now().toString())); return query .select(