|
|
@ -71,6 +71,7 @@ public class CtrCntrlQueryRepository{ |
|
|
|
|
|
|
|
|
|
|
|
@Autowired |
|
|
|
@Autowired |
|
|
|
private JwtTokenUtil jwtTokenUtil; |
|
|
|
private JwtTokenUtil jwtTokenUtil; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* 비행 현황 데이터 조회 |
|
|
|
* 비행 현황 데이터 조회 |
|
|
|
* @param rq |
|
|
|
* @param rq |
|
|
@ -1838,7 +1839,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
if(groupId != null && groupId.equals("")) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> queryResult = query |
|
|
|
List<FlightStcsValueModel> queryResult = query |
|
|
@ -1961,7 +1962,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
if(groupId != null && groupId.equals("")) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -2066,7 +2067,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
if(groupId != null && groupId.equals("")) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> queryResult = query |
|
|
|
List<FlightStcsValueModel> queryResult = query |
|
|
@ -2167,22 +2168,26 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
* @param formatParam |
|
|
|
* @param formatParam |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public List<FlightStcsValueModel> fltTimeStcs(String date, String[] formatParam){ |
|
|
|
public List<FlightStcsValueModel> fltTimeStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
// QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas;
|
|
|
|
|
|
|
|
QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
|
|
StringTemplate formattedDate = Expressions.stringTemplate( |
|
|
|
StringTemplate formattedDate = Expressions.stringTemplate( |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
, bas.createDt |
|
|
|
, qCtrCntrlBas.createDt |
|
|
|
, ConstantImpl.create(formatParam[0])); |
|
|
|
, ConstantImpl.create(formatParam[0])); |
|
|
|
|
|
|
|
|
|
|
|
StringTemplate formattedDate2 = Expressions.stringTemplate( |
|
|
|
StringTemplate formattedDate2 = Expressions.stringTemplate( |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
, bas.createDt |
|
|
|
, qCtrCntrlBas.createDt |
|
|
|
, ConstantImpl.create(formatParam[1])); |
|
|
|
, ConstantImpl.create(formatParam[1])); |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
|
|
|
if(groupId != null && groupId.equals("")) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
.select( |
|
|
|
.select( |
|
|
@ -2191,12 +2196,16 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
formattedDate2.as("name"), |
|
|
|
formattedDate2.as("name"), |
|
|
|
Expressions.stringTemplate( |
|
|
|
Expressions.stringTemplate( |
|
|
|
"CONCAT(SEC_TO_TIME(SUM(TIME_TO_SEC(TIMEDIFF({0}, {1})))))", |
|
|
|
"CONCAT(SEC_TO_TIME(SUM(TIME_TO_SEC(TIMEDIFF({0}, {1})))))", |
|
|
|
bas.cntrlEndDt, |
|
|
|
qCtrCntrlBas.cntrlEndDt, |
|
|
|
bas.cntrlStDt |
|
|
|
qCtrCntrlBas.cntrlStDt |
|
|
|
).as("value") |
|
|
|
).as("value") |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
.from(bas) |
|
|
|
.from(qCtrCntrlBas) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanCtrCntrlRel) |
|
|
|
|
|
|
|
.on(qCtrCntrlBas.cntrlId.eq(qFltPlanCtrCntrlRel.cntrlId)) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanBas) |
|
|
|
|
|
|
|
.on(qFltPlanCtrCntrlRel.planSno.eq(qFltPlanBas.planSno)) |
|
|
|
.where(builder) |
|
|
|
.where(builder) |
|
|
|
.groupBy(formattedDate2) |
|
|
|
.groupBy(formattedDate2) |
|
|
|
.fetch(); |
|
|
|
.fetch(); |
|
|
@ -2219,32 +2228,40 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
* @param formatParam |
|
|
|
* @param formatParam |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public List<FlightStcsValueModel> fltDistanceStcs(String date, String[] formatParam){ |
|
|
|
public List<FlightStcsValueModel> fltDistanceStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
|
|
QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
|
|
StringTemplate formattedDate = Expressions.stringTemplate( |
|
|
|
StringTemplate formattedDate = Expressions.stringTemplate( |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
, bas.createDt |
|
|
|
, qCtrCntrlBas.createDt |
|
|
|
, ConstantImpl.create(formatParam[0])); |
|
|
|
, ConstantImpl.create(formatParam[0])); |
|
|
|
|
|
|
|
|
|
|
|
StringTemplate formattedDate2 = Expressions.stringTemplate( |
|
|
|
StringTemplate formattedDate2 = Expressions.stringTemplate( |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
, bas.createDt |
|
|
|
, qCtrCntrlBas.createDt |
|
|
|
, ConstantImpl.create(formatParam[1])); |
|
|
|
, ConstantImpl.create(formatParam[1])); |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
|
|
|
if(groupId != null && groupId.equals("")) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
.select( |
|
|
|
.select( |
|
|
|
Projections.bean( |
|
|
|
Projections.bean( |
|
|
|
FlightStcsValueModel.class , |
|
|
|
FlightStcsValueModel.class , |
|
|
|
formattedDate2.as("name"), |
|
|
|
formattedDate2.as("name"), |
|
|
|
bas.ttlDstnc.sum().as("value") |
|
|
|
qCtrCntrlBas.ttlDstnc.sum().as("value") |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
.from(bas) |
|
|
|
.from(qCtrCntrlBas) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanCtrCntrlRel) |
|
|
|
|
|
|
|
.on(qCtrCntrlBas.cntrlId.eq(qFltPlanCtrCntrlRel.cntrlId)) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanBas) |
|
|
|
|
|
|
|
.on(qFltPlanCtrCntrlRel.planSno.eq(qFltPlanBas.planSno)) |
|
|
|
.where(builder) |
|
|
|
.where(builder) |
|
|
|
.groupBy(formattedDate2) |
|
|
|
.groupBy(formattedDate2) |
|
|
|
.fetch(); |
|
|
|
.fetch(); |
|
|
@ -2267,32 +2284,40 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
* @param formatParam |
|
|
|
* @param formatParam |
|
|
|
* @return |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public List<FlightStcsValueModel> fltCountStcs(String date, String[] formatParam){ |
|
|
|
public List<FlightStcsValueModel> fltCountStcs(String date, String groupId, boolean authCheck, String[] formatParam){ |
|
|
|
|
|
|
|
|
|
|
|
QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
QCtrCntrlBas qCtrCntrlBas = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
|
|
StringTemplate formattedDate = Expressions.stringTemplate( |
|
|
|
StringTemplate formattedDate = Expressions.stringTemplate( |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
, bas.createDt |
|
|
|
, qCtrCntrlBas.createDt |
|
|
|
, ConstantImpl.create(formatParam[0])); |
|
|
|
, ConstantImpl.create(formatParam[0])); |
|
|
|
|
|
|
|
|
|
|
|
StringTemplate formattedDate2 = Expressions.stringTemplate( |
|
|
|
StringTemplate formattedDate2 = Expressions.stringTemplate( |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
"DATE_FORMAT({0}, {1})" |
|
|
|
, bas.createDt |
|
|
|
, qCtrCntrlBas.createDt |
|
|
|
, ConstantImpl.create(formatParam[1])); |
|
|
|
, ConstantImpl.create(formatParam[1])); |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date)); |
|
|
|
|
|
|
|
if(groupId != null && groupId.equals("")) builder.and(qFltPlanBas.groupId.eq(groupId)); |
|
|
|
|
|
|
|
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken())); |
|
|
|
|
|
|
|
|
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
List<FlightStcsValueModel> result = query |
|
|
|
.select( |
|
|
|
.select( |
|
|
|
Projections.bean( |
|
|
|
Projections.bean( |
|
|
|
FlightStcsValueModel.class , |
|
|
|
FlightStcsValueModel.class , |
|
|
|
formattedDate2.as("name"), |
|
|
|
formattedDate2.as("name"), |
|
|
|
bas.cntrlId.count().as("value") |
|
|
|
qCtrCntrlBas.cntrlId.count().as("value") |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
.from(bas) |
|
|
|
.from(qCtrCntrlBas) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanCtrCntrlRel) |
|
|
|
|
|
|
|
.on(qCtrCntrlBas.cntrlId.eq(qFltPlanCtrCntrlRel.cntrlId)) |
|
|
|
|
|
|
|
.leftJoin(qFltPlanBas) |
|
|
|
|
|
|
|
.on(qFltPlanCtrCntrlRel.planSno.eq(qFltPlanBas.planSno)) |
|
|
|
.where(builder) |
|
|
|
.where(builder) |
|
|
|
.groupBy(formattedDate2) |
|
|
|
.groupBy(formattedDate2) |
|
|
|
.fetch(); |
|
|
|
.fetch(); |
|
|
|