Browse Source

비행시뮬레이션 페이징 작업

Test
qkr7828(박재우) 2 years ago
parent
commit
10060db1ee
  1. 5
      src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java
  2. 20
      src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java

5
src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java

@ -21,6 +21,7 @@ import com.palnet.biz.api.anls.hstry.model.AnlsHstryRqModel;
import com.palnet.biz.api.anls.smlt.model.AnlsSmltDetailModel;
import com.palnet.biz.api.anls.smlt.model.AnlsSmltStcsModel;
import com.palnet.biz.api.anls.smlt.service.AnlsSmltService;
import com.palnet.biz.api.comn.model.ComnPagingRs;
import com.palnet.biz.api.comn.response.BasicResponse;
import com.palnet.biz.api.comn.response.ErrorResponse;
import com.palnet.biz.api.comn.response.SuccessResponse;
@ -49,7 +50,7 @@ public class AnlsSmltController {
@ApiOperation(value = "비행 현황 목록")
@Tag(name = "비행 시뮬레이션", description = "비행 이력 시뮬레이션 관련 API")
public ResponseEntity<? extends BasicResponse> list(AnlsHstryRqModel rq) {
List<AnlsHstryModel> result = null;
ComnPagingRs<AnlsHstryModel> result = null;
log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq));
log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate());
@ -70,7 +71,7 @@ public class AnlsSmltController {
.body(new ErrorResponse("Server Error", "-1"));
}
return ResponseEntity.ok().body(new SuccessResponse<List>(result));
return ResponseEntity.ok().body(new SuccessResponse<>(result));
}

20
src/main/java/com/palnet/biz/api/anls/smlt/service/AnlsSmltService.java

@ -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;
}
/**

Loading…
Cancel
Save