From d7963a84282c548fee3595b3343e6ae6ca49bb29 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期五, 24 十一月 2023 14:12:01 +0800
Subject: [PATCH] 学籍，考勤
---
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
index 5e75019..2caa80a 100644
--- a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
+++ b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
@@ -83,9 +83,9 @@
*/
@ApiOperation(value = "鑾峰彇鍒涘缓浜虹殑鐩存挱鍒楄〃")
@GetMapping(value = "list")
- public Result list(String keyword, Integer pageNum, Integer pageSize) {
+ public Result list(String keyword,String portalStatus, Integer pageNum, Integer pageSize) {
- List<MediaVideoLive> data = liveService.listOfMine(keyword, pageNum, pageSize);
+ List<MediaVideoLive> data = liveService.listOfMine(keyword,portalStatus, pageNum, pageSize);
int count = liveService.listCountOfMine(keyword);
return new Result(true, "success", CollectionUtils.newObjectMap("videoLiveCount", count,
@@ -102,7 +102,8 @@
"pushUrl","rtmpPushUrl",
"hlsPullUrl","hlsPullUrl",
"previewImgUrl","previewImgUrl",
- "courseId","courseId"
+ "courseId","courseId",
+ "portalStatus","portalStatus"
))));
}
@@ -138,7 +139,7 @@
@ApiOperation(value = "鍒涘缓缂栬緫鐩存挱")
@PostMapping(value = "addOrUpdate")
public Result addOrUpdate(String videoLiveId, String name, String content,String teacherId,String teacherName,String subjectId,
- String subjectName,String definition,String imgPath, long startTime,long endTime, boolean isPlayBack, String classIds) throws Exception {
+ String subjectName,String definition,String imgPath, long startTime,long endTime, boolean isPlayBack, String classIds,String portalStatus) throws Exception {
MTCloud client = new MTCloud();
HashMap<Object,Object> options = new HashMap<Object,Object>();
options.put("barrage", 1);
@@ -157,10 +158,9 @@
//json杞崲鎷垮埌courseId
JSONObject jsonObject = JSON.parseObject(s);
JSONObject data = jsonObject.getJSONObject("data");
-// System.out.println(Integer.parseInt(course_id));
if(jsonObject.getString("code").equals("0")) {
String course_id = (String) data.get("course_id");
- liveService.add(name, content,teacherId,teacherName,subjectId,subjectName,definition,imgPath, new Date(startTime), new Date(endTime),Integer.parseInt(course_id), isPlayBack, StringUtils.isEmpty(classIds)?null:CollectionUtils.newList(String.class,classIds.split(",")));
+ liveService.add(name, content,teacherId,teacherName,subjectId,subjectName,definition,imgPath, new Date(startTime), new Date(endTime),Integer.parseInt(course_id), isPlayBack, StringUtils.isEmpty(classIds)?null:CollectionUtils.newList(String.class,classIds.split(",")),portalStatus);
return new Result(true, "鎴愬姛", s);
}
return new Result(false,jsonObject.getString("msg"));
--
Gitblit v1.8.0