From a76e987cb4487f424e3adbeb572b69cc38062e95 Mon Sep 17 00:00:00 2001 From: wxy Date: Mon, 29 Apr 2024 08:49:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/domain/MallProductBrandInfo.java | 2 + .../nuyu/product/domain/MallProductInfo.java | 39 +++++++++++++++++++ .../product/domain/MallProductTypeInfo.java | 4 +- .../controller/MallProductInfoController.java | 35 +++++++++++++++++ .../product/controller/PurController.java | 2 +- .../product/mapper/MallProductInfoMapper.java | 7 ++++ .../Impl/MallProductInfoServiceImpl.java | 24 ++++++++++++ .../service/MallProductInfoService.java | 11 ++++++ .../mapper/product/MallProductInfoMapper.xml | 13 +++++++ 9 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java index 875b4cc..1261b5c 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductBrandInfo.java @@ -1,5 +1,7 @@ package com.nuyu.product.domain; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java new file mode 100644 index 0000000..bab9e5e --- /dev/null +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductInfo.java @@ -0,0 +1,39 @@ +package com.nuyu.product.domain; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * @Author: wangxinyuan + * @Date: 2024/4/28 下午7:54 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class MallProductInfo extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 商品id */ + private Long productId; + + /** 商品名称 */ + @Excel(name = "商品名称") + private String productName; + + /** 商品货号 */ + @Excel(name = "商品货号") + private String productNumber; + + /** 单位 */ + @Excel(name = "单位") + private String productUnit; + +} diff --git a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java index 383cde8..b267fd3 100644 --- a/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java +++ b/muyu-modules/muyu-product/muyu-product-commo/src/main/java/com/nuyu/product/domain/MallProductTypeInfo.java @@ -1,8 +1,6 @@ package com.nuyu.product.domain; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; + import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import com.muyu.common.core.annotation.Excel; diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductInfoController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductInfoController.java index c8f3a84..26ba0d3 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductInfoController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/MallProductInfoController.java @@ -1,10 +1,25 @@ package com.muyu.product.controller; +import com.github.pagehelper.PageInfo; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.domain.AjaxResult; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.product.service.MallProductInfoService; +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.domain.MallProductInfo; +import com.nuyu.product.req.BookReq; +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.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/4/28 下午7:22 @@ -15,4 +30,24 @@ public class MallProductInfoController { @Autowired private MallProductInfoService mallProductInfoService; + + + @ApiOperation("查询商品列表") + @GetMapping("/list") + @RequiresPermissions("product:info:list") + public AjaxResult list(BookReq bookReq){ + PageInfo info=mallProductInfoService.list(bookReq); + return AjaxResult.success(info); + } + + @ApiOperation("导出商品列表") + @RequiresPermissions("product:info:export") + @Log(title = "商品",businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MallProductInfo mallProductInfo){ + List list=mallProductInfoService.selectMallProductInfoList(mallProductInfo); + ExcelUtil util = new ExcelUtil(MallProductInfo.class); + util.exportExcel(response, list, "商品品牌数据"); + } + } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java index 3083b42..509a596 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/PurController.java @@ -21,7 +21,7 @@ import java.util.List; * @Date: 2024/4/26 上午11:23 */ @RestController -@RequestMapping("/info") +@RequestMapping("/test") public class PurController { diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductInfoMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductInfoMapper.java index d83c647..f0e704d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductInfoMapper.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/MallProductInfoMapper.java @@ -1,7 +1,11 @@ package com.muyu.product.mapper; +import com.nuyu.product.domain.MallProductInfo; +import com.nuyu.product.req.BookReq; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/4/28 下午7:22 @@ -9,4 +13,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface MallProductInfoMapper { + List list(BookReq bookReq); + + List selectMallProductInfoList(MallProductInfo mallProductInfo); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductInfoServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductInfoServiceImpl.java index 10f57f7..49bfbc1 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductInfoServiceImpl.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/Impl/MallProductInfoServiceImpl.java @@ -1,12 +1,36 @@ package com.muyu.product.service.Impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.muyu.product.mapper.MallProductInfoMapper; import com.muyu.product.service.MallProductInfoService; +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.domain.MallProductInfo; +import com.nuyu.product.req.BookReq; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/4/28 下午7:22 */ @Service public class MallProductInfoServiceImpl implements MallProductInfoService { + + @Autowired + private MallProductInfoMapper mallProductInfoMapper; + @Override + public PageInfo list(BookReq bookReq) { + PageHelper.startPage(bookReq.getPageNum(), bookReq.getPageSize()); + Listlist=mallProductInfoMapper.list(bookReq); + PageInfopageInfo=new PageInfo<>(list); + return pageInfo; + } + + @Override + public List selectMallProductInfoList(MallProductInfo mallProductInfo) { + return mallProductInfoMapper.selectMallProductInfoList(mallProductInfo); + } } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductInfoService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductInfoService.java index 2a85862..2bfb64a 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductInfoService.java +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/MallProductInfoService.java @@ -1,8 +1,19 @@ package com.muyu.product.service; +import com.github.pagehelper.PageInfo; +import com.nuyu.product.domain.MallProductBrandInfo; +import com.nuyu.product.domain.MallProductInfo; +import com.nuyu.product.req.BookReq; + +import java.util.List; + /** * @Author: wangxinyuan * @Date: 2024/4/28 下午7:22 */ public interface MallProductInfoService { + + PageInfo list(BookReq bookReq); + + List selectMallProductInfoList(MallProductInfo mallProductInfo); } diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductInfoMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductInfoMapper.xml index 51969f0..c58a98d 100644 --- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductInfoMapper.xml +++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/MallProductInfoMapper.xml @@ -4,4 +4,17 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + select id, product_name , product_number , product_unit from t_product + + + + + + +