|
|
@@ -57,10 +57,12 @@ public class HomePageInController {
|
|
|
}
|
|
|
Query query = Query.query(criteria);
|
|
|
Criteria finalCriteria = criteria;
|
|
|
+ int skip = (request.getPage() - 1) * request.getPage();
|
|
|
+ int limit = request.getPage();
|
|
|
Mono<Paged<HomePageTemp>> pagedMono = template.count(query, HomePageTemp.class).flatMap(fm ->
|
|
|
template.select(Query.query(finalCriteria)
|
|
|
- .offset(request.getPage())
|
|
|
- .limit(request.getSize())
|
|
|
+ .offset(skip)
|
|
|
+ .limit(limit)
|
|
|
.sort(Sort.by(Sort.Order.desc("create_time"))),HomePageTemp.class)
|
|
|
.collectList()
|
|
|
.map(list -> new Paged<>(fm, list,request.getPage(),request.getSize()))
|
|
|
@@ -79,10 +81,12 @@ public class HomePageInController {
|
|
|
Criteria criteria= Criteria.where("home_page_id").is(request.getHomePageId()).and("item_type").is(request.getItmeType()) ;
|
|
|
Query query = Query.query(criteria);
|
|
|
Criteria finalCriteria = criteria;
|
|
|
+ int skip = (request.getPage() - 1) * request.getPage();
|
|
|
+ int limit = request.getPage();
|
|
|
Mono<Paged<HomePageTempItem>> pagedMono = template.count(query, HomePageTempItem.class).flatMap(fm ->
|
|
|
template.select(Query.query(finalCriteria)
|
|
|
- .offset(request.getPage())
|
|
|
- .limit(request.getSize())
|
|
|
+ .offset(skip)
|
|
|
+ .limit(limit)
|
|
|
.sort(Sort.by(Sort.Order.desc("create_time"))),HomePageTempItem.class)
|
|
|
.collectList()
|
|
|
.map(list -> new Paged<>(fm, list,request.getPage(),request.getSize()))
|
|
|
@@ -191,6 +195,14 @@ public class HomePageInController {
|
|
|
return RStatus.success(itemRepository.deleteById(homePageItemId));
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 首页面delete
|
|
|
+ * @param homePageId
|
|
|
+ * @return {@link Mono}<{@link RStatus}<{@link Void}>>
|
|
|
+ */
|
|
|
+ @DeleteMapping("deleteTempById/{homePageId}")
|
|
|
+ public Mono<RStatus<Void>> deleteTempById (@PathVariable("homePageId") @NotNull Long homePageId){
|
|
|
+ return RStatus.success(tempRepository.deleteById(homePageId));
|
|
|
+ }
|
|
|
|
|
|
}
|