From 2a593ddac16e06f1ff55edca22ea568f07b068ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 四月 2021 19:15:18 +0800
Subject: [PATCH] 3.9.0bug修改
---
src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java b/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java
index 2e6efc2..475da62 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java
@@ -6,6 +6,7 @@
import com.yeshi.buwan.dao.video.AlbumVideoMapDao;
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.entity.PlayUrl;
+import com.yeshi.buwan.domain.system.SystemConfig;
import com.yeshi.buwan.domain.video.AlbumVideoMap;
import com.yeshi.buwan.iqiyi.IqiYiNewAPI;
import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum2;
@@ -13,11 +14,9 @@
import com.yeshi.buwan.iqiyi.util.IqiyiUtil;
import com.yeshi.buwan.iqiyi.util.IqiyiUtil2;
import com.yeshi.buwan.query.Iqiyi2AlbumQuery;
-import com.yeshi.buwan.service.imp.CategoryVideoService;
-import com.yeshi.buwan.service.imp.ResourceVideoService;
-import com.yeshi.buwan.service.imp.VideoInfoService;
-import com.yeshi.buwan.service.imp.VideoResourceService;
+import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.TimeUtil;
import com.yeshi.buwan.util.log.VideoLogFactory;
@@ -29,10 +28,7 @@
import javax.annotation.Resource;
import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.regex.Pattern;
@Service
@@ -63,6 +59,9 @@
@Resource
private VideoResourceService videoResourceService;
+
+ @Resource
+ private SystemConfigService systemConfigService;
public List<VideoDetailInfo> getVideoDetailList(String videoId, int page, int pageSize) {
//鏌ヨ涓撹緫
@@ -112,6 +111,19 @@
iqiyiAlbum2Dao.save(album);
}
+ public boolean isUnNormalUpdateVideoName(String name) {
+ SystemConfig config = systemConfigService.getConfigByKeyCache("iqiyi_update_video_name");
+ if (config != null) {
+ String[] sts = config.getValue().split(",");
+ List<String> list = new ArrayList<>();
+ for (String st : sts) {
+ list.add(st.trim());
+ }
+ return list.contains(name.trim());
+ }
+ return false;
+ }
+
@Override
public void addToVideoInfo(IqiyiAlbum2 album) {
if (album.getFeatureAlbumId() > 0L && album.getChannelId() != IqiYiNewAPI.TYPE_DIANYING) {
@@ -138,7 +150,7 @@
}
- if (album.getChannelId() != 1 && !VideoConstant.iqiyiSpecialNames.contains(album.getName())) {
+ if (album.getChannelId() != 1 && !isUnNormalUpdateVideoName(album.getName())) {
//鏍囬涓彧鑳藉寘鍚腑鑻辨枃涓庢暟瀛�
String regx = "^[(\\u4e00-\\u9fa5)(锛�)( )a-zA-Z0-9]+$";
if (!Pattern.matches(regx, album.getName())) {
@@ -147,7 +159,7 @@
}
//杩囨护鏌愪簺鐭墖涓庡奖璇�
- if (album.getName().contains("銆�") && !VideoConstant.iqiyiSpecialNames.contains(album.getName()))
+ if (album.getName().contains("銆�") && !isUnNormalUpdateVideoName(album.getName()))
return;
//绌虹數瑙嗗墽鎴栬�呮槸绌哄姩婕垯杩斿洖
@@ -182,7 +194,7 @@
}
} else {//瑙嗛涓嶅瓨鍦�
//鍒ゆ柇2涓棰戝疄浣撴槸鍚︿负鍚屼竴瑙嗛
- VideoInfo oldVideo = videoInfoService.getExistSameVideo(newVideoInfo);
+ VideoInfo oldVideo = videoInfoService.getExistSameVideoWithTime(newVideoInfo);
if (oldVideo == null) {
//娣诲姞瑙嗛
Serializable id = videoInfoDao.save(newVideoInfo);
@@ -205,6 +217,7 @@
//鍔犲叆涓撹緫瑙嗛鏄犲皠
AlbumVideoMap map = new AlbumVideoMap();
+ map.setId(newVideoInfo.getId());
map.setCreateTime(new Date());
map.setVideoId(newVideoInfo.getId());
map.setRootVideoType(newVideoInfo.getVideoType().getId());
--
Gitblit v1.8.0