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 |   82 ++++++++++++++++++++++++++++++++++++++---
 1 files changed, 76 insertions(+), 6 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 6df1ce5..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
@@ -1,15 +1,21 @@
 package com.ycl.controller.region;
 
 
+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.platform.region.SccgRegion;
-import com.ycl.service.platform.region.ISccgRegionService;
+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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -23,9 +29,12 @@
  * @since 2022-09-16
  */
 @RestController
-@RequestMapping("/sccg-region")
+@RequestMapping("/sccg_region")
 @Api(tags = "琛屾斂鍖哄煙")
 public class SccgRegionController extends BaseController {
+
+    @Resource
+    private RedisService redisService;
 
     @Resource
     private ISccgRegionService iSccgRegionService;
@@ -36,4 +45,65 @@
         List<SccgRegion> treeList = iSccgRegionService.getTree();
         return CommonResult.success(treeList);
     }
+
+    @ApiOperation(value = "娣诲姞琛屾斂鍖哄煙")
+    @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<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));
+    }
+
+
+    @ApiOperation("鑾峰彇鎸囧畾琛屾斂鍖哄煙")
+    @RequestMapping(value = "/getRegion/{id}", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult<SccgRegion> getMessage(@PathVariable Long id) {
+        SccgRegion sccgRegion = iSccgRegionService.getById(id);
+        return CommonResult.success(sccgRegion);
+    }
+
+    @ApiOperation("淇敼鎸囧畾琛屾斂鍖哄煙")
+    @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) {
+            return CommonResult.success(null);
+        }
+        return CommonResult.failed();
+    }
+
+    @ApiOperation("鎵归噺鍒犻櫎琛屾斂鍖哄煙")
+    @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