diff --git a/src/main/java/com/shenghua/config/WebConfiguration.java b/src/main/java/com/shenghua/config/WebConfiguration.java index a57ea83..5b1eba3 100644 --- a/src/main/java/com/shenghua/config/WebConfiguration.java +++ b/src/main/java/com/shenghua/config/WebConfiguration.java @@ -23,6 +23,10 @@ public class WebConfiguration implements WebMvcConfigurer { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { + // 新增对 本地映射,访问图片 的支持 + registry.addResourceHandler("/images/**") + .addResourceLocations("file:C:/upload/images/"); + registry.addResourceHandler("/doc.html**") .addResourceLocations("classpath:/META-INF/resources/"); diff --git a/src/main/java/com/shenghua/controller/NewsController.java b/src/main/java/com/shenghua/controller/NewsController.java index e216850..0e400f7 100644 --- a/src/main/java/com/shenghua/controller/NewsController.java +++ b/src/main/java/com/shenghua/controller/NewsController.java @@ -1,5 +1,6 @@ package com.shenghua.controller; +import com.shenghua.dto.NewsDto; import com.shenghua.dto.PageDto; import com.shenghua.entitys.Page; import com.shenghua.entitys.Result; @@ -43,8 +44,8 @@ public class NewsController { @PostMapping("/query") @ApiOperation(value = "分页查询新闻列表") - public Result>> query(@RequestBody PageDto page){ - Page> listPage = newsService.queryList(page); + public Result>> query(@RequestBody NewsDto dto){ + Page> listPage = newsService.queryList(dto); return Result.success(listPage); } diff --git a/src/main/java/com/shenghua/convert/ProductConvert.java b/src/main/java/com/shenghua/convert/ProductConvert.java index 9baa957..c06e4e7 100644 --- a/src/main/java/com/shenghua/convert/ProductConvert.java +++ b/src/main/java/com/shenghua/convert/ProductConvert.java @@ -18,7 +18,6 @@ public class ProductConvert { productVO.setTypeArr(typeArr); } productVO.setCover(product.getCover()); - productVO.setImgsRelationId(product.getImgsRelationId()); productVO.setContent(product.getContent()); productVO.setPrice(product.getPrice()); productVO.setSeoTitle(product.getSeoTitle()); diff --git a/src/main/java/com/shenghua/entitys/product/Product.java b/src/main/java/com/shenghua/entitys/product/Product.java index cb354fe..41c096e 100644 --- a/src/main/java/com/shenghua/entitys/product/Product.java +++ b/src/main/java/com/shenghua/entitys/product/Product.java @@ -32,10 +32,6 @@ public class Product { @ApiModelProperty(value = "封面图路径") private String cover; - @TableField("imgs_relation_id") - @ApiModelProperty(value = "详情图片关联ID") - private Integer imgsRelationId; - @TableField("content") @ApiModelProperty(value = "产品介绍") private String content; diff --git a/src/main/java/com/shenghua/mapper/NewsMapper.java b/src/main/java/com/shenghua/mapper/NewsMapper.java index ffa26a7..40e265f 100644 --- a/src/main/java/com/shenghua/mapper/NewsMapper.java +++ b/src/main/java/com/shenghua/mapper/NewsMapper.java @@ -23,5 +23,6 @@ public interface NewsMapper extends BaseMapper { List getHomeNewsList(); - List queryList(@Param("startNum")Integer startNum, @Param("pageSize")Integer pageSize); + List queryList(@Param("startNum")Integer startNum, @Param("pageSize")Integer pageSize, + @Param("categoryId")Integer categoryId); } diff --git a/src/main/java/com/shenghua/service/NewsService.java b/src/main/java/com/shenghua/service/NewsService.java index c6c3a03..81e8f64 100644 --- a/src/main/java/com/shenghua/service/NewsService.java +++ b/src/main/java/com/shenghua/service/NewsService.java @@ -21,7 +21,7 @@ public interface NewsService extends IService { // // NewsDetailsVo getNewsById(Integer id); - Page> queryList(PageDto page); + Page> queryList(NewsDto dto); int saveNews(News news); diff --git a/src/main/java/com/shenghua/service/impl/NewsServiceImpl.java b/src/main/java/com/shenghua/service/impl/NewsServiceImpl.java index 2790c07..317d301 100644 --- a/src/main/java/com/shenghua/service/impl/NewsServiceImpl.java +++ b/src/main/java/com/shenghua/service/impl/NewsServiceImpl.java @@ -84,20 +84,22 @@ public class NewsServiceImpl extends ServiceImpl implements Ne // } @Override - public Page> queryList(PageDto page) { + public Page> queryList(NewsDto dto) { + Integer pageSize = dto.getPageSize(); + Integer pageNum = dto.getPageNum(); // 查询总记录数 - Integer count = super.baseMapper.getAllNewsCount(null); // 假设 Mapper 中有 getNewsCount() 方法 + Integer count = super.baseMapper.getAllNewsCount(dto.getCategoryId()); // 假设 Mapper 中有 getNewsCount() 方法 if (count == 0){ - return new Page<>(page.getPageNum(), 0, page.getPageSize(), null); + return new Page<>(pageNum, 0, pageSize, null); } // 计算起始位置 - Integer startNum = (page.getPageNum() - 1) * page.getPageSize(); + Integer startNum = (pageNum - 1) * pageSize; // 查询当前页数据 - List list = super.baseMapper.queryList(page.getPageNum(), page.getPageSize()); + List list = super.baseMapper.queryList(startNum, pageSize, dto.getCategoryId()); // 返回分页对象 - return new Page<>(page.getPageNum(), count, page.getPageSize(), list); + return new Page<>(pageNum, count, pageSize, list); } @Override diff --git a/src/main/java/com/shenghua/vo/ProductVO.java b/src/main/java/com/shenghua/vo/ProductVO.java index eecb147..2f294d8 100644 --- a/src/main/java/com/shenghua/vo/ProductVO.java +++ b/src/main/java/com/shenghua/vo/ProductVO.java @@ -45,10 +45,6 @@ public class ProductVO { @ApiModelProperty(value = "商品详情图片") private List imgs; - @TableField("imgs_relation_id") - @ApiModelProperty(value = "详情图片关联ID") - private Integer imgsRelationId; - @TableField("content") @ApiModelProperty(value = "产品介绍") private String content; @@ -94,8 +90,4 @@ public class ProductVO { // @TableField("other_specs") // @ApiModelProperty(value = "其他额外规格") // private String[] otherSpecs; - - - - } diff --git a/src/main/resources/mapper/NewsMapper.xml b/src/main/resources/mapper/NewsMapper.xml index e0d2f66..dfa6908 100644 --- a/src/main/resources/mapper/NewsMapper.xml +++ b/src/main/resources/mapper/NewsMapper.xml @@ -35,7 +35,6 @@ SELECT * FROM news + + where category_id= #{categoryId} + order by create_time desc limit #{startNum},#{pageSize} diff --git a/src/main/resources/mapper/ProductMapper.xml b/src/main/resources/mapper/ProductMapper.xml index 2cc6553..45e75c8 100644 --- a/src/main/resources/mapper/ProductMapper.xml +++ b/src/main/resources/mapper/ProductMapper.xml @@ -9,7 +9,6 @@ p.category_id AS categoryId, p.type_arr AS typeArr, p.cover, - p.imgs_relation_id AS imgsRelationId, p.content, p.price, p.specs_id AS specsId,