From 96286178ee1c257c130cb2ad964a781f36c4eee5 Mon Sep 17 00:00:00 2001
From: yn147 <2270338776@qq.com>
Date: 星期三, 10 五月 2023 16:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/qxueyou/scc/teach/live/service/impl/MediaLiveService.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
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 b095a0e..51f54e8 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
@@ -7,6 +7,8 @@
import java.util.List;
import java.util.Map;
+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.scheduling.annotation.Scheduled;
@@ -51,14 +53,15 @@
@Override
- public Result add(String name, String content, String teacherId,String teacherName ,String subjectId,String subjectName,
- String definition,String imgPath, Date startTime, Date endTime, boolean record,List<String> classIds) {
+ 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) {
UserTeacher teacher = teacherService.getTeacherByUserId(ClientUtils.getUserId());
MediaVideoLive live = new MediaVideoLive();
TraceUtils.setCreateTrace(live);
-
+
+ live.setCourseId(courseId);
live.setName(name);
live.setRemark(content);
live.setPreviewImgUrl(imgPath);
@@ -155,14 +158,19 @@
save(live);
return Result.SUCCESS;
}
-
+
@Override
- public Result delete(String[] liveIds) {
+ public Result delete(String[] liveIds,String [] courseIds) throws Exception {
for(String liveId:liveIds) {
delete(liveId);
+ for(String courseId:courseIds) {
+ MTCloud client = new MTCloud();
+ String s = client.courseDelete(courseId);
+ }
}
return Result.SUCCESS;
}
+
@Override
public Result doIssue(String liveId) {
@@ -262,14 +270,14 @@
public List<MediaVideoLive> list(String keyword, String [] classIds,String subjectId,Short status,Integer pageNum, Integer pageSize) {
StringBuffer hql = new StringBuffer(1000);
Map<String,Object> params = new HashMap<String,Object>();
- hql.append("from MediaVideoLive m left join fetch m.classes c left join fetch m.subject s where m.deleteFlag is false and m.name like :name ");
+ hql.append("from MediaVideoLive m left join fetch m.classes c left join fetch m.subject s where m.deleteFlag is false and m.name like :name ");
params.put("name",keyword + "%");
if(classIds!=null && classIds.length>0){
- hql.append(" and (c.classId in(:classIds) or s.type=:subjectType)");
+ hql.append(" and (c.classId in(:classIds) or s.type=:Type)");
params.put("classIds", classIds);
- params.put("subjectType", Subject.TYPE_PUBLIC_SUBJECT);
+ params.put("Type", Subject.TYPE_PUBLIC_SUBJECT);
}else{
hql.append(" and s.type=:subjectType");
params.put("subjectType", Subject.TYPE_PUBLIC_SUBJECT);
@@ -345,7 +353,14 @@
public MediaVideoLive read(String liveId) {
return read(MediaVideoLive.class,liveId);
}
-
+
+ @Override
+ public MediaVideoLive revamp(int courseId) {
+ String hql = "from MediaVideoLive where deleteFlag is false and courseId=?";
+ MediaVideoLive unique = findUnique(hql, CollectionUtils.newList(courseId), MediaVideoLive.class);
+ return unique ;
+ }
+
@SuppressWarnings("unchecked")
@Override
public List<MediaVideoLive> readByStatus(List<String> liveIdLst,short[] status) {
--
Gitblit v1.8.0