From 9ace334d2491145e1ceaa08793d9a0018e271f7a Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 15 Jul 2019 16:51:26 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E5=A2=9E=E5=8A=A0=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E5=88=86=E9=A1=B5=E7=9A=84=E4=BE=8B=E5=AD=90?= =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3mybatis-plus=E4=BC=A0=E9=80=92IPage?= =?UTF-8?q?=E5=8F=8D=E5=BA=8F=E5=88=97=E5=8C=96=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/feign/INoticeClient.java | 9 ++++----- .../desk/controller/NoticeController.java | 17 +++++++++++++++++ .../springblade/desk/feign/NoticeClient.java | 19 ++++++++++++------- 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/feign/INoticeClient.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/feign/INoticeClient.java index bbe9c389..c189eb42 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/feign/INoticeClient.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/feign/INoticeClient.java @@ -17,14 +17,12 @@ package org.springblade.desk.feign; import org.springblade.core.launch.constant.AppConstant; -import org.springblade.core.tool.api.R; +import org.springblade.core.mp.support.BladePage; import org.springblade.desk.entity.Notice; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; - /** * Notice Feign接口类 * @@ -41,10 +39,11 @@ public interface INoticeClient { /** * 获取notice列表 * - * @param number + * @param current + * @param size * @return */ @GetMapping(TOP) - R> top(@RequestParam("number") Integer number); + BladePage top(@RequestParam("current") Integer current, @RequestParam("size") Integer size); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java index 6b2283df..7e4b8a62 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/controller/NoticeController.java @@ -21,11 +21,14 @@ import io.swagger.annotations.*; import lombok.AllArgsConstructor; import org.springblade.common.cache.CacheNames; import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.annotation.PreAuth; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.entity.Notice; +import org.springblade.desk.feign.INoticeClient; import org.springblade.desk.service.INoticeService; import org.springblade.desk.vo.NoticeVO; import org.springblade.desk.wrapper.NoticeWrapper; @@ -47,9 +50,12 @@ public class NoticeController extends BladeController implements CacheNames { private INoticeService noticeService; + private INoticeClient noticeClient; + /** * 详情 */ + @PreAuth("hasPermission('desk:notice:detail')") @GetMapping("/detail") @ApiOperationSupport(order = 1) @ApiOperation(value = "详情", notes = "传入notice") @@ -129,4 +135,15 @@ public class NoticeController extends BladeController implements CacheNames { return R.status(temp); } + /** + * 远程调用分页接口 + */ + @GetMapping("/top") + @ApiOperationSupport(order = 8) + @ApiOperation(value = "分页远程调用", notes = "传入current,size") + public R> top(@ApiParam(value = "当前页") @RequestParam Integer current, @ApiParam(value = "每页显示条数") @RequestParam Integer size) { + BladePage page = noticeClient.top(current, size); + return R.data(page); + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java index b3622012..74fb2890 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/feign/NoticeClient.java @@ -16,16 +16,17 @@ */ package org.springblade.desk.feign; +import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.AllArgsConstructor; -import org.springblade.core.tool.api.R; -import org.springblade.desk.mapper.NoticeMapper; +import org.springblade.core.mp.support.BladePage; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; import org.springblade.desk.entity.Notice; +import org.springblade.desk.service.INoticeService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; -import java.util.List; - /** * Notice Feign * @@ -36,12 +37,16 @@ import java.util.List; @AllArgsConstructor public class NoticeClient implements INoticeClient { - NoticeMapper mapper; + private INoticeService service; @Override @GetMapping(TOP) - public R> top(Integer number) { - return R.data(mapper.topList(number)); + public BladePage top(Integer current, Integer size) { + Query query = new Query(); + query.setCurrent(current); + query.setSize(size); + IPage page = service.page(Condition.getPage(query)); + return BladePage.of(page); } }