ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit 1e255c177ae2a09750b12734e5bb9fdbbc34a718 2 parents 7724b3fc ea80ffbb

Merge branch 'pt' into test6.9.14

Inline Side-by-side
Showing 3 changed files with 92 additions and 8 deletions
@@ -38,6 +38,7 @@ import com.yohoufo.product.service.impl.ProductBatchService; @@ -38,6 +38,7 @@ import com.yohoufo.product.service.impl.ProductBatchService;
38 import com.yohoufo.product.service.impl.ProductPoolService; 38 import com.yohoufo.product.service.impl.ProductPoolService;
39 import com.yohoufo.product.service.impl.SeekToBuyStorageService; 39 import com.yohoufo.product.service.impl.SeekToBuyStorageService;
40 import com.yohoufo.product.service.impl.StoragePriceService; 40 import com.yohoufo.product.service.impl.StoragePriceService;
  41 +import com.yohoufo.product.util.ThreadPoolFactory;
41 import org.apache.commons.collections.CollectionUtils; 42 import org.apache.commons.collections.CollectionUtils;
42 import org.apache.commons.lang3.StringUtils; 43 import org.apache.commons.lang3.StringUtils;
43 import org.slf4j.Logger; 44 import org.slf4j.Logger;
@@ -55,6 +56,7 @@ import java.math.BigDecimal; @@ -55,6 +56,7 @@ import java.math.BigDecimal;
55 import java.util.*; 56 import java.util.*;
56 import java.util.concurrent.ExecutorService; 57 import java.util.concurrent.ExecutorService;
57 import java.util.concurrent.Executors; 58 import java.util.concurrent.Executors;
  59 +import java.util.function.Predicate;
58 import java.util.stream.Collectors; 60 import java.util.stream.Collectors;
59 61
60 @RestController 62 @RestController
@@ -390,8 +392,7 @@ public class ProductController { @@ -390,8 +392,7 @@ public class ProductController {
390 productService.sellerBatchUpdateStatus(skupList, dbStatus); 392 productService.sellerBatchUpdateStatus(skupList, dbStatus);
391 //清缓存 393 //清缓存
392 LOG.info("sellerUpdateStatus success and async clearProductCache skupList = {}", skupList); 394 LOG.info("sellerUpdateStatus success and async clearProductCache skupList = {}", skupList);
393 - clearBatchProductCache(skupList);  
394 - 395 + ThreadPoolFactory.cacheCleanExecutorService().submit(()->clearBatchProductCache(skupList));
395 return new ApiResponse(200, "更新成功！", Boolean.TRUE); 396 return new ApiResponse(200, "更新成功！", Boolean.TRUE);
396 } catch (Exception e) { 397 } catch (Exception e) {
397 LOG.error("sellerBatchUpdateStatus失败！", e); 398 LOG.error("sellerBatchUpdateStatus失败！", e);
@@ -601,14 +602,33 @@ public class ProductController { @@ -601,14 +602,33 @@ public class ProductController {
601 private void clearBatchProductCache(List<Integer> skupList) { 602 private void clearBatchProductCache(List<Integer> skupList) {
602 try { 603 try {
603 LOG.info("in clearBatchProductCache skupList = {}", skupList); 604 LOG.info("in clearBatchProductCache skupList = {}", skupList);
604 - List<StoragePrice> spList = productService.getStoragePriceBySkupList(skupList);  
605 - List<Integer> productIdList = spList.stream().map(StoragePrice::getProductId).distinct().collect(Collectors.toList());  
606 - List<Integer> storageIdList = spList.stream().map(StoragePrice::getStorageId).distinct().collect(Collectors.toList()); 605 + List<StoragePrice> storagePriceList = productService.getStoragePriceBySkupList(skupList);
  606 + List<Integer> productIdList = storagePriceList.stream().map(StoragePrice::getProductId).distinct().collect(Collectors.toList());
  607 + List<Integer> storageIdList = storagePriceList.stream().map(StoragePrice::getStorageId).distinct().collect(Collectors.toList());
607 if (CollectionUtils.isNotEmpty(productIdList)) { 608 if (CollectionUtils.isNotEmpty(productIdList)) {
608 for (Integer productId : productIdList) { 609 for (Integer productId : productIdList) {
609 LOG.info("Batch clearCache queryProductDetailById productId = {}, ", productId); 610 LOG.info("Batch clearCache queryProductDetailById productId = {}, ", productId);
610 611
611 - storagePriceService.publishPriceUpdateEvent(productId); 612 + storagePriceService.publishPriceUpdateEventIf(productId, oldSkupList -> {
  613 + // 缓存不存在，需要更新
  614 + if (CollectionUtils.isEmpty(oldSkupList)) {
  615 + return true;
  616 + }
  617 + // 比最低价要低，需要更新
  618 + Predicate<StoragePrice> pricePredicate = newPrice -> oldSkupList.stream()
  619 + .filter(oldPrice -> Objects.equals(newPrice.getStorageId(), oldPrice.getStorageId()))
  620 + .anyMatch(oldPrice -> newPrice.getPrice().compareTo(oldPrice.getPrice()) < 0);
  621 + if(storagePriceList.stream().anyMatch(pricePredicate)){
  622 + return true;
  623 + }
  624 + // 如果当前skup为缓存中商品，需要更新
  625 + Predicate<StoragePrice> sameSkupPredicate = newSkup -> oldSkupList.stream()
  626 + .anyMatch(oldSkup -> Objects.equals(newSkup.getSkup(), oldSkup.getSkup()));
  627 + if(storagePriceList.stream().anyMatch(sameSkupPredicate)){
  628 + return true;
  629 + }
  630 + return false;
  631 + });
612 632
613 //商品详情 633 //商品详情
614 cacheAop.clearCache( 634 cacheAop.clearCache(
@@ -659,7 +679,7 @@ public class ProductController { @@ -659,7 +679,7 @@ public class ProductController {
659 } 679 }
660 } 680 }
661 Map<String, StoragePrice> distinctStorage = new HashMap<>(); 681 Map<String, StoragePrice> distinctStorage = new HashMap<>();
662 - for(StoragePrice sp : spList) { 682 + for(StoragePrice sp : storagePriceList) {
663 Integer skup = sp.getSkup(); 683 Integer skup = sp.getSkup();
664 Integer storageId = sp.getStorageId(); 684 Integer storageId = sp.getStorageId();
665 if (sp.getPreSaleFlag() != null && (sp.getPreSaleFlag() == 5 || sp.getPreSaleFlag() == 6)) { 685 if (sp.getPreSaleFlag() != null && (sp.getPreSaleFlag() == 5 || sp.getPreSaleFlag() == 6)) {
@@ -13,11 +13,11 @@ import org.slf4j.Logger; @@ -13,11 +13,11 @@ import org.slf4j.Logger;
13 import org.slf4j.LoggerFactory; 13 import org.slf4j.LoggerFactory;
14 import org.springframework.beans.factory.annotation.Autowired; 14 import org.springframework.beans.factory.annotation.Autowired;
15 import org.springframework.stereotype.Service; 15 import org.springframework.stereotype.Service;
16 -import org.springframework.web.bind.annotation.RequestParam;  
17 16
18 import java.util.List; 17 import java.util.List;
19 import java.util.Map; 18 import java.util.Map;
20 import java.util.function.Function; 19 import java.util.function.Function;
  20 +import java.util.function.Predicate;
21 import java.util.stream.Collectors; 21 import java.util.stream.Collectors;
22 22
23 /** 23 /**
@@ -97,6 +97,13 @@ public class StoragePriceService { @@ -97,6 +97,13 @@ public class StoragePriceService {
97 return true; 97 return true;
98 } 98 }
99 99
  100 + public void publishPriceUpdateEventIf(Integer productId, Predicate<List<StoragePrice>> predicate) {
  101 + List<StoragePrice> sizePriceCacheList = productCacheService.getListCacheByString(UfoProductCacheKeyEnum.STORAGE_PRICE_IN_STOCK_INFO_KEY, StoragePrice.class, productId);
  102 + if (predicate.test(sizePriceCacheList)) {
  103 + publishPriceUpdateEvent(productId);
  104 + }
  105 + }
  106 +
100 public void publishPriceUpdateEvent(Integer productId) { 107 public void publishPriceUpdateEvent(Integer productId) {
101 LOGGER.info("method com.yohoufo.product.service.impl.StoragePriceService.publishPriceUpdateEvent in productId is 【{}】", productId); 108 LOGGER.info("method com.yohoufo.product.service.impl.StoragePriceService.publishPriceUpdateEvent in productId is 【{}】", productId);
102 109
  1 +package com.yohoufo.product.util;
  2 +
  3 +import java.util.concurrent.*;
  4 +import java.util.concurrent.atomic.AtomicInteger;
  5 +
  6 +public class ThreadPoolFactory {
  7 +
  8 + private final static ExecutorService cacheCleanExecutorService;
  9 +
  10 + static {
  11 + int numberOfProcessorsAvailable = Runtime.getRuntime().availableProcessors();
  12 + cacheCleanExecutorService = new ThreadPoolExecutor(
  13 + numberOfProcessorsAvailable,
  14 + numberOfProcessorsAvailable * 2,
  15 + 60, TimeUnit.SECONDS,
  16 + new ArrayBlockingQueue<>(100),
  17 + NamedThreadFactory.newThreadFactory("cache-clean"),
  18 + new ThreadPoolExecutor.CallerRunsPolicy()
  19 + );
  20 + }
  21 +
  22 +
  23 + public static ExecutorService cacheCleanExecutorService() {
  24 + return cacheCleanExecutorService;
  25 + }
  26 +
  27 +
  28 + public static class NamedThreadFactory implements ThreadFactory {
  29 +
  30 + private static final AtomicInteger poolNumber = new AtomicInteger(1);
  31 + private final AtomicInteger threadNumber = new AtomicInteger(1);
  32 + private final String namePrefix;
  33 + private final ThreadGroup group;
  34 +
  35 + public static ThreadFactory newThreadFactory(String bizName) {
  36 + return new NamedThreadFactory(bizName);
  37 + }
  38 +
  39 + private NamedThreadFactory(String bizName) {
  40 + SecurityManager s = System.getSecurityManager();
  41 + group = (s != null) ? s.getThreadGroup() : Thread.currentThread().getThreadGroup();
  42 + namePrefix = "product-pool-" + bizName + "-processor-" + poolNumber.getAndIncrement() + "-thread-";
  43 + }
  44 +
  45 + @Override
  46 + public Thread newThread(Runnable r) {
  47 + Thread t = new Thread(group, r, namePrefix + threadNumber.getAndIncrement(), 0);
  48 + if (t.isDaemon())
  49 + t.setDaemon(true);
  50 + if (t.getPriority() != Thread.NORM_PRIORITY)
  51 + t.setPriority(Thread.NORM_PRIORITY);
  52 + return t;
  53 + }
  54 + }
  55 +
  56 +
  57 +}