From 302415542a6b4d07c82901c84b004cfa565a45f8 Mon Sep 17 00:00:00 2001
From: xuwenbo <717567226@qq.com>
Date: Tue, 1 Sep 2020 15:18:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9B=B4=E6=92=AD=E5=9B=9E?=
 =?UTF-8?q?=E6=94=BE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                          |  1 +
 .../rest/controller/WechatLiveController.java       |  8 +++++++-
 .../modules/wechat/service/YxWechatLiveService.java |  8 ++++++++
 .../service/impl/YxWechatLiveServiceImpl.java       | 13 ++++++++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a1415862..47674fd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 target
 .idea/
 *.log
+logs
diff --git a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java
index c523cdf9..6017a51b 100644
--- a/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java
+++ b/yshop-app/src/main/java/co/yixiang/modules/wechat/rest/controller/WechatLiveController.java
@@ -8,6 +8,7 @@
 */
 package co.yixiang.modules.wechat.rest.controller;
 
+import cn.binarywang.wx.miniapp.bean.WxMaLiveResult;
 import co.yixiang.api.ApiResult;
 import co.yixiang.dozer.service.IGenerator;
 import co.yixiang.logging.aop.log.Log;
@@ -28,6 +29,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,5 +50,9 @@ public class WechatLiveController {
     public ApiResult<WechatLiveVo> getYxWechatLives(YxWechatLiveQueryCriteria criteria, Pageable pageable){
         return ApiResult.ok(yxWechatLiveService.queryAll(criteria,pageable));
     }
-
+    @GetMapping("yxWechatLive/getLiveReplay/{id}")
+    @ApiOperation("获取直播回放")
+    public ApiResult<List<WxMaLiveResult.LiveReplay>>  getLiveReplay(@PathVariable Integer id){
+        return ApiResult.ok(yxWechatLiveService.getLiveReplay(id));
+    }
 }
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java
index eeb3e2a2..faf886d6 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/YxWechatLiveService.java
@@ -8,6 +8,7 @@
 */
 package co.yixiang.modules.wechat.service;
 
+import cn.binarywang.wx.miniapp.bean.WxMaLiveResult;
 import co.yixiang.common.service.BaseService;
 import co.yixiang.modules.wechat.domain.YxWechatLive;
 import co.yixiang.modules.wechat.service.dto.YxWechatLiveDto;
@@ -60,4 +61,11 @@ public interface YxWechatLiveService  extends BaseService<YxWechatLive>{
     * @throws IOException /
     */
     void download(List<YxWechatLiveDto> all, HttpServletResponse response) throws IOException;
+
+    /**
+     * 获取直播回放
+     * @param roomId
+     * @return
+     */
+     List<WxMaLiveResult.LiveReplay> getLiveReplay(Integer roomId);
 }
diff --git a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
index 33bebe13..5c3adfe6 100644
--- a/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
+++ b/yshop-mall/src/main/java/co/yixiang/modules/wechat/service/impl/YxWechatLiveServiceImpl.java
@@ -144,7 +144,18 @@ public class YxWechatLiveServiceImpl extends BaseServiceImpl<YxWechatLiveMapper,
         return baseMapper.selectList(QueryHelpPlus.getPredicate(YxWechatLive.class, criteria));
     }
 
-
+    @Override
+    //@Cacheable
+    public List<WxMaLiveResult.LiveReplay> getLiveReplay(Integer roomId){
+        WxMaService wxMaService = WxMaConfiguration.getWxMaService();
+        WxMaLiveResult get_replay = new WxMaLiveResult();
+        try {
+             get_replay = wxMaService.getLiveService().getLiveReplay("get_replay", roomId, 0, 100);
+        } catch (WxErrorException e) {
+            e.printStackTrace();
+        }
+        return get_replay.getLiveReplay();
+    }
     @Override
     public void download(List<YxWechatLiveDto> all, HttpServletResponse response) throws IOException {
         List<Map<String, Object>> list = new ArrayList<>();