From da4c766d07a83e62992a0e287b678e13aeb6afda Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 04 十二月 2019 10:28:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java | 441 ++++++++++++++++++++++++++++---------------------------
1 files changed, 225 insertions(+), 216 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
index 694aaae..9d77cab 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandGoodsCaheServiceImpl.java
@@ -21,6 +21,7 @@
import com.yeshi.fanli.entity.taobao.SearchFilter;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoSearchResult;
+import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.brand.BrandGoodsCaheService;
import com.yeshi.fanli.service.inter.brand.BrandShopCaheService;
import com.yeshi.fanli.service.inter.config.ConfigService;
@@ -40,14 +41,13 @@
@Resource
private ConfigService configService;
-
+
@Resource
private BrandGoodsCaheDao brandGoodsCaheDao;
-
+
@Resource
private BrandShopCaheService brandShopCaheService;
-
-
+
@Override
public BrandInfo addBrandGoods(BrandInfo brandInfo) {
// 娣樺疂
@@ -56,264 +56,273 @@
BrandInfo goodsJD = addBrandGoodsJD(brandInfo);
// 鎷煎澶�
BrandInfo goodsPDD = addBrandGoodsPDD(brandInfo);
-
- int goodsTotal = goodsTB.getGoodsTotal() + goodsJD.getGoodsTotal() + goodsPDD.getGoodsTotal();
- int shopTotal = goodsTB.getShopTotal() + goodsJD.getShopTotal() + goodsPDD.getShopTotal();
+
+ int goodsTotal = goodsTB.getGoodsTotal() + goodsJD.getGoodsTotal() + goodsPDD.getGoodsTotal();
+ int shopTotal = goodsTB.getShopTotal() + goodsJD.getShopTotal() + goodsPDD.getShopTotal();
goodsTB.setGoodsTotal(goodsTotal);
goodsTB.setShopTotal(shopTotal);
return goodsTB;
}
-
-
+
/**
* 娣樺疂鍟嗗搧
+ *
* @param brandInfo
* @return
*/
private BrandInfo addBrandGoodsTB(BrandInfo brandInfo) {
- BrandInfo numInfo = new BrandInfo();
Date date = new Date();
- String shopKey = brandInfo.getShopKey();
- if (StringUtil.isNullOrEmpty(shopKey)) {
- // 鍒犻櫎涔嬪墠鐨�
- brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1 , date);
- // 鍒犻櫎搴楅摵
- brandShopCaheService.removeByDateAndType(brandInfo.getId(), 11, date);
-
- numInfo.setShopTotal(0);
- numInfo.setGoodsTotal(0);
- return numInfo;
- }
-
- String searchKey = brandInfo.getSearchKey();
- if (StringUtil.isNullOrEmpty(searchKey))
- searchKey = brandInfo.getName();
-
- SearchFilter filter = new SearchFilter();
- filter.setKey(searchKey);
- filter.setPage(1);
- filter.setPageSize(100);
- filter.setTmall(true);
- filter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
- TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(filter);
-
- // 鍒犻櫎搴楅摵
- brandShopCaheService.removeByDateAndType(brandInfo.getId(), 11, date);
-
- // 缁勭粐鍟嗗搧 + 娣诲姞搴楅摵
- int count = 0;
- int countShop = 0;
- if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
- && searchResult.getTaoBaoGoodsBriefs().size() > 0) {
- boolean addShop = true;
- List<TaoBaoGoodsBrief> listGoods = searchResult.getTaoBaoGoodsBriefs();
- for (TaoBaoGoodsBrief goods: listGoods) {
- // 娣诲姞搴楅摵
- String shopTitle = goods.getShopTitle();
- if (addShop && !StringUtil.isNullOrEmpty(shopTitle) && shopTitle.contains("鏃楄埌搴�")
- && shopTitle.toLowerCase().contains(shopKey.toLowerCase())) {
- addShop = brandShopCaheService.addBrandShopTB(brandInfo, goods.getAuctionId(),
- goods.getSellerId());
-
- if (!addShop)
- countShop = 1;
- }
-
- // 娣诲姞鍟嗗搧
- if (count < 50) {
- BrandGoodsCahe brandGoods = new BrandGoodsCahe();
- brandGoods.setBrandId(brandInfo.getId());
- brandGoods.setWeight((int) (Math.random() * 1000));
- brandGoods.setGoodsType(1);
- brandGoods.setGoodsTB(goods);
- brandGoods.setCreateTime(new Date());
- brandGoodsCaheDao.insert(brandGoods);
- count ++;
- } else if (!addShop) {
- break;
- }
- }
- }
-
- // 鍒犻櫎涔嬪墠鐨�
- brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1 , date);
-
- numInfo.setShopTotal(countShop);
- numInfo.setGoodsTotal(count);
- return numInfo;
- }
-
-
- /**
- * 浜笢鍟嗗搧
- *
- * @param brandInfo
- * @return
- */
- private BrandInfo addBrandGoodsJD(BrandInfo brandInfo) {
BrandInfo numInfo = new BrandInfo();
- Date date = new Date();
- String shopKey = brandInfo.getShopKeyJD();
- if (StringUtil.isNullOrEmpty(shopKey)) {
- // 鍒犻櫎搴楅摵
- brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);
- // 鍒犻櫎涔嬪墠
- brandGoodsCaheDao.removeByDate(brandInfo.getId(), 2 , date);
- numInfo.setShopTotal(0);
- numInfo.setGoodsTotal(0);
- return numInfo;
- }
-
- String searchKey = brandInfo.getSearchKeyJD();
- if (StringUtil.isNullOrEmpty(searchKey))
- searchKey = brandInfo.getName();
-
- int count = 0;
- int countShop = 0;
- JDSearchResult result = null;
- String way = configService.get("jd_api_search_key");
-
- // 鍒犻櫎搴楅摵
- brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);
-
- boolean addShop = true;
-
- for (int i=0; i < 2;i ++) {
- if ("1".equals(way)) {
- JDFilter filterAPI = new JDFilter();
- filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(searchKey));
- filterAPI.setPageIndex(1);
- filterAPI.setPageSize(30);
- filterAPI.setSort(JDFilter.SORT_DESC);
- filterAPI.setSortName(JDFilter.SORTNAME_ORDER_COUNT_30DAYS);
- result = JDApiUtil.queryByKey(filterAPI);
- } else {
- // 缃戦〉鐖彇
- JDSearchFilter jdfilter = new JDSearchFilter();
- jdfilter.setKey(SearchFilterUtil.filterSearchContent(searchKey));
- jdfilter.setPageNo(1);
- jdfilter.setPageSize(30);
- jdfilter.setSort(JDSearchFilter.SORT_DESC);
- jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
- result = JDUtil.searchByKey(jdfilter);
+ numInfo.setShopTotal(0);
+ numInfo.setGoodsTotal(0);
+ try {
+ String shopKey = brandInfo.getShopKey();
+ if (StringUtil.isNullOrEmpty(shopKey)) {
+ // 鍒犻櫎涔嬪墠鐨�
+ brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1, date);
+ // 鍒犻櫎搴楅摵
+ brandShopCaheService.removeByDateAndType(brandInfo.getId(), 11, date);
+
+ return numInfo;
}
-
- if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0) {
- List<JDGoods> goodsList = result.getGoodsList();
- for (JDGoods goods : goodsList) {
- BrandGoodsCahe brandGoods = new BrandGoodsCahe();
- brandGoods.setBrandId(brandInfo.getId());
- brandGoods.setWeight((int) (Math.random() * 1000));
- brandGoods.setGoodsJD(goods);
- brandGoods.setGoodsType(2);
- brandGoods.setCreateTime(new Date());
- brandGoodsCaheDao.insert(brandGoods);
-
- JDShopInfo shopInfo = goods.getShopInfo();
- if (addShop && shopInfo != null) {
- // 鍖呭惈璇ュ搧鐗屽悕绉�
- String shopName = shopInfo.getShopName();
- if (!StringUtil.isNullOrEmpty(shopName) && shopName.toLowerCase().contains(shopKey.toLowerCase())) {
- addShop = false;
- brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);
+
+ String searchKey = brandInfo.getSearchKey();
+ if (StringUtil.isNullOrEmpty(searchKey))
+ searchKey = brandInfo.getName();
+
+ SearchFilter filter = new SearchFilter();
+ filter.setKey(searchKey);
+ filter.setPage(1);
+ filter.setPageSize(100);
+ filter.setTmall(true);
+ filter.setSort(TaoBaoUtil.SORT_SALE_HIGH_TO_LOW);
+ TaoBaoSearchResult searchResult = TaoKeApiUtil.searchWuLiao(filter);
+
+ // 鍒犻櫎搴楅摵
+ brandShopCaheService.removeByDateAndType(brandInfo.getId(), 11, date);
+
+ // 缁勭粐鍟嗗搧 + 娣诲姞搴楅摵
+ int count = 0;
+ int countShop = 0;
+ if (searchResult != null && searchResult.getTaoBaoGoodsBriefs() != null
+ && searchResult.getTaoBaoGoodsBriefs().size() > 0) {
+ boolean addShop = true;
+ List<TaoBaoGoodsBrief> listGoods = searchResult.getTaoBaoGoodsBriefs();
+ for (TaoBaoGoodsBrief goods : listGoods) {
+ // 娣诲姞搴楅摵
+ String shopTitle = goods.getShopTitle();
+ if (addShop && !StringUtil.isNullOrEmpty(shopTitle) && shopTitle.contains("鏃楄埌搴�")
+ && shopTitle.toLowerCase().contains(shopKey.toLowerCase())) {
+ addShop = brandShopCaheService.addBrandShopTB(brandInfo, goods.getAuctionId(),
+ goods.getSellerId());
+
+ if (!addShop)
countShop = 1;
- }
}
-
- count ++;
- if (count >= 50) {
+
+ // 娣诲姞鍟嗗搧
+ if (count < 50) {
+ BrandGoodsCahe brandGoods = new BrandGoodsCahe();
+ brandGoods.setBrandId(brandInfo.getId());
+ brandGoods.setWeight((int) (Math.random() * 1000));
+ brandGoods.setGoodsType(1);
+ brandGoods.setGoodsTB(goods);
+ brandGoods.setCreateTime(new Date());
+ brandGoodsCaheDao.insert(brandGoods);
+ count++;
+ } else if (!addShop) {
break;
}
}
}
+
+ // 鍒犻櫎涔嬪墠鐨�
+ brandGoodsCaheDao.removeByDate(brandInfo.getId(), 1, date);
+ numInfo.setShopTotal(countShop);
+ numInfo.setGoodsTotal(count);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
- // 鍒犻櫎涔嬪墠
- brandGoodsCaheDao.removeByDate(brandInfo.getId(), 2 , date);
-
- numInfo.setShopTotal(countShop);
- numInfo.setGoodsTotal(count);
- return numInfo;
+ return numInfo;
}
-
-
+
+ /**
+ * 浜笢鍟嗗搧
+ *
+ * @param brandInfo
+ * @return
+ */
+ private BrandInfo addBrandGoodsJD(BrandInfo brandInfo) {
+ Date date = new Date();
+ BrandInfo numInfo = new BrandInfo();
+ numInfo.setShopTotal(0);
+ numInfo.setGoodsTotal(0);
+
+ try {
+ String shopKey = brandInfo.getShopKeyJD();
+ if (StringUtil.isNullOrEmpty(shopKey)) {
+ // 鍒犻櫎搴楅摵
+ brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);
+ // 鍒犻櫎涔嬪墠
+ brandGoodsCaheDao.removeByDate(brandInfo.getId(), 2, date);
+ return numInfo;
+ }
+
+ String searchKey = brandInfo.getSearchKeyJD();
+ if (StringUtil.isNullOrEmpty(searchKey))
+ searchKey = brandInfo.getName();
+
+ int count = 0;
+ int countShop = 0;
+ JDSearchResult result = null;
+ String way = configService.get("jd_api_search_key");
+
+ // 鍒犻櫎搴楅摵
+ brandShopCaheService.removeByDateAndType(brandInfo.getId(), 20, date);
+
+ boolean addShop = true;
+ for (int i = 0; i < 2; i++) {
+ if ("1".equals(way)) {
+ JDFilter filterAPI = new JDFilter();
+ filterAPI.setKeyword(SearchFilterUtil.filterSearchContent(searchKey));
+ filterAPI.setPageIndex(1);
+ filterAPI.setPageSize(30);
+ filterAPI.setSort(JDFilter.SORT_DESC);
+ filterAPI.setSortName(JDFilter.SORTNAME_ORDER_COUNT_30DAYS);
+ result = JDApiUtil.queryByKey(filterAPI);
+ } else {
+ // 缃戦〉鐖彇
+ JDSearchFilter jdfilter = new JDSearchFilter();
+ jdfilter.setKey(SearchFilterUtil.filterSearchContent(searchKey));
+ jdfilter.setPageNo(1);
+ jdfilter.setPageSize(30);
+ jdfilter.setSort(JDSearchFilter.SORT_DESC);
+ jdfilter.setSortName(JDSearchFilter.SORTNAME_ORDER_COUNT_30DAYS);
+ result = JDUtil.searchByKey(jdfilter);
+ }
+
+ if (result != null && result.getGoodsList() != null && result.getGoodsList().size() > 0) {
+ List<JDGoods> goodsList = result.getGoodsList();
+ for (JDGoods goods : goodsList) {
+ BrandGoodsCahe brandGoods = new BrandGoodsCahe();
+ brandGoods.setBrandId(brandInfo.getId());
+ brandGoods.setWeight((int) (Math.random() * 1000));
+ brandGoods.setGoodsJD(goods);
+ brandGoods.setGoodsType(2);
+ brandGoods.setCreateTime(new Date());
+ brandGoodsCaheDao.insert(brandGoods);
+
+ JDShopInfo shopInfo = goods.getShopInfo();
+ if (addShop && shopInfo != null) {
+ // 鍖呭惈璇ュ搧鐗屽悕绉�
+ String shopName = shopInfo.getShopName();
+ if (!StringUtil.isNullOrEmpty(shopName)
+ && shopName.toLowerCase().contains(shopKey.toLowerCase())) {
+ addShop = false;
+ brandShopCaheService.addBrandShopJD(brandInfo, shopInfo);
+ countShop = 1;
+ }
+ }
+
+ count++;
+ if (count >= 50) {
+ break;
+ }
+ }
+ }
+ }
+ // 鍒犻櫎涔嬪墠
+ brandGoodsCaheDao.removeByDate(brandInfo.getId(), 2, date);
+ numInfo.setShopTotal(countShop);
+ numInfo.setGoodsTotal(count);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
+ }
+ return numInfo;
+ }
+
/**
* 鎷煎澶氬晢鍝�
+ *
* @param brandInfo
* @return
*/
private BrandInfo addBrandGoodsPDD(BrandInfo brandInfo) {
Date date = new Date();
BrandInfo numInfo = new BrandInfo();
- String shopKey = brandInfo.getShopKeyPDD();
- if (StringUtil.isNullOrEmpty(shopKey)) {
+ numInfo.setShopTotal(0);
+ numInfo.setGoodsTotal(0);
+ try {
+ String shopKey = brandInfo.getShopKeyPDD();
+ if (StringUtil.isNullOrEmpty(shopKey)) {
+ // 鍒犻櫎涔嬪墠
+ brandGoodsCaheDao.removeByDate(brandInfo.getId(), 3, date);
+ // 鍒犻櫎涔嬪墠搴楅摵
+ brandShopCaheService.removeByDateAndType(brandInfo.getId(), 30, date);
+ return numInfo;
+ }
+
+ String searchKey = brandInfo.getSearchKeyPDD();
+ if (StringUtil.isNullOrEmpty(searchKey))
+ searchKey = brandInfo.getName();
+
+ PDDSearchFilter pddfilter = new PDDSearchFilter();
+ pddfilter.setKw(searchKey);
+ pddfilter.setPage(1);
+ pddfilter.setPageSize(100);
+ pddfilter.setSortType(6);
+ PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
+
+ int count = 0;
+
+ if (result != null) {
+ List<PDDGoodsDetail> goodsList = result.getGoodsList();
+ if (goodsList != null && goodsList.size() > 0) {
+ for (PDDGoodsDetail goods : goodsList) {
+ BrandGoodsCahe brandGoods = new BrandGoodsCahe();
+ brandGoods.setBrandId(brandInfo.getId());
+ brandGoods.setWeight((int) (Math.random() * 1000));
+ brandGoods.setGoodsType(3);
+ brandGoods.setGoodsPDD(goods);
+ brandGoods.setCreateTime(new Date());
+ brandGoodsCaheDao.insert(brandGoods);
+ count++;
+ if (count >= 50) {
+ break;
+ }
+ }
+ }
+ }
// 鍒犻櫎涔嬪墠
brandGoodsCaheDao.removeByDate(brandInfo.getId(), 3, date);
// 鍒犻櫎涔嬪墠搴楅摵
brandShopCaheService.removeByDateAndType(brandInfo.getId(), 30, date);
- numInfo.setShopTotal(0);
- numInfo.setGoodsTotal(0);
- return numInfo;
+ // 娣诲姞搴楅摵
+ int countShop = brandShopCaheService.addBrandShopPDD(brandInfo);
+
+ numInfo.setShopTotal(countShop);
+ numInfo.setGoodsTotal(count);
+ } catch (Exception e) {
+ LogHelper.errorDetailInfo(e);
}
-
- String searchKey = brandInfo.getSearchKeyPDD();
- if (StringUtil.isNullOrEmpty(searchKey))
- searchKey = brandInfo.getName();
-
- PDDSearchFilter pddfilter = new PDDSearchFilter();
- pddfilter.setKw(searchKey);
- pddfilter.setPage(1);
- pddfilter.setPageSize(100);
- pddfilter.setSortType(6);
- PDDGoodsResult result = PinDuoDuoApiUtil.searchGoods(pddfilter);
-
- int count = 0;
-
- if (result != null) {
- List<PDDGoodsDetail> goodsList = result.getGoodsList();
- if (goodsList != null && goodsList.size() > 0) {
- for (PDDGoodsDetail goods : goodsList) {
- BrandGoodsCahe brandGoods = new BrandGoodsCahe();
- brandGoods.setBrandId(brandInfo.getId());
- brandGoods.setWeight((int) (Math.random() * 1000));
- brandGoods.setGoodsType(3);
- brandGoods.setGoodsPDD(goods);
- brandGoods.setCreateTime(new Date());
- brandGoodsCaheDao.insert(brandGoods);
- count ++;
- if (count >= 50) {
- break;
- }
- }
- }
- }
- // 鍒犻櫎涔嬪墠
- brandGoodsCaheDao.removeByDate(brandInfo.getId(), 3, date);
- // 鍒犻櫎涔嬪墠搴楅摵
- brandShopCaheService.removeByDateAndType(brandInfo.getId(), 30, date);
- // 娣诲姞搴楅摵
- int countShop = brandShopCaheService.addBrandShopPDD(brandInfo);
-
- numInfo.setShopTotal(countShop);
- numInfo.setGoodsTotal(count);
return numInfo;
}
-
-
+
@Override
- public List<BrandGoodsCahe> getByBrandId(int start, int count, Long brandId){
+ public List<BrandGoodsCahe> getByBrandId(int start, int count, Long brandId) {
return brandGoodsCaheDao.getByBrandId(start, count, brandId);
}
-
+
@Override
- public long countByBrandId(Long brandId){
+ public long countByBrandId(Long brandId) {
return brandGoodsCaheDao.countByBrandId(brandId);
}
-
+
@Override
public void removeAgoByDate(Date createTime) {
brandGoodsCaheDao.removeAgoByDate(createTime);
}
-
+
@Override
public void removeByBrandId(Long brandId) {
brandGoodsCaheDao.removeByBrandId(brandId);
--
Gitblit v1.8.0