From 5d5523e321c4b148a85801e5d4864592fe1bb258 Mon Sep 17 00:00:00 2001 From: XinanXf <959700191@qq.com> Date: Thu, 19 Jun 2025 09:37:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=96=B0=E5=A2=9E=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/shenghua/controller/ProductController.java | 2 +- .../java/com/shenghua/controller/SolutionController.java | 2 +- src/main/java/com/shenghua/convert/ProductConvert.java | 1 + src/main/java/com/shenghua/entitys/product/Product.java | 2 ++ src/main/java/com/shenghua/mapper/ProductMapper.java | 2 ++ .../com/shenghua/service/impl/ProductServiceImpl.java | 8 +++----- src/main/java/com/shenghua/vo/ProductVO.java | 4 ++++ src/main/resources/mapper/ProductMapper.xml | 9 +++++++-- 8 files changed, 21 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/shenghua/controller/ProductController.java b/src/main/java/com/shenghua/controller/ProductController.java index 5511823..40270c2 100644 --- a/src/main/java/com/shenghua/controller/ProductController.java +++ b/src/main/java/com/shenghua/controller/ProductController.java @@ -34,7 +34,7 @@ public class ProductController { } @PostMapping("/queryList") - @ApiOperation("分页查询产品列表") + @ApiOperation("查询产品列表") public Result> queryList(@RequestBody ProductDTO dto){ return Result.success(productService.queryList(dto)) ; } diff --git a/src/main/java/com/shenghua/controller/SolutionController.java b/src/main/java/com/shenghua/controller/SolutionController.java index 3bdb99d..0b50fed 100644 --- a/src/main/java/com/shenghua/controller/SolutionController.java +++ b/src/main/java/com/shenghua/controller/SolutionController.java @@ -20,7 +20,7 @@ public class SolutionController { @PostMapping("/addContact") @ApiOperation("提交联系信息") - public Result addContact(@Valid @RequestBody SolutionContactDTO contact){ + public Result addContact(@RequestBody SolutionContactDTO contact){ solutionService.addContact(contact); return Result.success() ; } diff --git a/src/main/java/com/shenghua/convert/ProductConvert.java b/src/main/java/com/shenghua/convert/ProductConvert.java index b42e5b6..9baa957 100644 --- a/src/main/java/com/shenghua/convert/ProductConvert.java +++ b/src/main/java/com/shenghua/convert/ProductConvert.java @@ -32,6 +32,7 @@ public class ProductConvert { productVO.setSeoKeywords(product.getSeoKeywords()); productVO.setCreateTime(product.getCreateTime()); productVO.setUpdateTime(product.getUpdateTime()); + productVO.setDesc(product.getDesc()); return productVO; } diff --git a/src/main/java/com/shenghua/entitys/product/Product.java b/src/main/java/com/shenghua/entitys/product/Product.java index 55d8726..cb354fe 100644 --- a/src/main/java/com/shenghua/entitys/product/Product.java +++ b/src/main/java/com/shenghua/entitys/product/Product.java @@ -70,5 +70,7 @@ public class Product { @ApiModelProperty(value = "修改时间") private Date updateTime; + @ApiModelProperty(value = "产品描述") + private String desc; } diff --git a/src/main/java/com/shenghua/mapper/ProductMapper.java b/src/main/java/com/shenghua/mapper/ProductMapper.java index 6f9cee8..80a669b 100644 --- a/src/main/java/com/shenghua/mapper/ProductMapper.java +++ b/src/main/java/com/shenghua/mapper/ProductMapper.java @@ -12,4 +12,6 @@ public interface ProductMapper extends BaseMapper { Integer getCount(@Param("dto") ProductDTO dto); List queryList(@Param("dto") ProductDTO dto); + + Product getById(Integer id); } diff --git a/src/main/java/com/shenghua/service/impl/ProductServiceImpl.java b/src/main/java/com/shenghua/service/impl/ProductServiceImpl.java index 7851546..678d04b 100644 --- a/src/main/java/com/shenghua/service/impl/ProductServiceImpl.java +++ b/src/main/java/com/shenghua/service/impl/ProductServiceImpl.java @@ -20,10 +20,7 @@ import com.shenghua.vo.ProductVO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Collections; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; @Service @@ -44,7 +41,7 @@ public class ProductServiceImpl extends ServiceImpl impl @Override public ProductVO getDetail(Integer id) { - Product product = this.getById(id); + Product product = productMapper.getById(id); if (Objects.isNull(product)){ // 可以根据实际情况处理，例如抛出异常或者返回 null throw new RuntimeException("产品不存在"); @@ -70,6 +67,7 @@ public class ProductServiceImpl extends ServiceImpl impl List imgs = groupedByType.getOrDefault(1, Collections.emptyList()).stream() .map(ProductImg::getUrl) .collect(Collectors.toList()); + imgs.add(product.getCover()); productVO.setImgs(imgs); diff --git a/src/main/java/com/shenghua/vo/ProductVO.java b/src/main/java/com/shenghua/vo/ProductVO.java index fe2a5ea..eecb147 100644 --- a/src/main/java/com/shenghua/vo/ProductVO.java +++ b/src/main/java/com/shenghua/vo/ProductVO.java @@ -83,6 +83,10 @@ public class ProductVO { @ApiModelProperty(value = "规格参数图-详情") private List specsImgs; + @TableField("desc") + @ApiModelProperty(value = "产品描述") + private String desc; + // @ApiModelProperty(value = "通用规格") // private ProductSpecs productSpecs; diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml index c67cbd0..2cc6553 100644 --- a/src/main/resources/mapper/ProductMapper.xml +++ b/src/main/resources/mapper/ProductMapper.xml @@ -18,7 +18,8 @@ p.seo_description AS seoDescription, p.seo_keywords AS seoKeywords, p.create_time AS createTime, - p.update_time AS updateTime + p.update_time AS updateTime, + p.desc AS `desc` FROM product AS p @@ -42,7 +43,11 @@ - ORDER BY p.id DESC + + + \ No newline at end of file