From 1d9eef9a4ba7caebf73b483e0062f9259dbf22a0 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 28 二月 2020 15:42:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java | 67 +++++++++++++++++----------------
1 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java b/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
index d3e0ec7..949d64c 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/manger/ClipboardAnalysisManager.java
@@ -1,5 +1,6 @@
package com.yeshi.fanli.service.manger;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -22,6 +23,7 @@
import com.yeshi.fanli.exception.user.TokenRecordException;
import com.yeshi.fanli.service.inter.user.TokenRecordService;
import com.yeshi.fanli.service.manger.goods.jd.JDGoodsLinkParseManager;
+import com.yeshi.fanli.service.manger.goods.tb.TaoBaoTokenAuctionIdMapManager;
import com.yeshi.fanli.util.DouYinUtil;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TokenUtil;
@@ -41,6 +43,7 @@
/**
* 绮樿创鏉胯В鏋�
+ *
* @author Administrator
*
*/
@@ -53,15 +56,14 @@
@Resource
private TokenRecordService tokenRecordService;
+ @Resource
+ private TaoBaoTokenAuctionIdMapManager taoBaoTokenAuctionIdMapManager;
+
/**
- * @Title: parseContentType
- * @Description: 瑙ｆ瀽鏂囨湰鐨勭被鍨�
- * @param text
- * @return
- * Set<ClipboardContentType> 杩斿洖绫诲瀷
- * @throws
+ * @Title: parseContentType @Description: 瑙ｆ瀽鏂囨湰鐨勭被鍨� @param text @return Set
+ * <ClipboardContentType> 杩斿洖绫诲瀷 @throws
*/
- public static Set<ClipboardContentType> parseContentType(String originText) {
+ public static Set<ClipboardContentType> parseContentType(String originText, String platform, String version) {
Set<ClipboardContentType> typeSet = new HashSet<>();
StringBuffer textBuffer = new StringBuffer(originText);
String text = textBuffer.toString();
@@ -85,14 +87,17 @@
}
// 娣樺彛浠�
- List<String> taoBaoTokenList = TaoBaoUtil.getTokenListFromText(text);
+ List<String> taoBaoTokenList = null;
+ if (VersionUtil.greaterThan_2_0_7(platform, version))
+ taoBaoTokenList = TaoBaoUtil.getTokenListFromTextWithKuoHao(text);
+ else
+ taoBaoTokenList = TaoBaoUtil.getTokenListFromText(text);
if (taoBaoTokenList != null && taoBaoTokenList.size() > 0) {
typeSet.add(ClipboardContentType.taoBaoToken);
for (String token : taoBaoTokenList) {
text = text.replace(token, "");
}
}
-
// 鏂囨湰
if (text != null && text.trim().length() > 0) {
typeSet.add(ClipboardContentType.text);
@@ -103,19 +108,15 @@
/**
*
- * @Title: parse
- * @Description: 瑙ｆ瀽
- * @param text
- * @param typeSet
- * void 杩斿洖绫诲瀷
- * @throws
+ * @Title: parse @Description: 瑙ｆ瀽 @param text @param typeSet void
+ * 杩斿洖绫诲瀷 @throws
*/
public void parse(String platform, String version, String text, Long uid, IClipboardAnalysisResult resultListener) {
if (text == null)
return;
text = text.trim();
- Set<ClipboardContentType> typeSet = parseContentType(text);
+ Set<ClipboardContentType> typeSet = parseContentType(text, platform, version);
// 绯荤粺鍙ｄ护
if (typeSet.contains(ClipboardContentType.systemToken)) {
@@ -165,7 +166,11 @@
}
} else if (typeSet.size() == 2) {
List<String> urlList = HttpUtil.getUrlListFromText(text);
- List<String> tokenList = TaoBaoUtil.getTokenListFromText(text);
+ List<String> tokenList = null;
+ if (VersionUtil.greaterThan_2_0_7(platform, version))
+ tokenList = TaoBaoUtil.getTokenListFromTextWithKuoHao(text);
+ else
+ tokenList = TaoBaoUtil.getTokenListFromText(text);
String link = null;
String token = null;
@@ -189,7 +194,10 @@
resultListener.onResult(new GoodsDocParseResultVO(text, urlList.get(0)));
} else {
if (VersionUtil.greaterThan_2_0_7(platform, version)) {
- resultListener.onResult(new GoodsDocParseResultVO(text, goods));
+ if (urlList.size() == 1)// 鍗曢摼鎺�+鏂囨湰
+ resultListener.onResult(goods);
+ else
+ resultListener.onResult(new GoodsDocParseResultVO(text, goods));
} else {
resultListener.onResult(goods);
}
@@ -224,7 +232,8 @@
if (goods == null) {
if (text.trim().indexOf("銆�") > -1 && text.trim().indexOf("銆�") > 0) {
// 鎴彇鏍囬
- String title = text.trim().substring(text.trim().indexOf("銆�")+1, text.trim().lastIndexOf("銆�"));
+ String title = text.trim().substring(text.trim().indexOf("銆�") + 1,
+ text.trim().lastIndexOf("銆�"));
goods = new CommonGoods();
goods.setTitle(title);
goods.setPicture("http://");
@@ -272,12 +281,8 @@
/**
*
- * @Title: parseLink
- * @Description: 瑙ｆ瀽鍗曢摼鎺�
- * @param link
- * @return
- * CommonGoods 杩斿洖绫诲瀷
- * @throws
+ * @Title: parseLink @Description: 瑙ｆ瀽鍗曢摼鎺� @param link @return CommonGoods
+ * 杩斿洖绫诲瀷 @throws
*/
public CommonGoods parseLink(String link) {
@@ -404,8 +409,7 @@
}
private CommonGoods parseTaoBaoToken(String token) throws TaoBaoTokenParseException {
-
- Long auctionId = TaoKeApiUtil.tokenConvertAuctionId(token);
+ Long auctionId = taoBaoTokenAuctionIdMapManager.getAuctionIdByToken(token);
if (auctionId != null) {//
TaoBaoGoodsBrief goods = TaoBaoUtil.isAlimama(auctionId + "");
if (goods == null) {
@@ -423,12 +427,8 @@
/**
*
- * @Title: analysisDouYin
- * @Description: 鎶栭煶瑙ｆ瀽
- * @param link
- * @return
- * CommonGoods 杩斿洖绫诲瀷
- * @throws
+ * @Title: analysisDouYin @Description: 鎶栭煶瑙ｆ瀽 @param link @return CommonGoods
+ * 杩斿洖绫诲瀷 @throws
*/
private TaoBaoGoodsBrief analysisDouYin(String link) {
String location = HttpUtil.getLocation(link);
@@ -458,6 +458,7 @@
/**
* 绮樿创鏉胯В鏋愮粨鏋�
+ *
* @author Administrator
*
*/
--
Gitblit v1.8.0