Merge remote-tracking branch 'origin/master'

yn147

2023-05-10 96286178ee1c257c130cb2ad964a781f36c4eee5

 src/main/java/com/qxueyou/scc/controller/VideoLiveController.java

@@ -8,6 +8,7 @@
import com.alibaba.fastjson.JSONObject;
import com.hankcs.hanlp.corpus.tag.Nature;
import com.qxueyou.scc.sdk.MTCloud;
import io.swagger.models.auth.In;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -85,8 +86,8 @@
                  "status","status",
                  "pushUrl","rtmpPushUrl",
                  "hlsPullUrl","hlsPullUrl",
                  "previewImgUrl","previewImgUrl"

                  "previewImgUrl","previewImgUrl",
                  "courseId","courseId"
                  ))));
   }

@@ -122,13 +123,14 @@
      options.put("robotNumber", 1);
      options.put("robotType", 1);
      options.put("pptDisplay", 1);
      options.put("modetype", 6);
      //将long类型转换为String类型
      SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
      simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
      String startTime1 = simpleDateFormat.format(new Date(startTime));
      String endTime1 = simpleDateFormat.format(new Date(endTime));
      //调用第三方直播接口
      String s = client.courseAdd(name, "16624662432", startTime1, endTime1, ClientUtils.getUserName(), "222", options);
      String s = client.courseAdd(name, ClientUtils.getUserId(), startTime1, endTime1, ClientUtils.getUserName(), "222", options);
      //json转换拿到courseId
      JSONObject jsonObject = JSON.parseObject(s);
      JSONObject data = jsonObject.getJSONObject("data");
@@ -149,7 +151,7 @@
      HashMap<Object,Object> options = new HashMap<Object, Object>();
      options.put("ssl", false);

      String res = client.courseLogin("16624662432", MTCloud.ACCOUNT_TYPE_THIRD, options);
      String res = client.courseLogin(ClientUtils.getUserId(),MTCloud.ACCOUNT_TYPE_THIRD, options);
      System.out.println(res);
      JSONObject jsonObject = JSON.parseObject(res);
      JSONObject data = jsonObject.getJSONObject("data");
@@ -157,6 +159,15 @@
      return new Result(true,"开启成功",protocol);
   }

   @ApiOperation(value = "在线时长")
   @GetMapping(value = "onlineCommunication")
   public Result onlineCommunication(String courseId,Integer page, Integer size) throws Exception {
      MTCloud client = new MTCloud();
      HashMap<Object,Object> options = new HashMap<Object, Object>();
      options.put("ssl", false);
      String res = client.courseVisitorList("3360573",10,1,options);
      return new Result(true,"开启成功",res);
   }
   /**
    * 查询直播详情
    * 
@@ -248,8 +259,8 @@
    */
   @ApiOperation(value = "删除创建的直播")
   @PostMapping(value = "delete")
   public Result delete(String videoLiveIds) {
      return liveService.delete(videoLiveIds.split(","));
   public Result delete(String videoLiveIds,String   courseIds) throws Exception {
      return liveService.delete(videoLiveIds.split(","),courseIds.split(","));
   }