|
|
|
@ -1835,7 +1835,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* DB 데이터내에 가장 많은 비행시간을 가진 기체, 비행시간 SELECT |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public FlightStcsValueModel getFlightTimeStcs(boolean authCheck, String groupId){ |
|
|
|
|
public FlightStcsValueModel getFlightTimeStcs(boolean authCheck, String serviceType){ |
|
|
|
|
FlightStcsValueModel result = new FlightStcsValueModel(); |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
@ -1843,7 +1843,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> queryResult = query |
|
|
|
@ -1872,19 +1872,15 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
String idntfNum = result.getName(); |
|
|
|
|
|
|
|
|
|
String day = getFltTimeDay(idntfNum, authCheck, groupId); |
|
|
|
|
String month = getFltTimeMonth(idntfNum, authCheck, groupId); |
|
|
|
|
String year = getFltTimeYear(idntfNum, authCheck, groupId); |
|
|
|
|
String day = getFltTimeDay(idntfNum, authCheck, serviceType); |
|
|
|
|
String month = getFltTimeMonth(idntfNum, authCheck, serviceType); |
|
|
|
|
String year = getFltTimeYear(idntfNum, authCheck, serviceType); |
|
|
|
|
|
|
|
|
|
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; |
|
|
|
|
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); |
|
|
|
@ -1903,7 +1899,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private String getFltTimeDay(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private String getFltTimeDay(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -1911,7 +1907,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
String dateFormat = "%Y-%m-%d"; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
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) |
|
|
|
@ -1934,18 +1930,16 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.fetchOne()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private String getFltTimeMonth(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private String getFltTimeMonth(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
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())); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return String.valueOf(query |
|
|
|
@ -1965,7 +1959,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.fetchOne()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private String getFltTimeYear(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private String getFltTimeYear(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -1974,7 +1968,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return String.valueOf(query |
|
|
|
@ -1998,7 +1992,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* 가장 많이 이동한 기체 |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public FlightStcsValueModel getFlightDistanceStcs(boolean authCheck, String groupId){ |
|
|
|
|
public FlightStcsValueModel getFlightDistanceStcs(boolean authCheck, String serviceType){ |
|
|
|
|
FlightStcsValueModel result = new FlightStcsValueModel(); |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
@ -2006,7 +2000,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2032,9 +2026,9 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
String idntfNum = result.getName(); |
|
|
|
|
|
|
|
|
|
Double year = getFltDistanceYear(idntfNum, authCheck, groupId); |
|
|
|
|
Double month = getFltDistanceMonth(idntfNum, authCheck, groupId); |
|
|
|
|
Double day =getFltDistanceDay(idntfNum, authCheck, groupId); |
|
|
|
|
Double year = getFltDistanceYear(idntfNum, authCheck, serviceType); |
|
|
|
|
Double month = getFltDistanceMonth(idntfNum, authCheck, serviceType); |
|
|
|
|
Double day =getFltDistanceDay(idntfNum, authCheck, serviceType); |
|
|
|
|
|
|
|
|
|
year = year == null ? 0.0 : year; |
|
|
|
|
month = month == null ? 0.0 : month; |
|
|
|
@ -2057,7 +2051,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Double getFltDistanceDay(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private Double getFltDistanceDay(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -2065,7 +2059,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
String dateFormat = "%Y-%m-%d"; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
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) |
|
|
|
@ -2084,7 +2078,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.fetchOne(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Double getFltDistanceMonth(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private Double getFltDistanceMonth(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -2093,7 +2087,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return query |
|
|
|
@ -2110,7 +2104,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.fetchOne(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Double getFltDistanceYear(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private Double getFltDistanceYear(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -2119,7 +2113,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return query |
|
|
|
@ -2139,7 +2133,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* 가장 많이 비행한 기체 |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public FlightStcsValueModel getFlightCountStcs(boolean authCheck, String groupId){ |
|
|
|
|
public FlightStcsValueModel getFlightCountStcs(boolean authCheck, String serviceType){ |
|
|
|
|
FlightStcsValueModel result = new FlightStcsValueModel(); |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
@ -2147,7 +2141,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> queryResult = query |
|
|
|
@ -2173,9 +2167,9 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
String idntfNum = result.getName(); |
|
|
|
|
|
|
|
|
|
result.setYear(getFltCountYear(idntfNum, authCheck, groupId)); |
|
|
|
|
result.setMonth(getFltCountMonth(idntfNum, authCheck, groupId)); |
|
|
|
|
result.setDay(getFltCountDay(idntfNum, authCheck, groupId)); |
|
|
|
|
result.setYear(getFltCountYear(idntfNum, authCheck, serviceType)); |
|
|
|
|
result.setMonth(getFltCountMonth(idntfNum, authCheck, serviceType)); |
|
|
|
|
result.setDay(getFltCountDay(idntfNum, authCheck, serviceType)); |
|
|
|
|
} else { |
|
|
|
|
FlightStcsValueModel node = new FlightStcsValueModel(); |
|
|
|
|
node.setName("-"); |
|
|
|
@ -2189,7 +2183,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Long getFltCountDay(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private Long getFltCountDay(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -2201,10 +2195,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
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(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return query |
|
|
|
@ -2220,7 +2211,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.fetchOne(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Long getFltCountMonth(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private Long getFltCountMonth(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -2229,7 +2220,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return query |
|
|
|
@ -2245,7 +2236,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.fetchOne(); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private Long getFltCountYear(String idntfNum, boolean authCheck, String groupId){ |
|
|
|
|
private Long getFltCountYear(String idntfNum, boolean authCheck, String serviceType){ |
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
@ -2254,7 +2245,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
builder.and(qCtrCntrlBas.idntfNum.eq(idntfNum)); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
builder.and(qCtrCntrlBas.createDt.loe(LocalDate.now().atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant())); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
return query |
|
|
|
@ -2279,7 +2270,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* @param formatParam |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<FlightStcsValueModel> fltTimeStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
public List<FlightStcsValueModel> fltTimeStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
@ -2297,7 +2288,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
@ -2339,7 +2330,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* @param formatParam |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<FlightStcsValueModel> fltDistanceStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
public List<FlightStcsValueModel> fltDistanceStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
@ -2357,7 +2348,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
@ -2395,7 +2386,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* @param formatParam |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<FlightStcsValueModel> fltCountStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
public List<FlightStcsValueModel> fltCountStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
@ -2413,7 +2404,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
@ -2451,7 +2442,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* @param formatParam |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<FlightStcsValueModel> fltTopTimeStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
public List<FlightStcsValueModel> fltTopTimeStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
@ -2464,7 +2455,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
@ -2511,7 +2502,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* @param formatParam |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<FlightStcsValueModel> fltTopDistanceStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
public List<FlightStcsValueModel> fltTopDistanceStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
@ -2524,7 +2515,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2564,7 +2555,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
* @param formatParam |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<FlightStcsValueModel> fltTopCountStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
public List<FlightStcsValueModel> fltTopCountStcs(String date, String serviceType, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
@ -2577,7 +2568,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType)); |
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
@ -2660,7 +2651,8 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
.where( |
|
|
|
|
fpb.aprvlYn.eq("Y"), |
|
|
|
|
fpccr.planSno.isNull(), |
|
|
|
|
ccb.cntrlEndDt.between(start, end), |
|
|
|
|
ccb.statusCd.isNull(), |
|
|
|
|
ccb.cntrlId.isNull(), |
|
|
|
|
fpb.aprvlDt.between(start, end) |
|
|
|
|
) |
|
|
|
|
.fetch(); |
|
|
|
|