From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 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 183d8c7..c262b31 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,11 +2,17 @@
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;
+import com.ycl.service.redis.RedisService;
import com.ycl.service.region.ISccgRegionService;
+import com.ycl.utils.redis.RedisKey;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -28,6 +34,9 @@
public class SccgRegionController extends BaseController {
@Resource
+ private RedisService redisService;
+
+ @Resource
private ISccgRegionService iSccgRegionService;
@ApiOperation("鏍戠粨鏋�")
@@ -41,13 +50,17 @@
@RequestMapping(value = "/addRegion", method = RequestMethod.POST)
@ResponseBody
public CommonResult addRegion(@Validated @RequestBody SccgRegion sccgRegion) {
+ redisService.del(RedisKey.SCCG_REGION);
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));
}
@@ -63,6 +76,7 @@
@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
@ResponseBody
public CommonResult update(@PathVariable Long id, @RequestBody SccgRegion sccgRegion) {
+ redisService.del(RedisKey.SCCG_REGION);
sccgRegion.setId(id);
boolean success = iSccgRegionService.updateById(sccgRegion);
if (success) {
@@ -75,10 +89,21 @@
@RequestMapping(value = "/delete", method = RequestMethod.POST)
@ResponseBody
public CommonResult delete(@RequestParam("ids") List<Long> ids) {
+ redisService.del(RedisKey.SCCG_REGION);
boolean success = iSccgRegionService.removeBatchByIds(ids);
if (success) {
return CommonResult.success(null);
}
return CommonResult.failed();
}
+
+ @ApiOperation("鑾峰彇瀛愮被")
+ @GetMapping("/getChildren/{parentId}")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "parentId", value = "椤剁骇parentId=0")
+ })
+ public CommonResult<List<SccgRegion>> getChildren(@PathVariable Long parentId) {
+ List<SccgRegion> treeList = iSccgRegionService.getChildren(parentId);
+ return CommonResult.success(treeList);
+ }
}
--
Gitblit v1.8.0