feat(shop): 添加产品关联文章功能

- 新增产品关联文章导入接口和相关服务 - 实现产品和文章的关联逻辑- 添加文章和文章类别相关的数据结构和接口

feat(shop): 添加产品关联文章功能
- 新增产品关联文章导入接口和相关服务 - 实现产品和文章的关联逻辑- 添加文章和文章类别相关的数据结构和接口
曾国涛
1 parent c146806b
Showing 17 changed files with 211 additions and 101 deletions
admin/pom.xml
admin/src/main/java/com/canrd/shop/domain/dto/ImportProductRelatedArticle.java
shop/src/main/java/com/canrd/shop/common/excel/listenter/ImportRelatedArticleListener.java
shop/src/main/java/com/canrd/shop/controller/ProductController.java
src/main/java/com/order/erp/mapper/ProductcategoryrelationMapper.java → shop/src/main/java/com/canrd/shop/mapper/JournalCategoryRelationMapper.java
src/main/java/com/order/erp/mapper/EbCategorysRelationMapper.java → shop/src/main/java/com/canrd/shop/mapper/JournalMapper.java
shop/src/main/java/com/canrd/shop/module/dto/ImportProductRelatedJournal.java
src/main/java/com/order/erp/domain/model/Productcategoryrelation.java → shop/src/main/java/com/canrd/shop/module/dto/Journal.java
src/main/java/com/order/erp/domain/model/EbCategorysRelation.java → shop/src/main/java/com/canrd/shop/module/dto/JournalCategoryRelation.java
shop/src/main/java/com/canrd/shop/module/vo/ProductVO.java
src/main/java/com/order/erp/service/IProductcategoryrelationService.java → shop/src/main/java/com/canrd/shop/service/IJournalCategoryRelationService.java
src/main/java/com/order/erp/service/IEbCategorysRelationService.java → shop/src/main/java/com/canrd/shop/service/IJournalService.java
src/main/java/com/order/erp/service/impl/ProductcategoryrelationServiceImpl.java → shop/src/main/java/com/canrd/shop/service/impl/JournalCategoryRelationServiceImpl.java
src/main/java/com/order/erp/service/impl/EbCategorysRelationServiceImpl.java → shop/src/main/java/com/canrd/shop/service/impl/JournalServiceImpl.java
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
src/main/resources/mapper/EbCategorysRelationMapper.xml
src/main/resources/mapper/ProductcategoryrelationMapper.xml
@@ -36,6 +36,11 @@
             <optional>true</optional>
         </dependency>
         <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel</artifactId>
+            <version>3.3.4</version>
+        </dependency>
+        <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
+package com.canrd.shop.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author zgt
+ * @project canrd-services
+ * @description
+ * @date 2024/11/22
+ */
+@Data
+public class ImportProductRelatedArticle {
+    @ExcelProperty("Product ID")
+    private String productId;
+    @ExcelProperty("Link")
+    private String link;
+    @ExcelProperty("Title")
+    private String title;
+}
+package com.canrd.shop.common.excel.listenter;
+
+import com.alibaba.excel.context.AnalysisContext;
+import com.alibaba.excel.event.AnalysisEventListener;
+import com.alibaba.excel.metadata.data.ReadCellData;
+import com.canrd.shop.module.dto.*;
+import com.canrd.shop.service.*;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author zgt
+ * @project canrd-services
+ * @description
+ * @date 2024/11/22
+ */
+@RequiredArgsConstructor
+@NoArgsConstructor
+public class ImportRelatedArticleListener extends AnalysisEventListener<ImportProductRelatedJournal> {
+    @NonNull
+    private ProductService productService;
+    @NonNull
+    private IProductcategoryrelationService productCategoryrelationService;
+    @NonNull
+    private IJournalCategoryRelationService journalCategoryService;
+    @NonNull
+    private IJournalService journalService;
+    @NonNull
+    private ProductCategoryService productCategoryService;
+    private Set<String> rootCategoryIds = new HashSet<>();
+    @Override
+    public void invokeHead(Map<Integer, ReadCellData<?>> headMap, AnalysisContext context) {
+        List<ProductCategoryDO> list = productCategoryService.list();
+        Set<String> parentIds = list.stream().map(ProductCategoryDO::getParentId).collect(Collectors.toSet());
+        List<ProductCategoryDO> rootCate = list.stream().filter(cate -> !parentIds.contains(cate.getId())).collect(Collectors.toList());
+        rootCategoryIds = rootCate.stream().map(ProductCategoryDO::getId).collect(Collectors.toSet());
+        super.invokeHead(headMap, context);
+    }
+
+    @Override
+    public void invoke(ImportProductRelatedJournal importProductRelatedJournal, AnalysisContext analysisContext) {
+        String productId = importProductRelatedJournal.getProductId();
+        Journal journal = Journal.builder()
+                .link(importProductRelatedJournal.getLink())
+                .title(importProductRelatedJournal.getTitle())
+                .productId(productId)
+                .build();
+        journalService.save(journal);
+        List<Productcategoryrelation> list = productCategoryrelationService.lambdaQuery()
+                .eq(Productcategoryrelation::getProductId, productId)
+                .in(Productcategoryrelation::getCategoryId, rootCategoryIds)
+                .list();
+        List<JournalCategoryRelation> relations = list.stream().map(productcategoryrelation -> JournalCategoryRelation.builder()
+                .journalId(journal.getId())
+                .categoryId(productcategoryrelation.getCategoryId())
+                .build()).collect(Collectors.toList());
+        journalCategoryService.saveBatch(relations);
+    }
+
+    @Override
+    public void doAfterAllAnalysed(AnalysisContext analysisContext) {
+    }
+}
@@ -4,9 +4,11 @@ import cn.hutool.core.collection.CollUtil;
 import com.alibaba.excel.EasyExcel;
 import com.canrd.shop.common.constant.ServerResult;
 import com.canrd.shop.common.excel.listenter.ImportRelatedCategoryListenter;
+import com.canrd.shop.common.excel.listenter.ImportRelatedArticleListener;
 import com.canrd.shop.common.exception.BusinessException;
 import com.canrd.shop.common.jsr303.OperateGroup;
 import com.canrd.shop.config.StaticHtmlConfig;
+import com.canrd.shop.module.dto.ImportProductRelatedJournal;
 import com.canrd.shop.module.dto.ProductCategoryDO;
 import com.canrd.shop.module.dto.ProductDO;
 import com.canrd.shop.module.dto.ProductFunctionDO;
@@ -14,14 +16,11 @@ import com.canrd.shop.module.vo.ImportRelatedCategoryVo;
 import com.canrd.shop.module.vo.ProductCategoryQueryVO;
 import com.canrd.shop.module.vo.ProductQueryVO;
 import com.canrd.shop.module.vo.ProductVO;
-import com.canrd.shop.service.IEbCategorysRelationService;
-import com.canrd.shop.service.ProductCategoryService;
-import com.canrd.shop.service.ProductFunctionService;
-import com.canrd.shop.service.ProductService;
+import com.canrd.shop.service.*;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
-import org.apache.catalina.Server;
+import lombok.NonNull;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -32,10 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.*;
-import java.lang.reflect.Field;
-import java.net.URL;
 import java.util.*;
-import java.util.stream.Stream;
 /**
  * (Product)表控制层
@@ -47,6 +43,12 @@ import java.util.stream.Stream;
 @RequestMapping("/shop/product")
 public class ProductController {
     @Autowired
+    private IProductcategoryrelationService productCategoryrelationService;
+    @Autowired
+    private IJournalCategoryRelationService journalCategoryService;
+    @Autowired
+    private IJournalService journalService;
+    @Autowired
     private Configuration freeMarkerConfig;
     @Value("${spring.profiles.active}")
     private String activeProfile;
@@ -238,5 +240,16 @@ public class ProductController {
         return ServerResult.success();
     }
+
+    @PostMapping("importRelatedJournal")
+    @ResponseBody
+    public ServerResult importRelatedJournal(MultipartFile file) throws IOException {
+        EasyExcel.read(file.getInputStream(),
+                ImportProductRelatedJournal.class,
+                new ImportRelatedArticleListener(productService,productCategoryrelationService,journalCategoryService,journalService,productCategoryService))
+                .sheet()
+                .doRead();
+        return ServerResult.success();
+    }
 }
-package com.order.erp.mapper;
+package com.canrd.shop.mapper;
-import com.order.erp.domain.model.Productcategoryrelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.canrd.shop.module.dto.JournalCategoryRelation;
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
-public interface ProductcategoryrelationMapper extends BaseMapper<Productcategoryrelation> {
+public interface JournalCategoryRelationMapper extends BaseMapper<JournalCategoryRelation> {
 }
-package com.order.erp.mapper;
+package com.canrd.shop.mapper;
-import com.order.erp.domain.model.EbCategorysRelation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.canrd.shop.module.dto.Journal;
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
-public interface EbCategorysRelationMapper extends BaseMapper<EbCategorysRelation> {
+public interface JournalMapper extends BaseMapper<Journal> {
 }
+package com.canrd.shop.module.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author zgt
+ * @project canrd-services
+ * @description
+ * @date 2024/11/22
+ */
+@Data
+public class ImportProductRelatedJournal {
+    @ExcelProperty("Product ID")
+    private String productId;
+    @ExcelProperty("Link")
+    private String link;
+    @ExcelProperty("Title")
+    private String title;
+}
-package com.order.erp.domain.model;
+package com.canrd.shop.module.dto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
 /**
  * <p>
@@ -17,22 +18,25 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("productcategoryrelation")
-@ApiModel(value="Productcategoryrelation对象", description="")
-public class Productcategoryrelation implements Serializable {
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("journal")
+public class Journal implements Serializable {
     private static final long serialVersionUID = 1L;
-    private String productId;
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
-    private String categoryId;
+    private String link;
-    private LocalDateTime modifyDate;
+    private String productId;
+    private String title;
 }
-package com.order.erp.domain.model;
+package com.canrd.shop.module.dto;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import lombok.experimental.SuperBuilder;
 /**
  * <p>
@@ -16,29 +18,24 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@TableName("eb_categorys_relation")
-@ApiModel(value="EbCategorysRelation对象", description="")
-public class EbCategorysRelation implements Serializable {
+@SuperBuilder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName("journal_category_relation")
+public class JournalCategoryRelation implements Serializable {
     private static final long serialVersionUID = 1L;
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
-    private String categoryName;
-
-    private String relatedCategoryName;
-
-    private Integer categoryId;
-
-    private Integer relatedCategoryId;
+    private Long journalId;
-    private Integer relevance;
+    private String categoryId;
 }
 package com.canrd.shop.module.vo;
+import com.canrd.shop.module.dto.Journal;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
@@ -145,4 +146,6 @@ public class ProductVO implements Serializable {
     private List<String> RelatedProductIds;
+    private List<Journal> journals;
+
 }
-package com.order.erp.service;
+package com.canrd.shop.service;
-import com.order.erp.domain.model.Productcategoryrelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.canrd.shop.module.dto.JournalCategoryRelation;
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
-public interface IProductcategoryrelationService extends IService<Productcategoryrelation> {
+public interface IJournalCategoryRelationService extends IService<JournalCategoryRelation> {
 }
-package com.order.erp.service;
+package com.canrd.shop.service;
-import com.order.erp.domain.model.EbCategorysRelation;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.canrd.shop.module.dto.Journal;
 /**
  * <p>
@@ -9,8 +9,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
-public interface IEbCategorysRelationService extends IService<EbCategorysRelation> {
+public interface IJournalService extends IService<Journal> {
 }
-package com.order.erp.service.impl;
+package com.canrd.shop.service.impl;
-import com.order.erp.domain.model.Productcategoryrelation;
-import com.order.erp.mapper.ProductcategoryrelationMapper;
-import com.order.erp.service.IProductcategoryrelationService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.canrd.shop.mapper.JournalCategoryRelationMapper;
+import com.canrd.shop.module.dto.JournalCategoryRelation;
+import com.canrd.shop.service.IJournalCategoryRelationService;
 import org.springframework.stereotype.Service;
 /**
@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
 @Service
-public class ProductcategoryrelationServiceImpl extends ServiceImpl<ProductcategoryrelationMapper, Productcategoryrelation> implements IProductcategoryrelationService {
+public class JournalCategoryRelationServiceImpl extends ServiceImpl<JournalCategoryRelationMapper, JournalCategoryRelation> implements IJournalCategoryRelationService {
 }
-package com.order.erp.service.impl;
+package com.canrd.shop.service.impl;
-import com.order.erp.domain.model.EbCategorysRelation;
-import com.order.erp.mapper.EbCategorysRelationMapper;
-import com.order.erp.service.IEbCategorysRelationService;
+import com.canrd.shop.module.dto.Journal;
+import com.canrd.shop.service.IJournalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.canrd.shop.mapper.JournalMapper;
 import org.springframework.stereotype.Service;
 /**
@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author author
- * @since 2024-11-14
+ * @since 2024-11-25
  */
 @Service
-public class EbCategorysRelationServiceImpl extends ServiceImpl<EbCategorysRelationMapper, EbCategorysRelation> implements IEbCategorysRelationService {
+public class JournalServiceImpl extends ServiceImpl<JournalMapper, Journal> implements IJournalService {
 }
@@ -77,6 +77,11 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
     @Autowired
     private IEbCategorysRelationService ebCategorysRelationService;
+    @Autowired
+    private IJournalCategoryRelationService journalCategoryService;
+    @Autowired
+    private IJournalService journalService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -144,9 +149,11 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
         StringJoiner orderByJoiner = new StringJoiner(" when "," order by case pc.id when "," else 0 end ");
         cateId2Relevance.forEach((k,v)->orderByJoiner.add("'"+k+"'"+" then "+v));
         QueryWrapper<ProductDO> objectQueryWrapper = new QueryWrapper<ProductDO>()
+                .eq("ismarketable",true)
                 .in("pc.id", cateId2Relevance.keySet())
                 .select("distinct p.id","pc.id")
                 .last(orderByJoiner.toString());
+
         List<ProductDO> relatedProducts = this
                 .list(objectQueryWrapper);
         List<String> relatedProductIds = relatedProducts.stream()
@@ -156,6 +163,14 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
                 .collect(Collectors.toList());
         productVO.setRelatedProductIds(relatedProductIds);
+        List<JournalCategoryRelation> journalCategoryRelations = journalCategoryService.lambdaQuery()
+                .in(JournalCategoryRelation::getCategoryId, categoryIds)
+                .list();
+        List<Long> journalIds = journalCategoryRelations.stream().map(JournalCategoryRelation::getJournalId).collect(Collectors.toList());
+        List<Journal> journals = journalService.lambdaQuery()
+                .in(Journal::getId, journalIds)
+                .page(new Page<>(1,10)).getRecords();
+        productVO.setJournals(journals);
         productVO.setPriceShow(productPriceShow);
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.order.erp.mapper.EbCategorysRelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.order.erp.domain.model.EbCategorysRelation">
-        <id column="id" property="id" />
-        <result column="category_name" property="categoryName" />
-        <result column="related_category_name" property="relatedCategoryName" />
-        <result column="category_id" property="categoryId" />
-        <result column="related_category_id" property="relatedCategoryId" />
-        <result column="relevance" property="relevance" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        id, category_name, related_category_name, category_id, related_category_id, relevance
-    </sql>
-
-</mapper>
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.order.erp.mapper.ProductcategoryrelationMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.order.erp.domain.model.Productcategoryrelation">
-        <result column="productId" property="productId" />
-        <result column="categoryId" property="categoryId" />
-        <result column="modifyDate" property="modifyDate" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        productId, categoryId, modifyDate
-    </sql>
-
-</mapper>