diff --git a/.idea/misc.xml b/.idea/misc.xml index fd42907..132404b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java index d08a6ac..adc211d 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionController.java @@ -1,43 +1,14 @@ package com.atguigu.ssyx.sys.controller; -import com.atguigu.ssyx.common.result.Result; -import com.atguigu.ssyx.model.sys.RegionWare; -import com.atguigu.ssyx.sys.service.RegionWareService; -import com.atguigu.ssyx.vo.sys.RegionWareQueryVo; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiParam; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.annotation.Resource; - -@Api(value = "获取开通区管理", tags = "获取开通区管理") +@Api(tags = "区域接口") @RestController -@RequestMapping(value = "/admin/sys/regionWare") +@RequestMapping("/admin/sys/region") public class RegionController { - @Resource - private RegionWareService regionWareService; - @ApiOperation(value = "获取开通区域列表") - @GetMapping("{page}/{limit}") - public Result> index( - @ApiParam(name = "page", value = "当前页码", required = true) - @PathVariable Long page, - @ApiParam(name = "limit", value = "每页记录数", required = true) - @PathVariable Long limit, - @ApiParam(name = "regionWareVo", value = "查询对象", required = false) - RegionWareQueryVo regionWareQueryVo) { - - Page pageParam = new Page<>(page, limit); - IPage pageModel = regionWareService.selectPage(pageParam, regionWareQueryVo); - - return Result.success(pageModel); - } } diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java index c0d7221..9bfb120 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/RegionWareController.java @@ -1,12 +1,62 @@ package com.atguigu.ssyx.sys.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.sys.RegionWare; +import com.atguigu.ssyx.model.sys.Ware; +import com.atguigu.ssyx.sys.service.RegionWareService; +import com.atguigu.ssyx.vo.sys.RegionWareQueryVo; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; + +@Api(value = "RegionWare管理", tags = "RegionWare管理") @RestController -@RequestMapping("/system/region-ware") +@RequestMapping(value = "/admin/sys/regionWare") public class RegionWareController { + @Resource + private RegionWareService regionWareService; + @ApiOperation(value = "获取开通区域列表") + @GetMapping("{page}/{limit}") + public Result> index( + @ApiParam(name = "page", value = "当前页码", required = true) + @PathVariable Long page, + @ApiParam(name = "limit", value = "每页记录数", required = true) + @PathVariable Long limit, + @ApiParam(name = "regionWareVo", value = "查询对象", required = false) + RegionWareQueryVo regionWareQueryVo) { + + Page pageParam = new Page<>(page, limit); + IPage pageModel = regionWareService.selectPage(pageParam, regionWareQueryVo); + + return Result.success(pageModel); + } + + @ApiOperation(value = "添加开通区域") + @PostMapping("save") + public Result save(@RequestBody RegionWare regionWare) { + regionWareService.saveRegionWare(regionWare); + return Result.success(); + } + + @ApiOperation(value = "删除") + @DeleteMapping("remove/{id}") + public Result remove(@PathVariable Long id) { + regionWareService.removeById(id); + return Result.success(); + } + + @ApiOperation(value = "取消开通区域") + @PostMapping("updateStatus/{id}/{status}") + public Result updateStatus(@PathVariable Long id, @PathVariable Integer status) { + regionWareService.updateStatus(id, status); + return Result.success(); + } } diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java index 1bc9640..56abc39 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/controller/WareController.java @@ -1,20 +1,29 @@ package com.atguigu.ssyx.sys.controller; +import com.atguigu.ssyx.common.result.Result; +import com.atguigu.ssyx.model.sys.Ware; +import com.atguigu.ssyx.sys.service.WareService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -/** - *

- * 仓库表 前端控制器 - *

- * - * @author atguigu - * @since 2024-04-02 - */ -@RestController -@RequestMapping("/system/ware") -public class WareController { +import java.util.List; +@Api(value = "Ware管理", tags = "Ware管理") +@RestController +@RequestMapping(value = "/admin/sys/ware") +public class WareController { + @Autowired + private WareService wareService; + + @ApiOperation(value = "获取全部仓库") + @GetMapping("findAllList") + public Result> findAllList() { + return Result.success(wareService.list()); + } } diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java index e90a91c..1b261c1 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/RegionWareService.java @@ -12,4 +12,14 @@ public interface RegionWareService extends IService { * 开通区域列表 */ IPage selectPage(Page pageParam, RegionWareQueryVo regionWareQueryVo); + + /** + * 添加开通区域 + */ + void saveRegionWare(RegionWare regionWare); + + /** + * 取消开通区域 + */ + void updateStatus(Long id, Integer status); } diff --git a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java index df3058f..ea9035d 100644 --- a/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java +++ b/service/service-sys/src/main/java/com/atguigu/ssyx/sys/service/impl/RegionWareServiceImpl.java @@ -1,11 +1,14 @@ package com.atguigu.ssyx.sys.service.impl; +import com.atguigu.ssyx.common.exception.BunnyException; +import com.atguigu.ssyx.common.result.ResultCodeEnum; import com.atguigu.ssyx.model.sys.RegionWare; import com.atguigu.ssyx.sys.mapper.RegionWareMapper; import com.atguigu.ssyx.sys.service.RegionWareService; import com.atguigu.ssyx.vo.sys.RegionWareQueryVo; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @@ -27,4 +30,29 @@ public class RegionWareServiceImpl extends ServiceImpllambdaQuery().eq(RegionWare::getRegionId, regionWare.getRegionId())); + if (count > 0) { + throw new BunnyException(ResultCodeEnum.REGION_OPEN); + } + + baseMapper.insert(regionWare); + } + + /** + * 取消开通区域 + */ + @Override + public void updateStatus(Long id, Integer status) { + RegionWare regionWare = baseMapper.selectById(id); + regionWare.setStatus(status); + // 更新数据 + baseMapper.updateById(regionWare); + } }