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/admin/classes/service/impl/ClassLectureService.java | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java
index 136aa80..6e4fb50 100644
--- a/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java
+++ b/src/main/java/com/qxueyou/scc/admin/classes/service/impl/ClassLectureService.java
@@ -95,31 +95,33 @@
@Override
public List<MyLectureV> listLectureV(String learnerId, String chapterId, String keyword, Integer pageSize,
Integer pageNum, String type) {
- StringBuffer hql = new StringBuffer("from MyLectureV where subjectId=? and id.userId=? order by lectureCreateTime desc");
-// StringBuffer hql = new StringBuffer("from MyLectureV where chapterId=? and id.userId=? and status=? order by lectureCreateTime desc");
-
-// List<Object> args = CollectionUtils.newList(chapterId, learnerId,ClsSubjectLecture.STATUS_DRAFT);
+ StringBuffer hql = new StringBuffer("from MyLectureV where subjectId=? and id.userId=?");
List<Object> args = CollectionUtils.newList(chapterId, learnerId);
+ List<MyLectureV> myLectureVList = findList(hql.toString(), new Pager(pageSize, pageNum), args, MyLectureV.class);
+ if(myLectureVList.size() < 1){
+
+ }else {
+ hql = new StringBuffer("from MyLectureV where chapterId=? and id.userId=? order by lectureCreateTime desc");
+ args = CollectionUtils.newList(myLectureVList.get(0).getChapterId(), learnerId);
+ }
if (StringUtils.isNotEmpty(type)) {
hql.append(" and lectureType=?");
args.add(type);
}
-
List<MyLectureV> result = findList(hql.toString(), new Pager(pageSize, pageNum), args, MyLectureV.class);
-
return result;
}
/**
- * 课程课件
+ * 璇剧▼璇句欢
*
*/
@Override
public Map<String,Object> listLectureBySubjectOrderCreateTime(String subjectId, String classId, String sort, Pager pager) {
Subject subject = this.read(Subject.class, subjectId);
- if(Subject.TYPE_PUBLIC_SUBJECT == subject.getType()) {//公开课课件
+ if(Subject.TYPE_PUBLIC_SUBJECT == subject.getType()) {//鍏紑璇捐浠�
return this.listOpenLectureBySubjectOrderCreateTime(subjectId, sort, pager);
}
@@ -150,7 +152,7 @@
}
/**
- * 公开课课件
+ * 鍏紑璇捐浠�
*
* @param subjectId
* @param sort
@@ -205,9 +207,9 @@
}
/**
- * 删除单个章节
+ * 鍒犻櫎鍗曚釜绔犺妭
*
- * @param chapterId 章节id
+ * @param chapterId 绔犺妭id
* @return
*/
private Result deleteChapter(String chapterId) {
@@ -241,13 +243,13 @@
lecture.setStatus(res.getStatus());
save(lecture);
- // 发送消息
+ // 鍙戦�佹秷鎭�
doPublishMsg(lecture);
return new Result(true, "success");
}
- //添加课程，发送消息
+ //娣诲姞璇剧▼锛屽彂閫佹秷鎭�
private void doPublishMsg(ClsSubjectLecture lecture){
Subject subject = this.read(Subject.class, lecture.getSubjectId());
@@ -255,7 +257,7 @@
return ;
}
- //查询直播关联的班级
+ //鏌ヨ鐩存挱鍏宠仈鐨勭彮绾�
String hql = "select userId from StuStudent where classId =:classId and deleteFlag is false ";
List<String> lstUserIds = this.findByComplexHql(hql, CollectionUtils.newObjectMap("classId",lecture.getClassId()), String.class);
@@ -264,10 +266,30 @@
Map<String,String> attrs = CollectionUtils.newStringMap("lectureId",lecture.getLectureId(),"lectureName",lecture.getName(),"subjectId",subject.getSubjectId(),
"lectureType",lecture.getLectureType(),"subjectName",subject.getName());
- msgInfoService.doSendTextMsgToUsers(lstUserIds.toArray(new String[lstUserIds.size()]),MsgInfo.TYPE_COURSEWARE,"发布了课件",attrs);
+ msgInfoService.doSendTextMsgToUsers(lstUserIds.toArray(new String[lstUserIds.size()]),MsgInfo.TYPE_COURSEWARE,"鍙戝竷浜嗚浠�",attrs);
}
}
+ public Result updateLecturetime(String targetId) {
+
+ ClsSubjectLecture lecture = read(ClsSubjectLecture.class, targetId);
+ if(lecture == null){
+ SubjectLecture lecture1 = read(SubjectLecture.class,targetId);
+ TraceUtils.setUpdateTrace(lecture1);
+
+ lecture1.setUpdateTime(new Date());
+ lecture1.setUpdator(ClientUtils.getUserId());
+ save(lecture1);
+ }else {
+ TraceUtils.setUpdateTrace(lecture);
+
+ lecture.setUpdateTime(new Date());
+ lecture.setUpdator(ClientUtils.getUserId());
+ save(lecture);
+ }
+
+ return new Result(true, "success");
+ }
@Override
public Result updateLecture(String lectureId, String resId) {
@@ -296,7 +318,7 @@
}
/**
- * @param lectureId 课件id
+ * @param lectureId 璇句欢id
* @return
*/
private Result deleteLecture(String lectureId) {
@@ -305,7 +327,7 @@
TraceUtils.setUpdateTrace(lecture);
lecture.setDeleteFlag(true);
save(lecture);
- deleteProgress(lectureId);// 删除对应的进度
+ deleteProgress(lectureId);// 鍒犻櫎瀵瑰簲鐨勮繘搴�
return new Result(true, "success");
}
@@ -396,7 +418,7 @@
}
/**
- * 我的公开课课件查询
+ * 鎴戠殑鍏紑璇捐浠舵煡璇�
*
* @param subjectId
* @return
@@ -424,7 +446,7 @@
}
/**
- * 查询数量
+ * 鏌ヨ鏁伴噺
*
* @param subjectId
* @param classId
@@ -444,7 +466,7 @@
ClsSubjectLecture lecture = read(ClsSubjectLecture.class, lectureId);
String resItemId = null;
if(lecture == null) {
- resItemId = read(SubjectLecture.class, lectureId).getResItemId();//班级课件
+ resItemId = read(SubjectLecture.class, lectureId).getResItemId();//鐝骇璇句欢
}else {
resItemId = lecture.getResItemId();
}
@@ -583,7 +605,7 @@
@Override
public Result listSubjectLecture(String classId, String sort, Pager pager) {
if(StringUtils.isEmpty(classId)) {
- return new Result(false, "班级id不能为空");
+ return new Result(false, "鐝骇id涓嶈兘涓虹┖");
}
QMyLectureV qMyLectureV = QMyLectureV.myLectureV;
@@ -599,7 +621,7 @@
long count = query.fetchCount();
- // 获取查询结果集合
+ // 鑾峰彇鏌ヨ缁撴灉闆嗗悎
QueryResults<MyLectureV> results = query.limit(pager.getPageSize()).offset(pager.getOffset()).orderBy(order).fetchResults();
List<Map<String,Object>> resultLst =
@@ -633,7 +655,7 @@
}
/**
- * 删除对应的课件
+ * 鍒犻櫎瀵瑰簲鐨勮浠�
*
* @param chapterId
* @return
@@ -648,7 +670,7 @@
/**
- * 获取章节下的课件
+ * 鑾峰彇绔犺妭涓嬬殑璇句欢
*
* @param chapterLst
* @param lectures
@@ -678,7 +700,7 @@
}
/**
- * 获取章节的第一层数据
+ * 鑾峰彇绔犺妭鐨勭涓�灞傛暟鎹�
*
* @param chapterLst
* @return
@@ -727,7 +749,7 @@
}
/**
- * 课件按目录分类
+ * 璇句欢鎸夌洰褰曞垎绫�
*
* @param classId
* @param subjectId
@@ -737,9 +759,9 @@
public Result coursewareChapterList(String classId,String subjectId, String type) {
Subject subject = this.read(Subject.class, subjectId);
- if(Subject.TYPE_PUBLIC_SUBJECT == subject.getType() || Subject.TYPE_ORG_SUBJECT == subject.getType()) {//公开课和管理员课程
+ if(Subject.TYPE_PUBLIC_SUBJECT == subject.getType() || Subject.TYPE_ORG_SUBJECT == subject.getType()) {//鍏紑璇惧拰绠＄悊鍛樿绋�
QSubjectLecture qSubjectLecture = QSubjectLecture.subjectLecture;
- //课件
+ //璇句欢
List<Map<String, Object>> lectures = this.listStuLectureByOpenSubject(subjectId);
List<SubjectChapter> lstSubjectChapterLst = this.getListOpenChapter(subjectId);
@@ -751,15 +773,15 @@
try {
BeanUtils.copyProperties(objClsSubjectChapter, objSubjectChapter);
} catch (IllegalAccessException e) {
- log.error("拷贝属性失败BeanUtils.copyProperties(objClsSubjectChapter, objSubjectChapter)", e);
+ log.error("鎷疯礉灞炴�уけ璐eanUtils.copyProperties(objClsSubjectChapter, objSubjectChapter)", e);
} catch (InvocationTargetException e) {
- log.error("拷贝属性失败BeanUtils.copyProperties(objClsSubjectChapter, objSubjectChapter)", e);
+ log.error("鎷疯礉灞炴�уけ璐eanUtils.copyProperties(objClsSubjectChapter, objSubjectChapter)", e);
}
lstClsSubjectChapter.add(objClsSubjectChapter);
}
}
- //章节
+ //绔犺妭
List<ClsSubjectChapter> chapterLst = this.getChapterLectures(lstClsSubjectChapter, lectures);
long count = this.getQueryFactory().selectFrom(qSubjectLecture)
@@ -770,9 +792,9 @@
CollectionUtils.newStringMap("name", "name", "chapterId", "chapterId", "lectures", "lectures"))));
}else{
- //课件
+ //璇句欢
List<Map<String, Object>> lectures = this.listStuLectureBySubject(subjectId, classId);
- //章节
+ //绔犺妭
List<ClsSubjectChapter> chapterLst = this.getChapterLectures(this.getListChapter(classId, subjectId, null), lectures);
return new Result(true, "success", CollectionUtils.newObjectMap("count",this.stuLectureCountBySubject(subjectId, classId), "listData", QBeanUtils.listBean2ListMap(chapterLst,
--
Gitblit v1.8.0