Merge branch 'working' into 'master'

新增微博要闻榜采集功能

See merge request !136

src/main/java/com/zhiwei/searchhotcrawler/bean/HotSearchList.java

@@ -113,6 +113,11 @@ public class HotSearchList implements Serializable{
 	 **/
 	private String rankPic;
 
+	/**
+	 * 主持人
+	 */
+	private String downtext;
+
 	public HotSearchList(){}
 
 	public HotSearchList(String url, String name, Long count,Boolean hot,Integer rank,String type,String icon,Date date){

src/main/java/com/zhiwei/searchhotcrawler/bean/HotSearchType.java

@@ -29,5 +29,6 @@ public enum HotSearchType {
     淘宝热搜,
     抖音同城榜,
     微博娱乐榜,
+    微博要闻榜,
 
 }

src/main/java/com/zhiwei/searchhotcrawler/dao/HotSearchCacheDAO.java

@@ -63,6 +63,11 @@ public class HotSearchCacheDAO  {
            if("虎嗅热文推荐".equals(hotSearch.getType())){
                document.put("comment_count", hotSearch.getCommentCount());
            }
+           if("微博要闻榜".equals(hotSearch.getType())){
+               document.put("comment_count", hotSearch.getCommentCount());
+               document.put("iconUrl", hotSearch.getIconUrl());
+               document.put("downtext", hotSearch.getDowntext());
+           }
            if("百度热搜".equals(hotSearch.getType())){
                document.put("topic_lead", hotSearch.getTopicLead());
            }
@@ -80,6 +85,9 @@ public class HotSearchCacheDAO  {
            if("百度热搜".equals(hotSearch.getType())){
                document.remove("topic_lead");
            }
+           if("微博要闻榜".equals(hotSearch.getType())){
+               document.remove("downtext");
+           }
            dataes.add(document);
        });
        return dataes;
@@ -210,7 +218,10 @@ public class HotSearchCacheDAO  {
                    if("虎嗅热文推荐".equals(type)){
                        nowDoc.put("comment_count",document.getLong("comment_count"));
                    }
-
+                   if("微博要闻榜".equals(type)){
+                       nowDoc.put("downtext",document.getString("downtext"));
+                       nowDoc.put("comment_count",document.getLong("comment_count"));
+                   }
                    if(topicResult != null){
                        nowDoc.put("topicResult",topicResult);
                    }

src/main/java/com/zhiwei/searchhotcrawler/timer/quartz/GatherTimer.java

@@ -588,4 +588,17 @@ public class GatherTimer {
         TipsUtils.addHotList(HotSearchType.微博娱乐榜.name(), weiBoEntertainmentList);
         logger.info("微博娱乐榜采集结束...");
     }
+    /**
+     *微博娱乐榜采集
+     */
+    @Async(value = "myScheduler")
+    @Scheduled(cron = "0 * * * * ? ")
+    public void crawlerWeiBoNews(){
+        logger.info("微博要闻榜开始采集...");
+        Date date = DateUtils.getMillSecondTime(new Date());
+        List<HotSearchList> WeiboNewsList = WeiboNewsCrawler.weiboNewsByPhone(date);
+        logger.info("{}, 微博要闻榜此轮采集到的数据量为:{}", new Date(),  WeiboNewsList != null ?  WeiboNewsList.size() : 0);
+        TipsUtils.addHotList(HotSearchType.微博要闻榜.name(), WeiboNewsList);
+        logger.info("微博要闻榜采集结束...");
+    }
 }