|
|
|
@ -69,20 +69,28 @@ public class AnlsSmltService {
|
|
|
|
|
String appAuth = jwtTokenUtil.getUserAuthByToken(); |
|
|
|
|
List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken(); |
|
|
|
|
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); |
|
|
|
|
|
|
|
|
|
ComnPagingRs<AnlsHstryModel> response = new ComnPagingRs<>(); |
|
|
|
|
Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord()); |
|
|
|
|
|
|
|
|
|
List<AnlsHstryModel> resultList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
PageImpl<AnlsHstryModel> result; |
|
|
|
|
List<AnlsHstryModel>resultList = new ArrayList<>(); |
|
|
|
|
long total = resultList.size(); |
|
|
|
|
long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord(); |
|
|
|
|
if("SUPER".equals(appAuth)||"ADMIN".equals(appAuth)) { // App 권한이 수퍼 / 어드민일 경우 목록 전부 표출
|
|
|
|
|
resultList = query.listCntrlBas(rq); |
|
|
|
|
result = query.listCntrlBas(rq, pageable); |
|
|
|
|
response.setItems(result.getContent()); |
|
|
|
|
response.setTotal(total); |
|
|
|
|
response.setTotalPage(totalPage); |
|
|
|
|
response.setPage(rq.getPage()); |
|
|
|
|
return response; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if("USER".equals(appAuth) || "ROLE_USER".equals(appAuth)) { // App 권한은 user이지만 group 권한이 LEADER / MASTER인 그룹이 있는 경우 해당 그룹의 비행 이력 목록 표출
|
|
|
|
|
for (JwtGroupModel list : groupAuth) { |
|
|
|
|
if("MASTER".equals(list.getGroupAuthCd()) || "LEADER".equals(list.getGroupAuthCd())) { |
|
|
|
|
List<AnlsHstryModel> result = query.cntrlBasAuthList(rq, list.getGroupId()); |
|
|
|
|
if (result.size() > 0) { |
|
|
|
|
resultList.addAll(result); |
|
|
|
|
List<AnlsHstryModel> results = query.cntrlBasAuthList(rq, list.getGroupId()); |
|
|
|
|
if (results.size() > 0) { |
|
|
|
|
resultList.addAll(results); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -91,9 +99,9 @@ public class AnlsSmltService {
|
|
|
|
|
List<ComIdntfBas> idntfList = comIdntBasRepository.findIdntfNumber(cstmrSno); |
|
|
|
|
if (idntfList.size() > 0) { |
|
|
|
|
for (ComIdntfBas list : idntfList) { |
|
|
|
|
List<AnlsHstryModel> result = query.cntrlBasNormalList(rq, list.getIdntfNum()); |
|
|
|
|
if (result.size() > 0) { |
|
|
|
|
resultList.addAll(result); |
|
|
|
|
List<AnlsHstryModel> results = query.cntrlBasNormalList(rq, list.getIdntfNum()); |
|
|
|
|
if (results.size() > 0) { |
|
|
|
|
resultList.addAll(results); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -117,20 +125,18 @@ public class AnlsSmltService {
|
|
|
|
|
} |
|
|
|
|
return 0; |
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Collections.sort(resultList, comparator); |
|
|
|
|
|
|
|
|
|
PageImpl<AnlsHstryModel> res = new PageImpl<>(resultList, pageable, resultList.size()); |
|
|
|
|
response.setItems(res.getContent()); |
|
|
|
|
response.setTotal(total); |
|
|
|
|
response.setTotalPage(totalPage); |
|
|
|
|
response.setPage(rq.getPage()); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ComnPagingRs<AnlsHstryModel> response = new ComnPagingRs<>(); |
|
|
|
|
Pageable pageable = PageRequest.of(rq.getPage()-1, 5); |
|
|
|
|
PageImpl<AnlsHstryModel> result =new PageImpl<AnlsHstryModel>(resultList, pageable, resultList.size()); |
|
|
|
|
long total = resultList.size(); |
|
|
|
|
long totalPage = total % rq.getRecord() > 0 ? (total/rq.getRecord()) + 1 : total/rq.getRecord(); |
|
|
|
|
response.setItems(result.getContent()); |
|
|
|
|
response.setTotal(total); |
|
|
|
|
response.setTotalPage(totalPage); |
|
|
|
|
response.setPage(rq.getPage()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return response; |
|
|
|
|
} |
|
|
|
|