From 3970ced88b5b456f03fe277c254ca761f05492e0 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期四, 26 十月 2023 14:00:12 +0800
Subject: [PATCH] 直播是否发布门户
---
src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java | 4 ++++
src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java | 9 +++++----
src/main/java/com/qxueyou/scc/controller/VideoLiveController.java | 11 ++++++-----
src/main/java/com/qxueyou/scc/teach/live/model/MediaVideoLive.java | 11 +++++++++++
src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java | 4 ++--
5 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java b/src/main/java/com/qxueyou/scc/controller/VideoLiveController.java
index d486128..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);
@@ -159,7 +160,7 @@
JSONObject data = jsonObject.getJSONObject("data");
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"));
diff --git a/src/main/java/com/qxueyou/scc/teach/live/model/MediaVideoLive.java b/src/main/java/com/qxueyou/scc/teach/live/model/MediaVideoLive.java
index 0ecbbdf..82e9c7a 100644
--- a/src/main/java/com/qxueyou/scc/teach/live/model/MediaVideoLive.java
+++ b/src/main/java/com/qxueyou/scc/teach/live/model/MediaVideoLive.java
@@ -319,6 +319,10 @@
@Column(name="SUBJECT_NAME")
private String subjectName;
+
+ /** 鐘舵�� 0锛氬彂甯冨埌闂ㄦ埛锛�1锛氫笉鍙戝竷 */
+ @Column(name="PORTAL_STATUS")
+ private String portalStatus;
@OneToOne(cascade = CascadeType.ALL,fetch = FetchType.LAZY)
@JoinColumn(name = "SUBJECT_ID",referencedColumnName="SUBJECT_ID",updatable=false,insertable=false)
@@ -731,6 +735,13 @@
public void setCourseId(int courseId) {
this.courseId = courseId;
}
+ public String getPortalStatus() {
+ return portalStatus;
+ }
+
+ public void setPortalStatus(String portalStatus) {
+ this.portalStatus = portalStatus;
+ }
public void setSubject(Subject subject) {
this.subject = subject;
diff --git a/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java b/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
index 4f63054..6065703 100644
--- a/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
+++ b/src/main/java/com/qxueyou/scc/teach/live/service/IMediaLiveService.java
@@ -19,7 +19,7 @@
* @param classId 鐝骇ids
* @return
*/
- Result add(String name,String content,String teacherId,String teacherName,String subjectId,String subjectName,String definition,String imgPath,Date startTime,Date endTime,Integer courseId,boolean record,List<String> classIds);
+ Result add(String name,String content,String teacherId,String teacherName,String subjectId,String subjectName,String definition,String imgPath,Date startTime,Date endTime,Integer courseId,boolean record,List<String> classIds,String portalStatus);
/**
* 鏌ヨ鐩存挱
@@ -44,7 +44,7 @@
* @param pageSize 姣忛〉鏁版嵁澶у皬
* @return
*/
- List<MediaVideoLive> listOfMine(String keyword,Integer pageNum, Integer pageSize);
+ List<MediaVideoLive> listOfMine(String keyword,String portalStatus,Integer pageNum, Integer pageSize);
/**
* 鏌ヨ鐩存挱鎬绘暟
diff --git a/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java b/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
index b4365a6..0c9195f 100644
--- a/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
+++ b/src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java
@@ -54,7 +54,7 @@
@Override
public Result add(String name, String content, String teacherId, String teacherName , String subjectId, String subjectName,
- String definition, String imgPath, Date startTime, Date endTime, Integer courseId, boolean record, List<String> classIds) {
+ String definition, String imgPath, Date startTime, Date endTime, Integer courseId, boolean record, List<String> classIds,String portalStatus) {
UserTeacher teacher = teacherService.getTeacherByUserId(ClientUtils.getUserId());
@@ -67,6 +67,7 @@
live.setPreviewImgUrl(imgPath);
live.setStartTime(startTime);
live.setEndTime(endTime);
+ live.setPortalStatus(portalStatus);
live.setStatus(MediaVideoLive.STATUS_LIVE_DRAFT);
if(teacher!=null){
@@ -343,12 +344,12 @@
}
@Override
- public List<MediaVideoLive> listOfMine(String keyword, Integer pageNum, Integer pageSize) {
+ public List<MediaVideoLive> listOfMine(String keyword,String portalStatus, Integer pageNum, Integer pageSize) {
- String hql = "from MediaVideoLive where deleteFlag is false and name like ? order by createTime desc";
+ String hql = "from MediaVideoLive where deleteFlag is false and name like ? and portalStatus = ? order by createTime desc";
- return findList(hql, new Pager(pageSize, pageNum), CollectionUtils.newList(keyword + "%"), MediaVideoLive.class);
+ return findList(hql, new Pager(pageSize, pageNum), CollectionUtils.newList(keyword + "%",portalStatus), MediaVideoLive.class);
}
@Override
diff --git a/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java b/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java
index e67a090..6f983cd 100644
--- a/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java
+++ b/src/main/java/com/qxueyou/scc/teach/res/service/impl/FileService.java
@@ -75,13 +75,17 @@
String destPath = getDestPath(name);
String fullPath = config.getResRootPath() + "/" + destPath;
+ //鎴彇涓婁紶鍗庝负浜戠殑缂栫爜
File fileRoot = new File(fullPath.substring(0, fullPath.lastIndexOf("/")));
if (!fileRoot.exists()) {
fileRoot.mkdirs();
}
+
+ //鍘嬬缉
FileUtils.copyInputStreamToFile(in, new File(fullPath));
+ //鍗庝负浜戠紪鐮佸瓨鍏ユ暟鎹簱
ResFile file = insertFileToDB(name, fullPath, destPath, getFileType(name));
return new Result(true, "success",
--
Gitblit v1.8.0