|
|
|
@ -1,10 +1,11 @@
|
|
|
|
|
package com.palnet.biz.jpa.repository.pty; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
import org.springframework.data.domain.PageImpl; |
|
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
|
import org.springframework.stereotype.Repository; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.dron.model.BasDronModel; |
|
|
|
@ -15,7 +16,6 @@ import com.palnet.biz.jpa.entity.QComArcrftBas;
|
|
|
|
|
import com.palnet.biz.jpa.entity.QComIdntfBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.QPtyCstmrGroup; |
|
|
|
|
import com.palnet.biz.jpa.entity.QPtyGroupBas; |
|
|
|
|
import com.palnet.comn.utils.EncryptUtils; |
|
|
|
|
import com.querydsl.core.BooleanBuilder; |
|
|
|
|
import com.querydsl.core.types.Projections; |
|
|
|
|
import com.querydsl.jpa.JPAExpressions; |
|
|
|
@ -35,7 +35,7 @@ public class PtyDronQueryRepository{
|
|
|
|
|
* @param rq |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<BasDronModel> list(BasDronRqModel rq){ |
|
|
|
|
public PageImpl<BasDronModel> list(BasDronRqModel rq, Pageable pageable){ |
|
|
|
|
|
|
|
|
|
QComArcrftBas bas = QComArcrftBas.comArcrftBas; |
|
|
|
|
QComIdntfBas idnt = QComIdntfBas.comIdntfBas; |
|
|
|
@ -81,6 +81,8 @@ public class PtyDronQueryRepository{
|
|
|
|
|
)).from(bas) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
// List<BasDronModel> result = new ArrayList<BasDronModel>();
|
|
|
|
@ -93,9 +95,71 @@ public class PtyDronQueryRepository{
|
|
|
|
|
// result.add(model);
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
|
} |
|
|
|
|
public long listCount(BasDronRqModel rq){ |
|
|
|
|
|
|
|
|
|
QComArcrftBas bas = QComArcrftBas.comArcrftBas; |
|
|
|
|
QComIdntfBas idnt = QComIdntfBas.comIdntfBas; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getArcrftModelNm())) { |
|
|
|
|
builder.and(bas.arcrftModelNm.like('%' + rq.getArcrftModelNm() + '%')); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getGroupId())) { |
|
|
|
|
builder.and(bas.groupId.eq(rq.getGroupId())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getArcrftTypeCd())) { |
|
|
|
|
builder.and(bas.arcrftTypeCd.eq(rq.getArcrftTypeCd())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
builder.and(bas.useYn.eq("Y")); |
|
|
|
|
|
|
|
|
|
List<BasDronModel> result = |
|
|
|
|
query.select(Projections.bean(BasDronModel.class , |
|
|
|
|
bas.groupId, |
|
|
|
|
bas.arcrftSno, |
|
|
|
|
bas.arcrftHght, |
|
|
|
|
bas.arcrftLngth, |
|
|
|
|
bas.arcrftModelNm, |
|
|
|
|
bas.arcrftTypeCd, |
|
|
|
|
bas.arcrftWdth, |
|
|
|
|
bas.arcrftWght, |
|
|
|
|
bas.cameraYn, |
|
|
|
|
bas.createDt, |
|
|
|
|
bas.createUserId, |
|
|
|
|
bas.insrncYn, |
|
|
|
|
bas.prdctCmpnNm, |
|
|
|
|
bas.prdctDate, |
|
|
|
|
bas.prdctNum, |
|
|
|
|
bas.takeoffWght, |
|
|
|
|
bas.updateDt, |
|
|
|
|
bas.updateUserId, |
|
|
|
|
bas.wghtTypeCd |
|
|
|
|
)).from(bas) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
// List<BasDronModel> result = new ArrayList<BasDronModel>();
|
|
|
|
|
//
|
|
|
|
|
// for(BasDronModel model : queryResult) {
|
|
|
|
|
//// if(!StringUtils.isEmpty(model.getOwnerNm())) {
|
|
|
|
|
//// model.setOwnerNm(EncryptUtils.decrypt(model.getOwnerNm()));
|
|
|
|
|
//// }
|
|
|
|
|
//
|
|
|
|
|
// result.add(model);
|
|
|
|
|
// }
|
|
|
|
|
long cnt = 0; |
|
|
|
|
for(BasDronModel list : result) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
/** |
|
|
|
|
* 식별번호 조회 |
|
|
|
|
* @param arcrftSno |
|
|
|
|