|
|
|
@ -564,6 +564,46 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
|
|
|
|
|
* @param id |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public PageImpl<AnlsHstryDetailModel> listCntrlHstryPage(String id, Pageable pageable){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstry qCtrCntrHstry = QCtrCntrlHstry.ctrCntrlHstry; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
builder.and(qCtrCntrHstry.cntrlId.eq(id)); |
|
|
|
|
|
|
|
|
|
List<AnlsHstryDetailModel> result = query.select(Projections.bean(AnlsHstryDetailModel.class , |
|
|
|
|
qCtrCntrHstry.cntrlId , |
|
|
|
|
qCtrCntrHstry.hstrySno , |
|
|
|
|
qCtrCntrHstry.trmnlId , |
|
|
|
|
qCtrCntrHstry.mssgTypeCd , |
|
|
|
|
qCtrCntrHstry.statusCd , |
|
|
|
|
qCtrCntrHstry.lat, |
|
|
|
|
qCtrCntrHstry.lon , |
|
|
|
|
qCtrCntrHstry.speed , |
|
|
|
|
qCtrCntrHstry.speedType , |
|
|
|
|
qCtrCntrHstry.heading , |
|
|
|
|
qCtrCntrHstry.elev , |
|
|
|
|
qCtrCntrHstry.elevType , |
|
|
|
|
qCtrCntrHstry.mvDstnc , |
|
|
|
|
qCtrCntrHstry.mvDstncType , |
|
|
|
|
qCtrCntrHstry.bttrLvl, |
|
|
|
|
qCtrCntrHstry.bttrVltg, |
|
|
|
|
qCtrCntrHstry.trmnlRcvDt , |
|
|
|
|
qCtrCntrHstry.srvrRcvDt, |
|
|
|
|
qCntrlBasEntity.idntfNum |
|
|
|
|
)) |
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
.leftJoin(qCtrCntrHstry) |
|
|
|
|
.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()); |
|
|
|
|
} |
|
|
|
|
public List<AnlsHstryDetailModel> listCntrlHstry(String id){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
@ -572,7 +612,7 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
builder.and(qCtrCntrHstry.cntrlId.eq(id)); |
|
|
|
|
|
|
|
|
|
List<AnlsHstryDetailModel> resultList = query.select(Projections.bean(AnlsHstryDetailModel.class , |
|
|
|
|
List<AnlsHstryDetailModel> result = query.select(Projections.bean(AnlsHstryDetailModel.class , |
|
|
|
|
qCtrCntrHstry.cntrlId , |
|
|
|
|
qCtrCntrHstry.hstrySno , |
|
|
|
|
qCtrCntrHstry.trmnlId , |
|
|
|
@ -600,10 +640,49 @@ public List<AnlsHstryModel> cntrlBasNormalList(AnlsHstryRqModel rq, String idntf
|
|
|
|
|
.orderBy(qCtrCntrHstry.srvrRcvDt.asc()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
return resultList; |
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
public long listCntrlHstryCount(String id){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstry qCtrCntrHstry = QCtrCntrlHstry.ctrCntrlHstry; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
builder.and(qCtrCntrHstry.cntrlId.eq(id)); |
|
|
|
|
|
|
|
|
|
List<AnlsHstryDetailModel> resultList = query.select(Projections.bean(AnlsHstryDetailModel.class , |
|
|
|
|
qCtrCntrHstry.cntrlId , |
|
|
|
|
qCtrCntrHstry.hstrySno , |
|
|
|
|
qCtrCntrHstry.trmnlId , |
|
|
|
|
qCtrCntrHstry.mssgTypeCd , |
|
|
|
|
qCtrCntrHstry.statusCd , |
|
|
|
|
qCtrCntrHstry.lat, |
|
|
|
|
qCtrCntrHstry.lon , |
|
|
|
|
qCtrCntrHstry.speed , |
|
|
|
|
qCtrCntrHstry.speedType , |
|
|
|
|
qCtrCntrHstry.heading , |
|
|
|
|
qCtrCntrHstry.elev , |
|
|
|
|
qCtrCntrHstry.elevType , |
|
|
|
|
qCtrCntrHstry.mvDstnc , |
|
|
|
|
qCtrCntrHstry.mvDstncType , |
|
|
|
|
qCtrCntrHstry.bttrLvl, |
|
|
|
|
qCtrCntrHstry.bttrVltg, |
|
|
|
|
qCtrCntrHstry.trmnlRcvDt , |
|
|
|
|
qCtrCntrHstry.srvrRcvDt, |
|
|
|
|
qCntrlBasEntity.idntfNum |
|
|
|
|
)) |
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
.leftJoin(qCtrCntrHstry) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCtrCntrHstry.cntrlId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(qCtrCntrHstry.srvrRcvDt.asc()) |
|
|
|
|
.fetch(); |
|
|
|
|
long cnt = 0; |
|
|
|
|
for(AnlsHstryDetailModel list : resultList) { |
|
|
|
|
cnt ++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public List<CtrCntrlHstryArea> listCntrlHstryArea() { |
|
|
|
|
QCtrCntrlHstryArea qCtrCntrHstryArea = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
|