|
|
|
@ -10,6 +10,9 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
|
|
import org.slf4j.Logger; |
|
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
|
import org.springframework.data.domain.PageImpl; |
|
|
|
|
import org.springframework.data.domain.PageRequest; |
|
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.acnt.jwt.model.JwtGroupModel; |
|
|
|
@ -17,8 +20,10 @@ import com.palnet.biz.api.acnt.jwt.utils.JwtTokenUtil;
|
|
|
|
|
import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; |
|
|
|
|
import com.palnet.biz.api.anls.hstry.model.AnlsHstryModel; |
|
|
|
|
import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel; |
|
|
|
|
import com.palnet.biz.api.anls.hstry.model.AnlsHstryRsModel; |
|
|
|
|
import com.palnet.biz.api.anls.smlt.model.AnlsSmltDetailModel; |
|
|
|
|
import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel; |
|
|
|
|
import com.palnet.biz.api.comn.model.ComnPagingRs; |
|
|
|
|
import com.palnet.biz.jpa.entity.ComIdntfBas; |
|
|
|
|
import com.palnet.biz.jpa.entity.CtrCntrlHstryArea; |
|
|
|
|
import com.palnet.biz.jpa.entity.FltPlanBas; |
|
|
|
@ -60,7 +65,7 @@ public class AnlsSmltService {
|
|
|
|
|
* @param rq |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<AnlsHstryModel> list(AnlsHstryRqModel rq){ |
|
|
|
|
public ComnPagingRs<AnlsHstryModel> list(AnlsHstryRqModel rq){ |
|
|
|
|
String appAuth = jwtTokenUtil.getUserAuthByToken(); |
|
|
|
|
List<JwtGroupModel> groupAuth = jwtTokenUtil.getGroupAuthByToken(); |
|
|
|
|
Integer cstmrSno = jwtTokenUtil.getCstmrSnoByToken(); |
|
|
|
@ -117,8 +122,17 @@ public class AnlsSmltService {
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return resultList; |
|
|
|
|
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; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|