pav
/
pav-be-kac
12
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity
Browse Source

Merge branch 'develop' of http://gitea.palntour.com/pav/pav-be-kac.git into develop

pull/16/head
박재우 10 months ago
parent
a6eef7d349 033a500423
commit
0f3e6ef86c
10 changed files with 248 additions and 223 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
  2. 24
      pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashPlanNumStcsModel.java
  3. 25
      pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashWarnNumStcsModel.java
  4. 52
      pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
  5. 39
      pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java
  6. 2
      pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsRQ.java
  7. 84
      pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java
  8. 114
      pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
  9. 39
      pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java
  10. 81
      pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

11
pav-server/src/main/java/com/palnet/biz/api/main/dash/controller/MainDashController.java
Unescape View File

@ -344,7 +344,7 @@ public class MainDashController {
})
public ResponseEntity<? extends BasicResponse> currentFlightWarn(@RequestParam(required = false) String groupId){
List<MainCurrentStcsModel> result = new ArrayList<>();
List<MainDashWarnNumStcsModel> result = new ArrayList<>();
try {
result = service.currentFlightWarn(groupId);
@ -354,7 +354,7 @@ public class MainDashController {
.body(new ErrorResponse("Server Error", "-1"));
}
return ResponseEntity.ok().body(new SuccessResponse<List<MainCurrentStcsModel>>(result));
return ResponseEntity.ok().body(new SuccessResponse<List<MainDashWarnNumStcsModel>>(result));
}
@GetMapping("/current/flight-plan")
@ -364,9 +364,8 @@ public class MainDashController {
@ApiImplicitParam(name = "groupId",value = "그룹아이디", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> currentFlightPlan(@RequestParam(required = false) String groupId){
log.warn("groupId => {}", groupId);
List<MainCurrentStcsModel> result = new ArrayList<>();
List<MainDashPlanNumStcsModel> result = new ArrayList<>();
try {
result = service.currentFlightPlan(groupId);
} catch (Exception e){
@ -377,7 +376,7 @@ public class MainDashController {
return ResponseEntity.ok().body(new SuccessResponse<List<MainCurrentStcsModel>>(result));
return ResponseEntity.ok().body(new SuccessResponse<List<MainDashPlanNumStcsModel>>(result));
}

24
pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashPlanNumStcsModel.java
Unescape View File

@ -0,0 +1,24 @@
package com.palnet.biz.api.main.dash.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
public class MainDashPlanNumStcsModel {
@ApiParam(value = "구분",example = "전일(어제), 금일(오늘), 명일(내일)")
private String dateType = "";
@ApiParam(value = "제출",example = "전일(어제), 금일(오늘), 명일(내일) 비행계획서 목록")
private int plan = 0;
@ApiParam(value = "승인",example = "전일(어제), 금일(오늘), 명일(내일) 비행승인 목록")
private int aprvn = 0;
@ApiParam(value = "합계",example = "전일(어제), 금일(오늘), 명일(내일) 합계")
private int count = 0;
@ApiParam(value = "비고",example = "전일(어제), 금일(오늘), 명일(내일) 비고")
private double note = 0;
}

25
pav-server/src/main/java/com/palnet/biz/api/main/dash/model/MainDashWarnNumStcsModel.java
Unescape View File

@ -0,0 +1,25 @@
package com.palnet.biz.api.main.dash.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@Data
public class MainDashWarnNumStcsModel {
@ApiParam(value = "구분",example = "전일(어제), 금일(오늘), 명일(내일)")
private String dateType = "";
@ApiParam(value = "경로이탈",example = "전일(어제), 금일(오늘), 명일(내일) 경로이탈")
private int plan = 0;
@ApiParam(value = "고도이탈",example = "전일(어제), 금일(오늘), 명일(내일) 고도이탈")
private int altitude = 0;
@ApiParam(value = "충돌",example = "전일(어제), 금일(오늘), 명일(내일) 충돌")
private int crash = 0;
@ApiParam(value = "합계",example = "전일(어제), 금일(오늘), 명일(내일) 합계")
private int count = 0;
@ApiParam(value = "비고",example = "전일(어제), 금일(오늘), 명일(내일) 비고")
private double note = 0;
}

52
pav-server/src/main/java/com/palnet/biz/api/main/dash/service/MainDashService.java
Unescape View File

@ -278,25 +278,25 @@ public class MainDashService {
public List<MainCurrentStcsModel> currentFlightPlan(String groupId){
final int sumCount = 2; // 2번은 합계
public List<MainDashPlanNumStcsModel> currentFlightPlan(String groupId){
boolean authCheck = mainStatisticsService.authCheck(groupId);
String[] dateCate = {"-2", "-1", "0", "1"}; // 2일전, 전일, 금일, 명일
String[] dateCate = {"beforeYesterday", "yesterday", "today", "tomorrow"}; // 2일전, 전일, 금일, 명일
List<MainCurrentStcsModel> result = new ArrayList<>();
List<MainDashPlanNumStcsModel> result = new ArrayList<>();
for(String cate : dateCate){
List<FltPlanBas> fltPlanBas = fltPlanQueryRepository.currentFlightStcs(groupId, authCheck, cate);
int count = fltPlanBas.size();
int aprvnCount = (int)fltPlanBas.stream().filter(value -> value.getAprvlYn().equals("Y")).count();
List<Integer> stcsValues = Arrays.asList(count, aprvnCount, aprvnCount);
MainCurrentStcsModel node = new MainCurrentStcsModel();
node.setStcsValues(stcsValues);
int plan = fltPlanBas.size();
int aprvnCount = (int)fltPlanBas.stream().filter(value -> value.getAprvlYn().equals("Y")).count();
MainDashPlanNumStcsModel node = new MainDashPlanNumStcsModel();
node.setDateType(cate);
node.setPlan(plan);
node.setCount(aprvnCount); // 합계는 승인된 계획서를 합계로 침.
node.setAprvn(aprvnCount);
result.add(node);
}
@ -305,8 +305,8 @@ public class MainDashService {
if(i == 0) continue;;
int prevSum = result.get(i-1).getStcsValues().get(sumCount); // 전날 합계 [기준]
int sum = result.get(i).getStcsValues().get(sumCount); // 합계
int prevSum = result.get(i-1).getCount(); // 전날 합계 [기준]
int sum = result.get(i).getCount(); // 합계
double percent = 0;
@ -314,7 +314,7 @@ public class MainDashService {
percent = ((sum - prevSum) / (double) prevSum) * 100;
}
result.get(i).setPercent(percent);
result.get(i).setNote(percent);
}
result.remove(0);
@ -325,15 +325,13 @@ public class MainDashService {
public List<MainCurrentStcsModel> currentFlightWarn(String groupId){
final int sumCount = 3; // 3번은 합계
public List<MainDashWarnNumStcsModel> currentFlightWarn(String groupId){
boolean authCheck = mainStatisticsService.authCheck(groupId);
String[] dateCate = {"-2", "-1", "0", "1"};
String[] dateCate = {"beforeYesterday", "yesterday", "today", "tomorrow"}; // 2일전, 전일, 금일, 명일
List<MainCurrentStcsModel> result = new ArrayList<>();
List<MainDashWarnNumStcsModel> result = new ArrayList<>();
for(String cate : dateCate){
List<CtrCntrlWarnLog> cntrlWarnLogs = ctrCntrlWarnLogQueryRepository.currentStcs(groupId, authCheck, cate);
@ -344,10 +342,12 @@ public class MainDashService {
int altitude = (int)cntrlWarnLogs.stream().filter(value -> value.getWarnType().equals(WarnType.ALTITUDE.getValue())).count();
int crash = (int)cntrlWarnLogs.stream().filter(value -> value.getWarnType().equals(WarnType.CRASH.getValue())).count();
List<Integer> stcsValues = Arrays.asList(plan, altitude, crash, count);
MainCurrentStcsModel node = new MainCurrentStcsModel();
node.setStcsValues(stcsValues);
MainDashWarnNumStcsModel node = new MainDashWarnNumStcsModel();
node.setDateType(cate);
node.setPlan(plan);
node.setAltitude(altitude);
node.setCrash(crash);
node.setCount(count);
result.add(node);
}
@ -356,8 +356,8 @@ public class MainDashService {
if(i == 0) continue;;
int prevSum = result.get(i-1).getStcsValues().get(sumCount); // 전날 합계 [기준]
int sum = result.get(i).getStcsValues().get(sumCount); // 합계
int prevSum = result.get(i-1).getCount(); // 전날 합계 [기준]
int sum = result.get(i).getCount(); // 합계
double percent = 0;
@ -365,7 +365,7 @@ public class MainDashService {
percent = ((sum - prevSum) / (double) prevSum) * 100;
}
result.get(i).setPercent(percent);
result.get(i).setNote(percent);
}
result.remove(0);

39
pav-server/src/main/java/com/palnet/biz/api/main/statistics/controller/MainStatisticsController.java
Unescape View File

@ -38,16 +38,12 @@ public class MainStatisticsController {
@GetMapping("/flight-static")
@ApiOperation(value = "비행통계 상단 데이터[DB전체 통계데이터]")
@Tag(name = "통계 컨트롤러", description = "통계 관련 API")
public ResponseEntity<? extends BasicResponse> fltStcsStatic(String groupId){
log.warn("GroupNm => {}", groupId);
public ResponseEntity<? extends BasicResponse> fltStcsStatic(String serviceType){
List<FlightStcsValueModel> result = null;
try {
result = service.getFlightStaticStcs(groupId);
log.warn("result => {}", result);
result = service.getFlightStaticStcs(serviceType);
} catch (Exception e) {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
@ -65,8 +61,7 @@ public class MainStatisticsController {
@ApiImplicitParam(name = "cate",value = "비행시간,거리,횟수[TIME]", dataTypeClass = String.class),
@ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> fltStcs(FlightStcsRQ rq, @PathVariable String type){
log.warn("cate => {}, groupId => {}, date => {}, type => {}", rq.getCate(), rq.getGroupId(), rq.getDate(), type);
public ResponseEntity<? extends BasicResponse> fltStcs(FlightStcsRQ rq, @PathVariable String type){
FlightStcsModel result = new FlightStcsModel();
@ -80,9 +75,7 @@ public class MainStatisticsController {
List<FlightStcsValueModel> topData = service.fltTopStatics(rq, formatParam);
result.setGraphData(graphData);
result.setTopData(topData);
log.warn("result => {}", result);
result.setTopData(topData);
} catch (Exception e) {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
@ -97,14 +90,12 @@ public class MainStatisticsController {
@GetMapping("/warn-static")
@ApiOperation(value = "비정상 상황 상단 데이터[DB전체 통계데이터]")
@Tag(name = "통계 컨트롤러", description = "통계 관련 API")
public ResponseEntity<? extends BasicResponse> warnStcsStatic(String groupId){
public ResponseEntity<? extends BasicResponse> warnStcsStatic(String serviceType){
List<FlightStcsValueModel> result = null;
try {
result = service.getWarnStaticStcs(groupId);
log.warn("result => {}", result);
result = service.getWarnStaticStcs(serviceType);
} catch (Exception e) {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
@ -123,7 +114,6 @@ public class MainStatisticsController {
@ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> warnStcs(FlightStcsRQ rq, @PathVariable String type){
log.warn("rq => {}",rq);
FlightStcsModel result = new FlightStcsModel();
@ -137,9 +127,7 @@ public class MainStatisticsController {
List<FlightStcsValueModel> topData = service.warnTopStatics(rq, formatParam);
result.setGraphData(graphData);
result.setTopData(topData);
log.warn("result => {}", result);
result.setTopData(topData);
} catch (Exception e) {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
@ -152,16 +140,12 @@ public class MainStatisticsController {
@GetMapping("/flight/result-static")
@ApiOperation(value = "비행실적 상단데이터 통계 [DB전체 통계데이터]")
@Tag(name = "통계 컨트롤러", description = "통계 관련 API")
public ResponseEntity<? extends BasicResponse> fltResultStcs(String groupId){
log.warn("Group => {}", groupId);
public ResponseEntity<? extends BasicResponse> fltResultStcs(String serviceType){
List<FlightStcsValueModel> result = null;
try {
result = service.getFltResultStaticStcs(groupId);
log.warn("result => {}", result);
result = service.getFltResultStaticStcs(serviceType);
} catch (Exception e) {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
@ -179,8 +163,7 @@ public class MainStatisticsController {
@ApiImplicitParam(name = "cate",value = "비행실적,비행계획서,비행계획승인[FLT_PLAN_APRVN]", dataTypeClass = String.class),
@ApiImplicitParam(name = "type",value = "날짜형식[month]", dataTypeClass = String.class)
})
public ResponseEntity<? extends BasicResponse> fltResultStcs(FlightStcsRQ rq, @PathVariable String type){
log.warn("cate => {}, group => {}, date => {}, type => {}", rq.getCate(), rq.getGroupId(), rq.getDate(), type);
public ResponseEntity<? extends BasicResponse> fltResultStcs(FlightStcsRQ rq, @PathVariable String type){
FlightStcsModel result = new FlightStcsModel();
@ -195,8 +178,6 @@ public class MainStatisticsController {
result.setGraphData(graphData);
result.setTopData(topData);
log.warn("result => {}", result);
} catch (Exception e) {
log.error("IGNORE : {}", e);
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)

2
pav-server/src/main/java/com/palnet/biz/api/main/statistics/model/FlightStcsRQ.java
Unescape View File

@ -7,7 +7,7 @@ public class FlightStcsRQ {
private String cate;
private String groupId;
private String serviceType;
private String date;

84
pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java
Unescape View File

@ -143,14 +143,14 @@ public class MainStatisticsService {
* 비행관련 고정 통계, 항상 DB 전체값에서 통계진행할것임
* @return
*/
public List<FlightStcsValueModel> getFlightStaticStcs(String groupId){
// 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false;
boolean authCheck = authCheck(groupId);
public List<FlightStcsValueModel> getFlightStaticStcs(String serviceType){
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
FlightStcsValueModel time = cntrlQueryRepository.getFlightTimeStcs(authCheck, groupId);
FlightStcsValueModel distance = cntrlQueryRepository.getFlightDistanceStcs(authCheck, groupId);
FlightStcsValueModel fltCount = cntrlQueryRepository.getFlightCountStcs(authCheck, groupId);
FlightStcsValueModel time = cntrlQueryRepository.getFlightTimeStcs(authCheck, serviceType);
FlightStcsValueModel distance = cntrlQueryRepository.getFlightDistanceStcs(authCheck, serviceType);
FlightStcsValueModel fltCount = cntrlQueryRepository.getFlightCountStcs(authCheck, serviceType);
List<FlightStcsValueModel> result = Arrays.asList(time, distance, fltCount);
@ -166,22 +166,22 @@ public class MainStatisticsService {
*/
public List<FlightStcsValueModel> fltStatics(FlightStcsRQ rq, String[] formatParam){
// 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false;
boolean authCheck = authCheck(rq.getGroupId());
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
List<FlightStcsValueModel> resultList = new ArrayList<>();
switch (rq.getCate()) {
case "TIME":
resultList = cntrlQueryRepository.fltTimeStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = cntrlQueryRepository.fltTimeStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "DISTANCE":
resultList = cntrlQueryRepository.fltDistanceStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = cntrlQueryRepository.fltDistanceStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "FLT_COUNT":
resultList = cntrlQueryRepository.fltCountStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = cntrlQueryRepository.fltCountStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
default :
@ -205,21 +205,22 @@ public class MainStatisticsService {
*/
public List<FlightStcsValueModel> fltTopStatics(FlightStcsRQ rq, String[] formatParam){
boolean authCheck = authCheck(rq.getGroupId());
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
List<FlightStcsValueModel> resultList = new ArrayList<>();
switch (rq.getCate()) {
case "TIME":
resultList = cntrlQueryRepository.fltTopTimeStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = cntrlQueryRepository.fltTopTimeStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "DISTANCE":
resultList = cntrlQueryRepository.fltTopDistanceStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = cntrlQueryRepository.fltTopDistanceStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "FLT_COUNT":
resultList = cntrlQueryRepository.fltTopCountStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = cntrlQueryRepository.fltTopCountStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
default :
@ -238,9 +239,10 @@ public class MainStatisticsService {
* 비행관련 고정 통계, 항상 DB 전체값에서 통계진행할것임
* @return
*/
public List<FlightStcsValueModel> getWarnStaticStcs(String groupId){
public List<FlightStcsValueModel> getWarnStaticStcs(String serviceType){
boolean authCheck = authCheck(groupId);
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
// TODO:: 비행경로이탈, 고도이탈, 충돌위험 임시코드
String[] cate = {"PLAN" ,"ALTITUDE", "CRASH"};
@ -249,7 +251,7 @@ public class MainStatisticsService {
List<FlightStcsValueModel> result = new ArrayList<>();
for(int i = 0; i < cate.length; i ++){
FlightStcsValueModel node = ctrCntrlWarnLogQueryRepository.getWarnStaticStcs(cate[i], authCheck, groupId);
FlightStcsValueModel node = ctrCntrlWarnLogQueryRepository.getWarnStaticStcs(cate[i], authCheck, serviceType);
result.add(node);
}
@ -269,9 +271,10 @@ public class MainStatisticsService {
*/
public List<FlightStcsValueModel> warnStatics(FlightStcsRQ rq, String[] formatParam){
boolean authCheck = authCheck(rq.getGroupId());
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
List<FlightStcsValueModel> resultList = ctrCntrlWarnLogQueryRepository.warnStcs(rq.getCate(), rq.getDate(), rq.getGroupId(), authCheck, formatParam);
List<FlightStcsValueModel> resultList = ctrCntrlWarnLogQueryRepository.warnStcs(rq.getCate(), rq.getDate(), rq.getServiceType(), authCheck, formatParam);
for(FlightStcsValueModel node : resultList){
if(node.getName() == null || node.getName().equals("")) node.setName(" ");
@ -289,9 +292,10 @@ public class MainStatisticsService {
*/
public List<FlightStcsValueModel> warnTopStatics(FlightStcsRQ rq, String[] formatParam){
boolean authCheck = authCheck(rq.getGroupId());
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
List<FlightStcsValueModel> resultList = ctrCntrlWarnLogQueryRepository.warnTopStcs(rq.getCate(), rq.getDate(), rq.getGroupId(), authCheck, formatParam);
List<FlightStcsValueModel> resultList = ctrCntrlWarnLogQueryRepository.warnTopStcs(rq.getCate(), rq.getDate(), rq.getServiceType(), authCheck, formatParam);
return resultList;
}
@ -300,14 +304,14 @@ public class MainStatisticsService {
* 비행실적, 비행계획서 기용, 비행승인이 많이 된 기체 데이터, 상단 고정 데이터
* @return
*/
public List<FlightStcsValueModel> getFltResultStaticStcs(String groupId){
// 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false;
boolean authCheck = authCheck(groupId);
public List<FlightStcsValueModel> getFltResultStaticStcs(String serviceType){
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
FlightStcsValueModel fltResult = fltPlanQueryRepository.getFltResultStaticStcs(authCheck, groupId);
FlightStcsValueModel fltPlan = fltPlanQueryRepository.getFltPlanStaticStcs(authCheck, groupId);
FlightStcsValueModel fltPlanAprvn = fltPlanQueryRepository.getFltPlanAprvnStaticStcs(authCheck, groupId);
FlightStcsValueModel fltResult = fltPlanQueryRepository.getFltResultStaticStcs(authCheck, serviceType);
FlightStcsValueModel fltPlan = fltPlanQueryRepository.getFltPlanStaticStcs(authCheck, serviceType);
FlightStcsValueModel fltPlanAprvn = fltPlanQueryRepository.getFltPlanAprvnStaticStcs(authCheck, serviceType);
List<FlightStcsValueModel> result = Arrays.asList(fltResult,fltPlan, fltPlanAprvn);
@ -324,20 +328,20 @@ public class MainStatisticsService {
List<FlightStcsValueModel> resultList = null;
// 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false;
boolean authCheck = authCheck(rq.getGroupId());
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
switch (rq.getCate()) {
case "FLT_RESULT":
resultList = fltPlanQueryRepository.fltResultStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = fltPlanQueryRepository.fltResultStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "FLT_PLAN":
resultList = fltPlanQueryRepository.fltPlanStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = fltPlanQueryRepository.fltPlanStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "FLT_PLAN_APRVN":
resultList = fltPlanQueryRepository.fltPlanAprvnStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = fltPlanQueryRepository.fltPlanAprvnStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
default :
@ -356,20 +360,20 @@ public class MainStatisticsService {
List<FlightStcsValueModel> resultList = null;
// 권한이 유저권한, 그룹권한 모두 user면 true , user가 하나라도 아닐 경우 모두 false;
boolean authCheck = authCheck(rq.getGroupId());
// 권한이 유저권한이 user면 true, user가 아닐 경우 false;
boolean authCheck = jwtTokenUtil.getUserAuthByToken().equals("USER");
switch (rq.getCate()) {
case "FLT_RESULT":
resultList = fltPlanQueryRepository.fltTopResultStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = fltPlanQueryRepository.fltTopResultStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "FLT_PLAN":
resultList = fltPlanQueryRepository.fltTopPlanStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = fltPlanQueryRepository.fltTopPlanStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
case "FLT_PLAN_APRVN":
resultList = fltPlanQueryRepository.fltTopPlanAprvnStcs(rq.getDate(), rq.getGroupId(), authCheck, formatParam);
resultList = fltPlanQueryRepository.fltTopPlanAprvnStcs(rq.getDate(), rq.getServiceType(), authCheck, formatParam);
break;
default :

114
pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
Unescape View File

@ -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";
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
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,10 +2026,10 @@ 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;
day = day == null ? 0.0 : day;
@ -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;
@ -2200,11 +2194,8 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
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(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();

39
pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlWarnLogQueryRepository.java
Unescape View File

@ -38,7 +38,7 @@ public class CtrCntrlWarnLogQueryRepository {
* 비정상상황 고정 데이터, 카테고리별 집계[PLAN, ALTITUDE, CRASH]
* @return
*/
public FlightStcsValueModel getWarnStaticStcs(String cate, boolean authCheck, String groupId){
public FlightStcsValueModel getWarnStaticStcs(String cate, boolean authCheck, String serviceType){
FlightStcsValueModel result = new FlightStcsValueModel();
QCtrCntrlWarnLog qCtrCntrlWarnLog = QCtrCntrlWarnLog.ctrCntrlWarnLog;
@ -47,7 +47,7 @@ public class CtrCntrlWarnLogQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
builder.and(qCtrCntrlWarnLog.warnType.eq(cate));
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
@ -73,9 +73,9 @@ public class CtrCntrlWarnLogQueryRepository {
String idntfNum = result.getName();
result.setYear(getWarnYear(idntfNum, cate, authCheck, groupId));
result.setMonth(getWarnMonth(idntfNum, cate, authCheck, groupId));
result.setDay(getWarnDay(idntfNum, cate, authCheck, groupId));
result.setYear(getWarnYear(idntfNum, cate, authCheck, serviceType));
result.setMonth(getWarnMonth(idntfNum, cate, authCheck, serviceType));
result.setDay(getWarnDay(idntfNum, cate, authCheck, serviceType));
} else {
@ -92,7 +92,7 @@ public class CtrCntrlWarnLogQueryRepository {
}
private String getWarnDay(String idntfNum, String cate, boolean authCheck, String groupId){
private String getWarnDay(String idntfNum, String cate, boolean authCheck, String serviceType){
QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -100,7 +100,7 @@ public class CtrCntrlWarnLogQueryRepository {
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(bas.idntfNum.eq(idntfNum));
builder.and(bas.warnType.eq(cate));
@ -122,7 +122,7 @@ public class CtrCntrlWarnLogQueryRepository {
.fetchOne();
}
private String getWarnMonth(String idntfNum, String cate, boolean authCheck, String groupId){
private String getWarnMonth(String idntfNum, String cate, boolean authCheck, String serviceType){
QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -132,7 +132,7 @@ public class CtrCntrlWarnLogQueryRepository {
builder.and(bas.warnType.eq(cate));
builder.and(bas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(bas.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
@ -150,7 +150,7 @@ public class CtrCntrlWarnLogQueryRepository {
.fetchOne();
}
private String getWarnYear(String idntfNum, String cate, boolean authCheck, String groupId){
private String getWarnYear(String idntfNum, String cate, boolean authCheck, String serviceType){
QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -160,7 +160,7 @@ public class CtrCntrlWarnLogQueryRepository {
builder.and(bas.warnType.eq(cate));
builder.and(bas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(bas.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
@ -186,7 +186,7 @@ public class CtrCntrlWarnLogQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> warnStcs(String cate, String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> warnStcs(String cate, String date, String serviceType, boolean authCheck, String[] formatParam){
// QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas;
QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
@ -205,7 +205,7 @@ public class CtrCntrlWarnLogQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
builder.and(bas.warnType.eq(cate));
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
@ -244,7 +244,7 @@ public class CtrCntrlWarnLogQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> warnTopStcs(String cate, String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> warnTopStcs(String cate, String date, String serviceType, boolean authCheck, String[] formatParam){
QCtrCntrlWarnLog bas = QCtrCntrlWarnLog.ctrCntrlWarnLog;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
@ -258,7 +258,7 @@ public class CtrCntrlWarnLogQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
builder.and(bas.warnType.eq(cate));
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
@ -325,8 +325,9 @@ public class CtrCntrlWarnLogQueryRepository {
String dateFormat = "%Y-%m-%d";
BooleanExpression dateExpression = null;
switch (cate){
case "-2" :
case "beforeYesterday" :
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlWarnLog.createDt, dateFormat)
.eq(LocalDate.now().minusDays(2).toString());
@ -334,7 +335,7 @@ public class CtrCntrlWarnLogQueryRepository {
builder.and(dateExpression);
break;
case "-1":
case "yesterday":
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlWarnLog.createDt, dateFormat)
.eq(LocalDate.now().minusDays(1).toString());
@ -342,14 +343,14 @@ public class CtrCntrlWarnLogQueryRepository {
builder.and(dateExpression);
break;
case "0":
case "today":
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlWarnLog.createDt, dateFormat)
.eq(LocalDate.now().toString());
builder.and(dateExpression);
break;
case "1":
case "tomorrow":
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qCtrCntrlWarnLog.createDt, dateFormat)
.eq(LocalDate.now().plusDays(1).toString());

81
pav-server/src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java
Unescape View File

@ -1173,7 +1173,7 @@ public class FltPlanQueryRepository {
* 비행실적 데이터, top 1
* @return
*/
public FlightStcsValueModel getFltResultStaticStcs(boolean authCheck, String groupId){
public FlightStcsValueModel getFltResultStaticStcs(boolean authCheck, String serviceType){
FlightStcsValueModel result = new FlightStcsValueModel();
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
@ -1181,7 +1181,7 @@ public class FltPlanQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull());
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
@ -1205,9 +1205,9 @@ public class FltPlanQueryRepository {
String idntfNum = result.getName();
result.setYear(getFltResultYear(idntfNum, authCheck, groupId));
result.setMonth(getFltResultMonth(idntfNum, authCheck, groupId));
result.setDay(getFltResultDay(idntfNum, authCheck, groupId));
result.setYear(getFltResultYear(idntfNum, authCheck, serviceType));
result.setMonth(getFltResultMonth(idntfNum, authCheck, serviceType));
result.setDay(getFltResultDay(idntfNum, authCheck, serviceType));
} else {
FlightStcsValueModel node = new FlightStcsValueModel();
@ -1223,7 +1223,7 @@ public class FltPlanQueryRepository {
}
private Long getFltResultDay(String idntfNum, boolean authCheck, String groupId){
private Long getFltResultDay(String idntfNum, boolean authCheck, String serviceType){
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1231,7 +1231,7 @@ public class FltPlanQueryRepository {
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(qFltPlanCtrCntrlRel.idntfNum.eq(idntfNum));
builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull());
@ -1249,7 +1249,7 @@ public class FltPlanQueryRepository {
.fetchOne();
}
private Long getFltResultMonth(String idntfNum, boolean authCheck, String groupId){
private Long getFltResultMonth(String idntfNum, boolean authCheck, String serviceType){
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1258,7 +1258,7 @@ public class FltPlanQueryRepository {
builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull());
builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(qFltPlanBas.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
@ -1272,7 +1272,7 @@ public class FltPlanQueryRepository {
.fetchOne();
}
private Long getFltResultYear(String idntfNum, boolean authCheck, String groupId){
private Long getFltResultYear(String idntfNum, boolean authCheck, String serviceType){
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1281,7 +1281,7 @@ public class FltPlanQueryRepository {
builder.and(qFltPlanCtrCntrlRel.planSno.isNotNull());
builder.and(qFltPlanBas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(qFltPlanBas.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
@ -1300,14 +1300,14 @@ public class FltPlanQueryRepository {
* 비행계획에 많이 기용된 기체 데이터, top 1
* @return
*/
public FlightStcsValueModel getFltPlanStaticStcs(boolean authCheck, String groupId){
public FlightStcsValueModel getFltPlanStaticStcs(boolean authCheck, String serviceType){
FlightStcsValueModel result = new FlightStcsValueModel();
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
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
@ -1322,9 +1322,7 @@ public class FltPlanQueryRepository {
.groupBy(qFltPlanArcrft.idntfNum)
.orderBy(qFltPlanArcrft.planSno.count().desc())
.limit(1)
.fetch();
log.warn("que => {}", queryResult);
.fetch();
if(queryResult.size() > 0){
result = queryResult.get(0);
@ -1332,9 +1330,9 @@ public class FltPlanQueryRepository {
String idntfNum = result.getName();
result.setYear(getFltPlanYear(idntfNum, authCheck, groupId));
result.setMonth(getFltPlanMonth(idntfNum, authCheck, groupId));
result.setDay(getFltPlanDay(idntfNum, authCheck, groupId));
result.setYear(getFltPlanYear(idntfNum, authCheck, serviceType));
result.setMonth(getFltPlanMonth(idntfNum, authCheck, serviceType));
result.setDay(getFltPlanDay(idntfNum, authCheck, serviceType));
} else {
FlightStcsValueModel node = new FlightStcsValueModel();
@ -1349,14 +1347,14 @@ public class FltPlanQueryRepository {
return result;
}
private Long getFltPlanDay(String idntfNum, boolean authCheck, String groupId){
private Long getFltPlanDay(String idntfNum, boolean authCheck, String serviceType){
QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
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(bas.idntfNum.eq(idntfNum.trim()));
builder.and(Expressions.stringTemplate("DATE_FORMAT({0}, {1})", bas.createDt, dateFormat)
@ -1373,7 +1371,7 @@ public class FltPlanQueryRepository {
.fetchOne();
}
private Long getFltPlanMonth(String idntfNum, boolean authCheck, String groupId){
private Long getFltPlanMonth(String idntfNum, boolean authCheck, String serviceType){
QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1381,7 +1379,7 @@ public class FltPlanQueryRepository {
builder.and(bas.idntfNum.eq(idntfNum.trim()));
builder.and(bas.createDt.goe(LocalDate.now().minusMonths(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(bas.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
@ -1395,7 +1393,7 @@ public class FltPlanQueryRepository {
.fetchOne();
}
private Long getFltPlanYear(String idntfNum, boolean authCheck, String groupId){
private Long getFltPlanYear(String idntfNum, boolean authCheck, String serviceType){
QFltPlanArcrft bas = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1403,7 +1401,7 @@ public class FltPlanQueryRepository {
builder.and(bas.idntfNum.eq(idntfNum.trim()));
builder.and(bas.createDt.goe(LocalDate.now().minusYears(1).atStartOfDay().atZone(ZoneId.of("Asia/Seoul")).toInstant()));
builder.and(bas.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
@ -1551,7 +1549,7 @@ public class FltPlanQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> fltResultStcs(String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> fltResultStcs(String date, String serviceType, boolean authCheck, String[] formatParam){
// QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1569,7 +1567,7 @@ public class FltPlanQueryRepository {
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
@ -1605,7 +1603,7 @@ public class FltPlanQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> fltPlanStcs(String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> fltPlanStcs(String date, String serviceType, boolean authCheck, String[] formatParam){
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
StringTemplate formattedDate = Expressions.stringTemplate(
@ -1620,7 +1618,7 @@ public class FltPlanQueryRepository {
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
@ -1654,7 +1652,7 @@ public class FltPlanQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> fltPlanAprvnStcs(String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> fltPlanAprvnStcs(String date, String serviceType, boolean authCheck, String[] formatParam){
// QCtrCntrlBas bas = QCtrCntrlBas.ctrCntrlBas;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1672,7 +1670,7 @@ public class FltPlanQueryRepository {
BooleanBuilder builder = new BooleanBuilder();
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date));
builder.and(qFltPlanBas.aprvlYn.eq("Y"));
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
@ -1707,7 +1705,7 @@ public class FltPlanQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> fltTopResultStcs(String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> fltTopResultStcs(String date, String serviceType, boolean authCheck, String[] formatParam){
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1718,7 +1716,7 @@ public class FltPlanQueryRepository {
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
@ -1754,7 +1752,7 @@ public class FltPlanQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> fltTopPlanStcs(String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> fltTopPlanStcs(String date, String serviceType, boolean authCheck, String[] formatParam){
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1766,7 +1764,7 @@ public class FltPlanQueryRepository {
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
@ -1803,7 +1801,7 @@ public class FltPlanQueryRepository {
* @param formatParam
* @return
*/
public List<FlightStcsValueModel> fltTopPlanAprvnStcs(String date, String groupId, boolean authCheck, String[] formatParam){
public List<FlightStcsValueModel> fltTopPlanAprvnStcs(String date, String serviceType, boolean authCheck, String[] formatParam){
QFltPlanArcrft qFltPlanArcrft = QFltPlanArcrft.fltPlanArcrft;
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas;
@ -1817,7 +1815,7 @@ public class FltPlanQueryRepository {
if(date != null && date.length() > 0) builder.and(formattedDate.eq(date));
builder.and(qFltPlanBas.aprvlYn.eq("Y"));
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken()));
if(groupId != null && !(groupId.equals(""))) builder.and(qFltPlanBas.groupId.eq(groupId));
if(serviceType != null && !(serviceType.equals(""))) builder.and(qFltPlanBas.serviceType.eq(serviceType));
List<FlightStcsValueModel> result = query
.select(
@ -1881,8 +1879,9 @@ public class FltPlanQueryRepository {
if(authCheck) builder.and(qFltPlanBas.cstmrSno.eq(jwtTokenUtil.getCstmrSnoByToken()));
BooleanExpression dateExpression = null;
switch (cate){
case "-2" :
case "beforeYesterday" :
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qFltPlanBas.createDt, "%Y-%m-%d")
.eq(LocalDate.now().minusDays(2).toString());
@ -1890,7 +1889,7 @@ public class FltPlanQueryRepository {
builder.and(dateExpression);
break;
case "-1":
case "yesterday":
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qFltPlanBas.createDt, "%Y-%m-%d")
.eq(LocalDate.now().minusDays(1).toString());
@ -1898,14 +1897,14 @@ public class FltPlanQueryRepository {
builder.and(dateExpression);
break;
case "0":
case "today":
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qFltPlanBas.createDt, "%Y-%m-%d")
.eq(LocalDate.now().toString());
builder.and(dateExpression);
break;
case "1":
case "tomorrow":
dateExpression =
Expressions.stringTemplate("DATE_FORMAT({0}, {1})", qFltPlanBas.createDt, "%Y-%m-%d")
.eq(LocalDate.now().plusDays(1).toString());

Write Preview
Loading…
Cancel
Save