Add product-function relation and optimize service

柏杨
1 parent 70f3e3ed
Showing 10 changed files with 111 additions and 12 deletions
shop/src/main/java/com/canrd/shop/mapper/ProductFunctionMapper.java
shop/src/main/java/com/canrd/shop/module/dto/FunctionDO.java
shop/src/main/java/com/canrd/shop/module/dto/ProductFunctionDO.java
shop/src/main/java/com/canrd/shop/module/vo/ProductCrumbsVO.java
shop/src/main/java/com/canrd/shop/module/vo/ProductVO.java
shop/src/main/java/com/canrd/shop/service/ProductFunctionService.java
shop/src/main/java/com/canrd/shop/service/impl/ProductFunctionServiceImpl.java
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
shop/src/main/resources/application-local.yml
shop/src/main/resources/mapper/ProductFunctionMapper.xml
@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.canrd.shop.module.dto.ProductCategoryDO;
 import com.canrd.shop.module.dto.ProductFunctionDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
  * @author hongtao.zhao
@@ -11,4 +14,5 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ProductFunctionMapper extends BaseMapper<ProductFunctionDO> {
+    List<ProductFunctionDO> getFirstFunction(@Param("id") String productId);
 }
+package com.canrd.shop.module.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@TableName("productfunctionrelation")
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class FunctionDO {
+    @TableField(value = "productId")
+    private String productId;
+    @TableField(value = "functionId")
+    private String functionId;
+}
+
@@ -24,6 +24,4 @@ public class ProductFunctionDO {
     private String id;
     private String name;
-
-
 }
+package com.canrd.shop.module.vo;
+
+import lombok.*;
+import lombok.experimental.SuperBuilder;
+
+@Data
+@AllArgsConstructor
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+@SuperBuilder
+public class ProductCrumbsVO {
+    String category1;
+    String category2;
+    String function;
+}
@@ -51,6 +51,8 @@ public class ProductVO implements Serializable {
     private String metakeywords;
+    private ProductCrumbsVO productCrumbsVO;
+
     private String name;
     private String englishname;
 package com.canrd.shop.service;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.canrd.shop.module.dto.ProductCategoryDO;
 import com.canrd.shop.module.dto.ProductFunctionDO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
  * @author hongtao.zhao
  * @since 2023-06-10
  */
 public interface ProductFunctionService extends IService<ProductFunctionDO> {
+    List<ProductFunctionDO> getFirstFunction(String id);
 }
 package com.canrd.shop.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.canrd.shop.mapper.ProductCategoryMapper;
 import com.canrd.shop.mapper.ProductFunctionMapper;
-import com.canrd.shop.module.dto.ProductCategoryDO;
 import com.canrd.shop.module.dto.ProductFunctionDO;
-import com.canrd.shop.service.ProductCategoryService;
 import com.canrd.shop.service.ProductFunctionService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 /**
  * @author hongtao.zhao
  * @since 2023-06-10
  */
 @Service
 public class ProductFunctionServiceImpl  extends ServiceImpl<ProductFunctionMapper, ProductFunctionDO> implements ProductFunctionService {
+    @Override
+    public List<ProductFunctionDO> getFirstFunction(@Param("id")String productId) {
+        return this.baseMapper.getFirstFunction(productId);
+    }
 }
@@ -18,15 +18,13 @@ import com.canrd.shop.common.utils.StringUtils;
 import com.canrd.shop.converter.ProductConverter;
 import com.canrd.shop.mapper.ProductMapper;
 import com.canrd.shop.module.dto.*;
-import com.canrd.shop.module.vo.ProductAttributeVO;
-import com.canrd.shop.module.vo.ProductQueryVO;
-import com.canrd.shop.module.vo.ProductVO;
-import com.canrd.shop.module.vo.TickeyTypeVO;
+import com.canrd.shop.module.vo.*;
 import com.canrd.shop.service.*;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.BooleanUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -77,6 +75,12 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
     @Autowired
     private IEbCategorysRelationService ebCategorysRelationService;
+    @Autowired
+    private ProductCategoryService categoryService;
+
+    @Autowired
+    private ProductFunctionService functionService;
+
     /**
      * 通过ID查询单条数据
      * <p>
@@ -134,6 +138,36 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
                 .list();
         List<String> categoryIds = productcategoryrelations.stream().map(Productcategoryrelation::getCategoryId).collect(Collectors.toList());
+        List<ProductCategoryDO> productCategories = categoryService.lambdaQuery()
+                .in(ProductCategoryDO::getId, categoryIds)
+                .eq(ProductCategoryDO::getParentId, "33ba6943c8bf4ca082614f299865341c")
+                .list();
+        ProductCategoryDO firstCategory = productCategories.get(0);
+        List<ProductCategoryDO> productCategories2 = categoryService.lambdaQuery()
+                .in(ProductCategoryDO::getId, categoryIds)
+                .eq(ProductCategoryDO::getParentId, firstCategory.getId())
+                .list();
+//        ProductCategoryDO secondCategory = productCategories2.get(0);
+        ProductCategoryDO secondCategory = productCategories2.stream()
+                .filter(category -> !"Not specified".equals(category.getName()))
+                .findFirst()
+                .orElse(productCategories2.get(0)); // 如果找不到，使用列表第一个元素
+        // 从 functionService 获取 functionId
+        List<ProductFunctionDO> functions = functionService.getFirstFunction(productVO.getId());
+        ProductFunctionDO selectedFunction = null;
+        if(functions != null && functions.size() > 0) {
+            selectedFunction = functions.stream()
+                    .filter(function -> !"Not specified".equals(function.getName()))
+                    .findFirst()
+                    .orElse(functions.get(0)); // 如果找不到，使用列表第一个元素
+        }
+        ProductCrumbsVO productCrumbsVO = ProductCrumbsVO.builder()
+                .category1(firstCategory.getName())   //
+                .category2(secondCategory.getName())
+                .function(selectedFunction.getName())
+                .build();
+        productVO.setProductCrumbsVO(productCrumbsVO);
+
         List<EbCategorysRelation> cateRelations = ebCategorysRelationService.lambdaQuery()
                 .in(EbCategorysRelation::getCategoryId, categoryIds)
                 .list();
@@ -63,7 +63,7 @@ spring:
     username: root
-logging:
-  config: classpath:log4j2-dev.xml
+#logging:
+#  config: classpath:log4jj2-dev.xml
 openai:
   token: Bearer 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
 \ No newline at end of file
+<?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.canrd.shop.mapper.ProductFunctionMapper">
+
+<!--    <select id="getFirstFunction" resultType="com.canrd.shop.module.dto.ProductFunctionDO"-->
+<!--            parameterType="java.lang.String">-->
+    <select id="getFirstFunction" resultType="com.canrd.shop.module.dto.ProductFunctionDO"
+            parameterType="java.lang.String">
+        SELECT pf.*
+        FROM productfunction pf
+        WHERE pf.id IN (
+            SELECT pfr.functionId
+            FROM productfunctionrelation pfr
+            WHERE pfr.productId = #{id}
+        );
+    </select>
+</mapper>
 \ No newline at end of file