diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java index ee2d4fb..ab5e705 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/RemoteSensingSourceDataController.java @@ -48,10 +48,10 @@ public class RemoteSensingSourceDataController { } @ApiOperationSupport(order = 2) @ApiOperation(value = "列表", notes = "传入remoteSensingSourceData") - @GetMapping("/page/eq") - public R> list(RemoteSensingSourceData remoteSensingSourceData, Query query) { + @GetMapping("/front/page/eq") + public R> list(RemoteSensingSourceData remoteSensingSourceData, Query query) { IPage pages = remoteSensingSourceDataService.page(Condition.getPage(query), Condition.getQueryWrapper(remoteSensingSourceData)); - return R.data(pages); + return R.data(BladePage.of(pages)); } @ApiOperationSupport(order = 3) @@ -62,7 +62,7 @@ public class RemoteSensingSourceDataController { return R.data(BladePage.of(pages)); } - @GetMapping("/page") + @GetMapping("/front/page") @ApiImplicitParams({ @ApiImplicitParam(name = "thumbnailLink", value = "遥感影像缩略图链接", paramType = "query", dataType = "string"), @ApiImplicitParam(name = "productResolution", value = "遥感影像产品分辨率", paramType = "query", dataType = "string") @@ -70,6 +70,7 @@ public class RemoteSensingSourceDataController { @ApiOperationSupport(order = 4) @ApiOperation(value = "列表", notes = "传入dict") public R> list2(@ApiIgnore @RequestParam Map params, Query query) { + IPage pages = remoteSensingSourceDataService.page(Condition.getPage(query), Condition.getQueryWrapper(params, RemoteSensingSourceData.class)); return R.data(BladePage.of(pages)); }