From f7b2baec57a19039ca85880bbba4e17fe27f0511 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 三月 2021 18:21:13 +0800
Subject: [PATCH] 删除冗余代码,初步优化首页的推荐专题,3.8.7之后在我的里面添加VIP分类

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java |   32 ++++++++++++++++++++++----------
 1 files changed, 22 insertions(+), 10 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 54d7c00..f0fe5b5 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;
 
         //绌虹數瑙嗗墽鎴栬�呮槸绌哄姩婕垯杩斿洖

--
Gitblit v1.8.0