Merge branch 'master' of http://39.108.227.113:8001/xiemaosheng2/canrd-services

boyang
2 parents d0fe8625 d64fe3d7
Showing 7 changed files with 71 additions and 15 deletions
shop/src/main/java/com/canrd/shop/controller/ProductController.java
shop/src/main/java/com/canrd/shop/module/vo/ProductQueryVO.java
shop/src/main/java/com/canrd/shop/service/ProductCategoryService.java
shop/src/main/java/com/canrd/shop/service/impl/ProductCagegoryServiceImpl.java
shop/src/main/java/com/canrd/shop/service/impl/ProductServiceImpl.java
shop/src/main/resources/log4j2-dev.xml
shop/src/main/resources/templates/canrud.ftl
@@ -12,10 +12,7 @@ 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;
-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.module.vo.*;
 import com.canrd.shop.service.*;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
@@ -32,6 +29,8 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import java.io.*;
 import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
  
 /**
  * (Product)表控制层
@@ -81,6 +80,54 @@ public class ProductController {
         return productCategoryService.category(productCategoryQueryVO);
     }
  
+    @GetMapping("/generateAllUrl")
+    public ServerResult generateAllUrl(){
+        ProductCategoryQueryVO productCategoryQueryVO = new ProductCategoryQueryVO();
+        ServerResult<ProductCategoryResultVO> category = productCategoryService.category(productCategoryQueryVO);
+        ProductCategoryResultVO data = category.getData();
+        List<ProductCategoryDisplayVO> rootCategoryList = data.getRootCategoryList();
+
+        Map<String, ProductCategoryDisplayVO> name2ProductCategoryDisplayVOMap = rootCategoryList.stream()
+                .collect(Collectors.toMap(ProductCategoryDisplayVO::getCategoryDisplayName, v -> v));
+
+        List<ProductQueryVO> queries = name2ProductCategoryDisplayVOMap.entrySet().stream()
+                .flatMap(entry -> {
+                    String rootCategoryName = entry.getKey();
+                    ProductCategoryDisplayVO categoryDisplay = entry.getValue();
+                    List<String> cateNames = categoryDisplay.getList().stream().map(ProductCategoryVO::getName).collect(Collectors.toList());
+                    List<String> funNames = Optional.ofNullable(categoryDisplay.getProductFunctions()).orElse(new ArrayList<ProductFunctionVO>())
+                            .stream().map(ProductFunctionVO::getName).collect(Collectors.toList());
+
+                    return cateNames.stream().flatMap(cateName -> {
+                        if (CollUtil.isEmpty(funNames)) {
+                            return Stream.of(ProductQueryVO.builder()
+                                    .rootProductCategoryName(rootCategoryName)
+                                    .productCategoryName(cateName)
+                                    .pageNo(1)
+                                    .pageSize(20)
+                                    .build());
+                        } else {
+                            return funNames.stream().map(funName -> ProductQueryVO.builder()
+                                    .rootProductCategoryName(rootCategoryName)
+                                    .productCategoryName(cateName)
+                                    .productFunctionName(funName)
+                                    .pageNo(1)
+                                    .pageSize(20)
+                                    .build());
+                        }
+                    });
+                })
+                .collect(Collectors.toList());
+        queries.forEach(query -> {
+            try {
+                generateList(query,"canrd@2024");
+            } catch (IOException | TemplateException e) {
+                throw new RuntimeException(e);
+            }
+        });
+        return ServerResult.success();
+    }
+
     @GetMapping("/categorySearch")
     public ServerResult categorySearch(ProductQueryVO productQueryVO){
         return productService.categorySearch(productQueryVO);
@@ -126,13 +173,12 @@ public class ProductController {
             }
         }
         if(StringUtils.isNotBlank(productQueryVO.getRootProductCategoryName())){
-            Optional<ProductCategoryDO> productCategoryDOOpt = productCategoryService.lambdaQuery()
+            List<ProductCategoryDO> list = productCategoryService.lambdaQuery()
                     .eq(ProductCategoryDO::getName, productQueryVO.getRootProductCategoryName())
-                    .oneOpt();
+                    .list();
+            List<String> collect = list.stream().map(ProductCategoryDO::getId).collect(Collectors.toList());
             productQueryVO
-                    .setRootProductCategoryId(productCategoryDOOpt
-                            .orElseThrow(()-> new BusinessException("productCategoryName not exist"))
-                            .getId());
+                    .setRootProductCategoryIdIn(collect);
         }
         if(StringUtils.isNotBlank(productQueryVO.getProductFunctionName())){
             Optional<ProductFunctionDO> productFunctionDO = productFunctionService.lambdaQuery()
@@ -145,7 +191,7 @@ public class ProductController {
         String path = staticHtmlConfig.getUrl();
         String fileName = (StringUtils.isNotBlank(productQueryVO.getRootProductCategoryName())?productQueryVO.getRootProductCategoryName():"-")
                 +"_"
-                +(StringUtils.isNotBlank(productQueryVO.getProductCategoryName())?productQueryVO.getProductCategoryName():"-")
+                +(StringUtils.isNotBlank(productQueryVO.getProductCategoryName())?productQueryVO.getProductCategoryName().replace('/','-'):"-")
                 +"_"
                 +(StringUtils.isNotBlank(productQueryVO.getProductFunctionName())?productQueryVO.getProductFunctionName():"-")
                 +"_"
@@ -36,6 +36,11 @@ public class ProductQueryVO extends BasePageVO implements Serializable {
     private String rootProductCategoryId;
  
     /**
+     * 顶级产品分类
+     */
+    private List<String> rootProductCategoryIdIn;
+
+    /**
      * 产品分类id
      */
     private String productCategoryId;
@@ -5,6 +5,7 @@ import com.canrd.shop.common.constant.ServerResult;
 import com.canrd.shop.module.dto.ProductCategoryDO;
 import com.canrd.shop.module.dto.ProductDO;
 import com.canrd.shop.module.vo.ProductCategoryQueryVO;
+import com.canrd.shop.module.vo.ProductCategoryResultVO;
 import com.canrd.shop.module.vo.ProductQueryVO;
  
 /**
@@ -18,6 +19,6 @@ public interface ProductCategoryService  extends IService&lt;ProductCategoryDO&gt; {
      * @param productCategoryQueryVO
      * @return
      */
-    ServerResult category(ProductCategoryQueryVO productCategoryQueryVO);
+    ServerResult<ProductCategoryResultVO> category(ProductCategoryQueryVO productCategoryQueryVO);
  
 }
@@ -40,7 +40,7 @@ public class ProductCagegoryServiceImpl extends ServiceImpl&lt;ProductCategoryMappe
     private ProductFunctionService productFunctionService;
  
     @Override
-    public ServerResult category(ProductCategoryQueryVO productCategoryQueryVO) {
+    public ServerResult<ProductCategoryResultVO> category(ProductCategoryQueryVO productCategoryQueryVO) {
         List<ProductCategoryDO> productCategoryDOList = this.list();
         List<ProductCategoryVO> energyMaterialCategoryList = Lists.newArrayList();
         List<ProductCategoryVO> laboratoryConsumables = Lists.newArrayList();
@@ -283,6 +283,7 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
             queryWapper.eq("pc.id",productQueryVO.getProductCategoryId());
         }else if (StringUtils.isNotBlank(productQueryVO.getRootProductCategoryId())){
             queryWapper.eq("pc.id",productQueryVO.getRootProductCategoryId());
+            queryWapper.in(CollUtil.isNotEmpty(productQueryVO.getRootProductCategoryIdIn()),"pc.id",productQueryVO.getRootProductCategoryIdIn());
         }
         if(StringUtils.isNotBlank(productQueryVO.getProductFunctionId())){
             queryWapper.eq("pf.id",productQueryVO.getProductFunctionId());
@@ -390,6 +391,8 @@ public class ProductServiceImpl extends ServiceImpl&lt;ProductMapper, ProductDO&gt; im
             queryWapper.eq("pc.id",productQueryVO.getProductCategoryId());
         }else if (StringUtils.isNotBlank(productQueryVO.getRootProductCategoryId())){
             queryWapper.eq("pc.id",productQueryVO.getRootProductCategoryId());
+            queryWapper.in(CollUtil.isNotEmpty(productQueryVO.getRootProductCategoryIdIn()),"pc.id",productQueryVO.getRootProductCategoryIdIn());
+
         }
         if(StringUtils.isNotBlank(productQueryVO.getProductFunctionId())){
             queryWapper.eq("pf.id",productQueryVO.getProductFunctionId());
@@ -20,7 +20,8 @@
         <console name="Console" target="SYSTEM_OUT">
             <!--输出日志的格式 -->
             <PatternLayout charset="UTF-8" pattern="${console_log_pattern}"/>
-            <ThresholdFilter level="debug" onMatch="ACCEPT" onMismatch="DENY" />
+            <!-- 只接受ERROR级别及其以上的日志 -->
+            <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY" />
         </console>
         <!-- 这个会打印出所有的info及以下级别的信息，每次大小超过size，则这size大小的日志会自动存入按年份-月份建立的文件夹下面并进行压缩，作为存档 -->
         <RollingFile name="RollingFileInfo" fileName="${sys:logging.path}/logs/overtime.log" filePattern="${sys:logging.path}/logs/$${date:yyyy-MM-dd}/info-%d{yyyy-MM-dd}-%i.log">
@@ -54,7 +55,7 @@
         <logger name="com.canrd.shop" level="debug" additivity="false">
             <appender-ref ref="RollingFileInfo" />
         </logger>
-        <root level="debug">
+        <root level="error">
             <appender-ref ref="Console" />
         </root>
     </loggers>
@@ -27202,7 +27202,7 @@
                                     </div>
                                     <div data-v-f467c4e7="" class="v-card-text tw-text-left font-weight-medium title">
                                         <!--商品-->
-                                        <h3 data-v-f6bc2735="" style="color: red;"> ${item.price}</h3>
+                                        <h3 data-v-f6bc2735="" style="color: red;"> ${item.price!""}</h3>
                                         <h4 data-v-f467c4e7="">${item.name}</h4>
                                     </div>
                                     <!----><span class="v-card__overlay"></span><span