|
@@ -4,7 +4,6 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.ruixuan.common.core.domain.ResultResponse;
|
|
|
-import com.ruixuan.common.cos.CosUpload;
|
|
|
import com.ruixuan.common.utils.Check;
|
|
|
import com.ruixuan.data.service.IKuaishouLiveDataAnalysisService;
|
|
|
import com.ruixuan.data.service.IKuaishouLiveDataFunnelService;
|
|
@@ -204,7 +203,7 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
|
|
|
String upFileName = "CaoPanShou";
|
|
|
KuaishouLiveBroadcastFiles file = new KuaishouLiveBroadcastFiles();
|
|
|
//上传数据大盘
|
|
|
- if (Check.isNotNull(dapanUrls)) {
|
|
|
+ if (Check.isNotNull(dapanUrls) && !"[]".equals(dapanUrls)) {
|
|
|
List<String> urls = JSONArray.parseArray(dapanUrls, String.class);
|
|
|
HashSet<String> set = new HashSet<>(urls);
|
|
|
String urlFix = "";
|
|
@@ -215,7 +214,7 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
|
|
|
// String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
|
|
|
if (Check.isNotNull(url)) {
|
|
|
int lastNo = url.lastIndexOf("/") + 1;
|
|
|
- urlFix = url.substring(0, lastNo);
|
|
|
+ urlFix = "https:" + url.substring(0, lastNo);
|
|
|
String name = url.substring(lastNo);
|
|
|
names += "," + name;
|
|
|
}
|
|
@@ -227,7 +226,7 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
|
|
|
}
|
|
|
|
|
|
//画像分析上传
|
|
|
- if (Check.isNotNull(portraitUrls)) {
|
|
|
+ if (Check.isNotNull(portraitUrls) && !"[]".equals(portraitUrls)) {
|
|
|
List<String> urls = JSONArray.parseArray(portraitUrls, String.class);
|
|
|
HashSet<String> set = new HashSet<>(urls);
|
|
|
String urlFix = "";
|
|
@@ -238,7 +237,7 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
|
|
|
// String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
|
|
|
if (Check.isNotNull(url)) {
|
|
|
int lastNo = url.lastIndexOf("/") + 1;
|
|
|
- urlFix = url.substring(0, lastNo);
|
|
|
+ urlFix = "https:" + url.substring(0, lastNo);
|
|
|
String name = url.substring(lastNo);
|
|
|
names += "," + name;
|
|
|
}
|
|
@@ -281,7 +280,7 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
|
|
|
String upFileName = "CaoPanShou";
|
|
|
KuaishouLiveBroadcastFiles file = new KuaishouLiveBroadcastFiles();
|
|
|
//上传复盘图片
|
|
|
- if (Check.isNotNull(replayPictureUrls)) {
|
|
|
+ if (Check.isNotNull(replayPictureUrls) && !"[]".equals(replayPictureUrls)) {
|
|
|
List<String> urls = JSONArray.parseArray(replayPictureUrls, String.class);
|
|
|
HashSet<String> set = new HashSet<>(urls);
|
|
|
String urlFix = "";
|
|
@@ -292,7 +291,7 @@ public class KuaishouLiveBroadcastServiceImpl implements IKuaishouLiveBroadcastS
|
|
|
// String cosUrl = CosUpload.getJPGCosUrl(url, upFileName, pictureName);
|
|
|
if (Check.isNotNull(url)) {
|
|
|
int lastNo = url.lastIndexOf("/") + 1;
|
|
|
- urlFix = url.substring(0, lastNo);
|
|
|
+ urlFix = "https:" + url.substring(0, lastNo);
|
|
|
String name = url.substring(lastNo);
|
|
|
names += "," + name;
|
|
|
}
|