pav
/
pav-server
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

비행이력 상세 롤백

Test
qkr7828(박재우) 2 years ago
parent
ae3d52e0a2
commit
96c93c58a1
3 changed files with 33 additions and 43 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. 8
      src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
  2. 26
      src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
  3. 42
      src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

8
src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java
Unescape View File

@ -88,14 +88,14 @@ public class AnlsHstryController {
}
@GetMapping(value = "/log")
@GetMapping(value = "/log/{id}")
@ApiOperation(value = "비행 이력 데이터")
@Tag(name = "비행 이력 현황", description = "비행 이력 현황 관련 API")
@ApiImplicitParam(name = "id",value = "관제ID", dataTypeClass = String.class)
public ResponseEntity<? extends BasicResponse> log(AnlsHstryRqModel rq) {
ComnPagingRs<AnlsHstryDetailModel> result = null;
public ResponseEntity<? extends BasicResponse> log(@PathVariable String id) {
List<AnlsHstryDetailModel> result = null;
try {
result = service.hstryList(rq);
result = service.hstryList(id);
} catch (Exception e) {
log.error("IGNORE : {}", e);

26
src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java
Unescape View File

@ -18,6 +18,7 @@ import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.PathVariable;
import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel;
import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
@ -81,6 +82,7 @@ public class AnlsHstryService {
public ComnPagingRs<AnlsHstryModel> list(AnlsHstryGroupModel rq){
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken();
List<JwtGroupModel> groupAuthList = jwtTokenUtil.getGroupAuthByToken();
List<JwtGroupModel> adminAuth = new ArrayList<>();
String groupAuth = null;
String appAuth = jwtTokenUtil.getUserAuthByToken();
PageImpl<AnlsHstryModel>resultList;
@ -96,6 +98,11 @@ public class AnlsHstryService {
}
}
if("NORMAL".equals(groupAuth)) {
for (JwtGroupModel list : groupAuthList) {
if("MASTER".equals(list.getGroupAuthCd()) || "LEADER".equals(list.getGroupAuthCd())) {
adminAuth.add(list);
}
}
List<ComIdntfBas> idntfList = comIdntBasRepository.findIdntfNumber(cstmrSno);
List<FltPlanBas> basResult = fltPlanBasRepository.findByPlanSno(cstmrSno);
List<FltPlanPilot> pilotList = fltPlanPilotRepository.findByPlanSno(cstmrSno);
@ -149,23 +156,10 @@ public class AnlsHstryService {
}
public ComnPagingRs<AnlsHstryDetailModel> hstryList(AnlsHstryRqModel rq) {
ComnPagingRs<AnlsHstryDetailModel> response = new ComnPagingRs<>();
public List<AnlsHstryDetailModel> hstryList(@PathVariable String id) {
Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
PageImpl<AnlsHstryDetailModel> result = query.listCntrlHstryPage(rq.getCntrlId(), pageable);
List<AnlsHstryDetailModel> result = query.listCntrlHstryPage(id);
long total = query.listCntrlHstryCount(rq.getCntrlId());
long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord();
response.setItems(result.getContent());
response.setTotal(total);
response.setPage(rq.getPage());
response.setTotalPage(totalPage);
return response;
return result;
}
}

42
src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
Unescape View File

@ -268,7 +268,11 @@ public class CtrCntrlQueryRepository{
return result;
}
public PageImpl<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq, Pageable pageable, List<ComIdntfBas> idntfList, List<FltPlanBas> basResult, List<FltPlanBas> pilotResult){
public PageImpl<AnlsHstryModel> cntrlBasNormalHstryList(AnlsHstryGroupModel rq,
Pageable pageable,
List<ComIdntfBas> idntfList,
List<FltPlanBas> basResult,
List<FltPlanBas> pilotResult){
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
@ -357,6 +361,7 @@ public class CtrCntrlQueryRepository{
.or(basBuilder)
.or(pilotBuilder)))
.orderBy(qCntrlBasEntity.cntrlStDt.asc())
.groupBy(qFltPlanBasEntity.planSno)
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch();
@ -618,7 +623,10 @@ public class CtrCntrlQueryRepository{
return result;
}
public long cntrlBasNormalHstryCount(AnlsHstryGroupModel rq, List<ComIdntfBas> idntfList, List<FltPlanBas> basResult, List<FltPlanBas> pilotResult){
public long cntrlBasNormalHstryCount(AnlsHstryGroupModel rq,
List<ComIdntfBas> idntfList,
List<FltPlanBas> basResult,
List<FltPlanBas> pilotResult){
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
@ -708,6 +716,7 @@ public class CtrCntrlQueryRepository{
.or(basBuilder)
.or(pilotBuilder)))
.orderBy(qCntrlBasEntity.cntrlStDt.asc())
.groupBy(qFltPlanBasEntity.planSno)
.fetchCount();
return result;
@ -910,8 +919,6 @@ public class CtrCntrlQueryRepository{
@Cacheable(value = "cntrl-count")
public long countCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno) {
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas;
QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas;
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas;
@ -922,7 +929,7 @@ public class CtrCntrlQueryRepository{
end.setTime(DateUtils.stringToDate(rq.getEndDate()));
end.add(Calendar.DATE, 1);
Date endDate = end.getTime();
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId()));
builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate())));
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate));
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
@ -934,11 +941,7 @@ public class CtrCntrlQueryRepository{
long count = query
.select(qCntrlBasEntity)
.from(qComArcrftBasEntity)
.leftJoin(qComIdntfBasEntity)
.on(qComArcrftBasEntity.arcrftSno.eq(qComIdntfBasEntity.arcrftSno))
.leftJoin(qCntrlBasEntity)
.on(qComIdntfBasEntity.idntfNum.eq(qCntrlBasEntity.idntfNum))
.from(qCntrlBasEntity)
.leftJoin(qCntrlHstryAreaEntity)
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId))
.leftJoin(qFltPlanCtrCntrlRelEntity)
@ -947,6 +950,7 @@ public class CtrCntrlQueryRepository{
.on(qFltPlanCtrCntrlRelEntity.planSno.eq(qFltPlanBasEntity.planSno))
.where(builder)
.orderBy(qCntrlBasEntity.cntrlStDt.desc())
.groupBy(qCntrlBasEntity.cntrlId)
.fetchCount();
return count;
@ -954,11 +958,9 @@ public class CtrCntrlQueryRepository{
}
@Cacheable(value = "cntrl-list")
public PageImpl<AnlsHstryModel> listCntrlBasRs(AnlsHstryGroupModel rq, Pageable pageable){
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
QComIdntfBas qComIdntfBasEntity = QComIdntfBas.comIdntfBas;
QComArcrftBas qComArcrftBasEntity = QComArcrftBas.comArcrftBas;
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea;
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRelEntity = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel;
QFltPlanBas qFltPlanBasEntity = QFltPlanBas.fltPlanBas;
@ -969,7 +971,7 @@ public class CtrCntrlQueryRepository{
end.setTime(DateUtils.stringToDate(rq.getEndDate()));
end.add(Calendar.DATE, 1);
Date endDate = end.getTime();
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId()));
builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate())));
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate));
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y"));
@ -991,11 +993,7 @@ public class CtrCntrlQueryRepository{
qCntrlHstryAreaEntity.landNm,
qCntrlHstryAreaEntity.landNum
))
.from(qComArcrftBasEntity)
.leftJoin(qComIdntfBasEntity)
.on(qComArcrftBasEntity.arcrftSno.eq(qComIdntfBasEntity.arcrftSno))
.leftJoin(qCntrlBasEntity)
.on(qComIdntfBasEntity.idntfNum.eq(qCntrlBasEntity.idntfNum))
.from(qCntrlBasEntity)
.leftJoin(qCntrlHstryAreaEntity)
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId))
.leftJoin(qFltPlanCtrCntrlRelEntity)
@ -1045,7 +1043,7 @@ public class CtrCntrlQueryRepository{
* @param id
* @return
*/
public PageImpl<AnlsHstryDetailModel> listCntrlHstryPage(String id, Pageable pageable){
public List<AnlsHstryDetailModel> listCntrlHstryPage(String id){
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas;
QCtrCntrlHstry qCtrCntrHstry = QCtrCntrlHstry.ctrCntrlHstry;
@ -1079,11 +1077,9 @@ public class CtrCntrlQueryRepository{
.on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId))
.where(builder)
.orderBy(qCtrCntrHstry.srvrRcvDt.asc())
.offset(pageable.getOffset())
.limit(pageable.getPageSize())
.fetch();
return new PageImpl<>(result, pageable, result.size());
return result;
}
public List<AnlsHstryDetailModel> listCntrlHstry(String id){

Write Preview
Loading…
Cancel
Save