Browse Source

保利威分类

change 3 years ago
parent
commit
7095f80acd

+ 4 - 7
zhongzheng-admin/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -92,15 +92,12 @@ public class PolyvVideoController extends BaseController {
     /**
      * 查询考试安排列表
      */
-    @ApiOperation("查询考试安排列表")
+    @ApiOperation("查询保利威视频")
     @PreAuthorize("@ss.hasPermi('polyv:video:list')")
     @GetMapping("/list")
-    public AjaxResult<List<PolyvVideoVo>> listPolyv(PolyvVideoQueryBo bo) throws Exception {
-        if (bo.getPageSize() == null || bo.getPageNum() == null){
-            throw new IllegalArgumentException("分页不能为空");
-        }
-        List<PolyvVideoVo> list = iPolyvVideoService.queryPolyv(bo);
-        return AjaxResult.success(list);
+    public TableDataInfo<PolyvVideoVo> listPolyv(PolyvVideoQueryBo bo) throws Exception {
+        TableDataInfo list = iPolyvVideoService.queryPolyv(bo);
+        return list;
     }
 
 }

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/bo/PolyvVideoQueryBo.java

@@ -163,4 +163,8 @@ public class PolyvVideoQueryBo extends BaseEntity {
 	@ApiModelProperty("$column.columnComment")
 	private String hls;
 
+	/** 编码后各个清晰度视频的文件大小(单位:字节),类型为array */
+	@ApiModelProperty("视频标题")
+	private String keyword;
+
 }

+ 2 - 1
zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/IPolyvVideoService.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.polyv.service;
 
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.modules.polyv.domain.PolyvVideo;
 import com.zhongzheng.modules.polyv.vo.PolyvCataData;
 import com.zhongzheng.modules.polyv.vo.PolyvVideoQuerVo;
@@ -62,5 +63,5 @@ public interface IPolyvVideoService extends IService<PolyvVideo> {
 
     List<PolyvCataData> queryCataList(PolyvVideoQueryBo bo) throws Exception;
 
-	List<PolyvVideoVo> queryPolyv(PolyvVideoQueryBo bo) throws Exception;
+	TableDataInfo queryPolyv(PolyvVideoQueryBo bo) throws Exception;
 }

+ 22 - 13
zhongzheng-system/src/main/java/com/zhongzheng/modules/polyv/service/impl/PolyvVideoServiceImpl.java

@@ -9,6 +9,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.zhongzheng.common.core.page.TableDataInfo;
 import com.zhongzheng.common.core.redis.RedisCache;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.http.HttpUtils;
@@ -317,25 +318,27 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
 
 
     @Override
-    public List<PolyvVideoVo> queryPolyv(PolyvVideoQueryBo bo) throws Exception {
+    public TableDataInfo<PolyvVideoVo> queryPolyv(PolyvVideoQueryBo bo) throws Exception {
         //获得保利威sign
         Long ptime = System.currentTimeMillis();
         Map<String,String> map = new HashMap<>();
-        map.put("ptime",ptime.toString());
-        map.put("userid",poliv_token_userid);
-        String sign = PolyvUtils.getSign(map, poliv_token_secretkey);
-
         //发送请求
-        String param = "userid="+poliv_token_userid+"&ptime="+ptime+"&sign="+sign;
+        String param = "ptime="+ptime;
         if (StringUtils.isNotBlank(bo.getCataid())){
-            param.concat("&cataid="+bo.getCataid());
+            param = param.concat("&cataid="+bo.getCataid());
         }
-        if (StringUtils.isNotBlank(bo.getTag())){
-            param.concat("&tag="+bo.getTag());
+        if (bo.getPageSize() != null){
+            param =param.concat("&numPerPage="+bo.getPageSize());
+            map.put("numPerPage",bo.getPageSize().toString());
         }
-       /* if (StringUtils.isNotBlank(bo.getKe())){
-            param.concat("&tag="+bo.getTag());
-        }*/
+        if (bo.getPageNum() != null){
+            param =param.concat("&pageNum="+bo.getPageNum());
+            map.put("pageNum",bo.getPageNum().toString());
+        }
+
+        map.put("ptime",ptime.toString());
+        String sign = PolyvUtils.getSign(map, poliv_token_secretkey);
+        param = param.concat("&sign="+sign);
         String polyvVide = HttpUtils.sendGet("http://api.polyv.net/v2/video/" + poliv_token_userid + "/search", param);
         JSONObject jsonObject = JSONObject.parseObject(polyvVide);
         //非200抛出异常
@@ -344,8 +347,14 @@ public class PolyvVideoServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVi
         }
         //将数据展示
         JSONArray jsonArray=jsonObject.getJSONArray("data");
+        Object total = jsonObject.get("total");
         List<PolyvVideoVo> list=jsonArray.toJavaList(PolyvVideoVo.class);
-        return list;
+        TableDataInfo tableDataInfo = new TableDataInfo();
+        tableDataInfo.setRows(list);
+        tableDataInfo.setTotal(Convert.toLong(total));
+        tableDataInfo.setCode(200);
+        tableDataInfo.setMsg("请求正常");
+        return tableDataInfo;
     }