|
|
|
@ -1872,9 +1872,22 @@ public List<AnlsHstryDetailModel> 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(); |
|
|
|
@ -1890,18 +1903,21 @@ public List<AnlsHstryDetailModel> 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})))))", |
|
|
|
@ -1918,11 +1934,13 @@ public List<AnlsHstryDetailModel> 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())); |
|
|
|
@ -1930,7 +1948,7 @@ public List<AnlsHstryDetailModel> 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})))))", |
|
|
|
@ -1947,7 +1965,7 @@ public List<AnlsHstryDetailModel> 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; |
|
|
|
@ -1959,7 +1977,7 @@ public List<AnlsHstryDetailModel> 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})))))", |
|
|
|
@ -2014,9 +2032,18 @@ public List<AnlsHstryDetailModel> 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("-"); |
|
|
|
@ -2035,11 +2062,14 @@ public List<AnlsHstryDetailModel> 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( |
|
|
|
@ -2164,9 +2194,16 @@ public List<AnlsHstryDetailModel> 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(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())); |
|
|
|
|
|
|
|
|
|