From 7182dbfb374bef1f78d0698117e97137429f96cc Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 09 十一月 2022 11:21:11 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
index ff7c125..d8bb664 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/region/SccgRegionController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.controller.BaseController;
import com.ycl.entity.region.SccgRegion;
@@ -45,11 +47,14 @@
public CommonResult addRegion(@Validated @RequestBody SccgRegion sccgRegion) {
return CommonResult.success(iSccgRegionService.save(sccgRegion));
}
+
@ApiOperation(value = "鑾峰彇琛屾斂鍖哄煙鍒嗛〉鏌ヨ")
@RequestMapping(value = "/list", method = RequestMethod.POST)
@ResponseBody
- public CommonResult<IPage<SccgRegion>> list(@Validated @RequestBody SccgRegion sccgRegion) {
- return CommonResult.success(iSccgRegionService.list(sccgRegion));
+ public CommonResult<CommonPage<SccgRegion>> list(@RequestParam(value = "pageSize", defaultValue = "5") Integer pageSize,
+ @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum) {
+ Page<SccgRegion> list = iSccgRegionService.list(pageSize, pageNum);
+ return CommonResult.success(CommonPage.restPage(list));
}
@@ -87,7 +92,7 @@
@ApiOperation("鑾峰彇瀛愮被")
@GetMapping("/getChildren/{parentId}")
@ApiImplicitParams({
- @ApiImplicitParam(name = "parentId",value = "椤剁骇parentId=0")
+ @ApiImplicitParam(name = "parentId", value = "椤剁骇parentId=0")
})
public CommonResult<List<SccgRegion>> getChildren(@PathVariable Long parentId) {
List<SccgRegion> treeList = iSccgRegionService.getChildren(parentId);
--
Gitblit v1.8.0