From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java | 67 ++++++++++++++++++++++++++++++---
1 files changed, 60 insertions(+), 7 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
index c60de73..b170351 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/GoodsCategoryController.java
@@ -1,14 +1,17 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.page.TableDataInfo;
import com.ruoyi.other.api.domain.GoodsCategory;
import com.ruoyi.other.service.GoodsCategoryService;
-import io.swagger.annotations.Api;
-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 io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
@@ -23,11 +26,61 @@
*/
@RestController
@RequestMapping("/goods-category")
-@Api(tags = "商品分类")
-public class GoodsCategoryController {
+@Api("商品分类")
+public class GoodsCategoryController extends BaseController {
@Resource
private GoodsCategoryService goodsCategoryService;
+
+ @PostMapping("/addGoodsCategory")
+ @ApiOperation(value = "商品管理-商品分类-添加", tags = {"管理后台"})
+ public R<Void> addGoodsCategory(@RequestBody GoodsCategory goodsCategory){
+ goodsCategoryService.save(goodsCategory);
+ return R.ok();
+ }
+
+ @PutMapping("/updateGoodsCategory")
+ @ApiOperation(value = "商品管理-商品分类-修改", tags = {"管理后台"})
+ public R<Void> updateGoodsCategory(@RequestBody GoodsCategory goodsCategory){
+ goodsCategoryService.updateById(goodsCategory);
+ return R.ok();
+ }
+
+ @GetMapping("/getGoodsCategoryById")
+ @ApiOperation(value = "商品管理-商品分类-详情", tags = {"管理后台"})
+ public R<GoodsCategory> getGoodsCategoryById(@RequestParam("id") Integer id){
+ return R.ok(goodsCategoryService.getById(id));
+ }
+
+
+ @GetMapping("/getList")
+ @ApiOperation(value = "商品管理-商品分类-列表", tags = {"管理后台"})
+ public R<Page<GoodsCategory>> list(@ApiParam("页码") @RequestParam Integer pageNum,@ApiParam("每一页数据大小") Integer pageSize, GoodsCategory goodsCategory){
+ Page<GoodsCategory> page = goodsCategoryService.lambdaQuery()
+ .like(StringUtils.isNotEmpty(goodsCategory.getName()),GoodsCategory::getName, goodsCategory.getName())
+ .page(Page.of(pageNum, pageSize));
+ return R.ok(page);
+ }
+
+ @DeleteMapping("/delete")
+ @ApiOperation(value = "商品管理-商品分类-删除", tags = {"管理后台"})
+ public R<Void> delete(@RequestParam("id") Integer id){
+ goodsCategoryService.removeById(id);
+ return R.ok();
+ }
+
+
+
+
+ @GetMapping("/index/list")
+ @ApiOperation(value = "商品分类", tags = {"小程序-首页"})
+ public R<List<GoodsCategory>> indexlist(){
+ List<GoodsCategory> indexlist = goodsCategoryService.lambdaQuery()
+ .orderByDesc(GoodsCategory::getCreateTime)
+ .last("limit 8")
+ .list();
+ return R.ok(indexlist);
+ }
@GetMapping("/list")
@ApiOperation(value = "商品分类列表", tags = {"小程序-商城-商城-首页-筛选"})
public R<List<GoodsCategory>> list(){
--
Gitblit v1.7.1