tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、课程资源管理删除，编辑

Browse Source
beetlsql3-dev
wgf 2 years ago
parent e9179507a2
commit 31952d1309
5 changed files with 131 additions and 38 deletions
Show Stats Download Patch File Download Diff File

48
web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java
Unescape Escape View File

@ -148,6 +148,7 @@ public class CourseInfoService extends CoreBaseService<CourseInfo> {
/**
* 获取全路径的ID
*
* @param courseInfo
* @return
*/
@ -391,11 +392,12 @@ public class CourseInfoService extends CoreBaseService<CourseInfo> {
/**
* 根据课程获取章节和姐
*
* @param courseInfoQuery
* @return
*/
public List<CourseInfo> getChapterSystemOAndUniversities(CourseInfoQuery courseInfoQuery) {
if (!Objects.equals(courseInfoQuery.getCourseInfoType(),2) && !Objects.equals(courseInfoQuery.getCourseInfoType(),3)){
if (!Objects.equals(courseInfoQuery.getCourseInfoType(), 2) && !Objects.equals(courseInfoQuery.getCourseInfoType(), 3)) {
return new ArrayList<>();
}
@ -405,12 +407,12 @@ public class CourseInfoService extends CoreBaseService<CourseInfo> {
//院校开课
courseInfoList = new ArrayList<>();
LambdaQuery<TeacherOpenCourseMergeCourseInfo> courseInfoLambdaQuery = teacherOpenCourseMergeCourseInfoDao.getSQLManager().lambdaQuery(TeacherOpenCourseMergeCourseInfo.class);
if (Objects.equals(courseInfoQuery.getCourseInfoType(),2)){
if (Objects.equals(courseInfoQuery.getCourseInfoType(), 2)) {
courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getTeacherOpenCourseId, courseInfoQuery.getCourseInfoParentId());
}else {
courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId,courseInfoQuery.getCourseInfoParentId());
} else {
courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoParentId, courseInfoQuery.getCourseInfoParentId());
}
courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType,courseInfoQuery.getCourseInfoType());
courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoType, courseInfoQuery.getCourseInfoType());
courseInfoLambdaQuery.andEq(TeacherOpenCourseMergeCourseInfo::getCourseInfoStatus, 1);
List<TeacherOpenCourseMergeCourseInfo> select = courseInfoLambdaQuery.select();
select.forEach(item -> {
@ -640,26 +642,27 @@ public class CourseInfoService extends CoreBaseService<CourseInfo> {
List<CourseInfo> courseInfoList = new ArrayList<>();
CourseInfo courseInfo = getTreeById(courseInfoId);
List<CourseInfo> childrenList = courseInfo.takeChildren();
for (int i = 0; null != childrenList && i < childrenList.size(); i++) {
courseInfoList.add(childrenList.get(i));
List<CourseInfo> childrenChildrenList = childrenList.get(i).takeChildren();
for (int j = 0; j < childrenChildrenList.size(); j++) {
courseInfoList.add(childrenChildrenList.get(j));
List<CourseInfo> childrenChildrenChildrenList = childrenChildrenList.get(j).takeChildren();
for (int k = 0; k < childrenChildrenChildrenList.size(); k++) {
childrenChildrenChildrenList.get(k).setCourseInfoName("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + childrenChildrenChildrenList.get(k).getCourseInfoName());
courseInfoList.add(childrenChildrenChildrenList.get(k));
List<CourseInfo> childrenChildrenChildrenChildrenList = childrenChildrenChildrenList.get(k).takeChildren();
for (int l = 0; l < childrenChildrenChildrenChildrenList.size(); l++) {
childrenChildrenChildrenList.get(k).setCourseInfoName("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp" + childrenChildrenChildrenList.get(k).getCourseInfoName());
courseInfoList.add(childrenChildrenChildrenChildrenList.get(l));
if (!Objects.isNull(courseInfo)) {
List<CourseInfo> childrenList = courseInfo.takeChildren();
for (int i = 0; null != childrenList && i < childrenList.size(); i++) {
courseInfoList.add(childrenList.get(i));
List<CourseInfo> childrenChildrenList = childrenList.get(i).takeChildren();
for (int j = 0; j < childrenChildrenList.size(); j++) {
courseInfoList.add(childrenChildrenList.get(j));
List<CourseInfo> childrenChildrenChildrenList = childrenChildrenList.get(j).takeChildren();
for (int k = 0; k < childrenChildrenChildrenList.size(); k++) {
childrenChildrenChildrenList.get(k).setCourseInfoName("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" + childrenChildrenChildrenList.get(k).getCourseInfoName());
courseInfoList.add(childrenChildrenChildrenList.get(k));
List<CourseInfo> childrenChildrenChildrenChildrenList = childrenChildrenChildrenList.get(k).takeChildren();
for (int l = 0; l < childrenChildrenChildrenChildrenList.size(); l++) {
childrenChildrenChildrenList.get(k).setCourseInfoName("&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp" + childrenChildrenChildrenList.get(k).getCourseInfoName());
courseInfoList.add(childrenChildrenChildrenChildrenList.get(l));
}
}
}
childrenList.get(i).putChildren(new ArrayList<>());
}
childrenList.get(i).putChildren(new ArrayList<>());
}
buildCourseInfoResources(courseInfoList);
courseInfoList.sort(Comparator.comparing(o -> defaultIfNull(o.getOrderIndex(), ZERO)));
@ -801,8 +804,9 @@ public class CourseInfoService extends CoreBaseService<CourseInfo> {
courseInfo.setCourseInfoType(1);
}
getByParentCourseInfoId(courseInfo, courseInfo.getCourseInfoId(), 1);
TreeCache.put(courseInfo.getCourseInfoId(), ToolUtils.deepCopy(courseInfo));
}
TreeCache.put(courseInfo.getCourseInfoId(), ToolUtils.deepCopy(courseInfo));
// TreeCache.put(courseInfo.getCourseInfoId(), ToolUtils.deepCopy(courseInfo));
}
return courseInfo;
}

71
web/src/main/java/com/ibeetl/jlw/service/ResourcesInfoService.java
Unescape Escape View File

@ -6,15 +6,21 @@ import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.NumberUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.RandomUtil;
import cn.jlw.Interceptor.SCoreUser;
import cn.jlw.aliPay.utils.StringUtils;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.service.CoreBaseService;
import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.jlw.dao.CourseInfoDao;
import com.ibeetl.jlw.dao.ResourcesInfoDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesInfoDao;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.ResourcesInfo;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
import com.ibeetl.jlw.enums.GlobalUpStatusEnum;
import com.ibeetl.jlw.enums.MoveEnum;
import com.ibeetl.jlw.web.query.ResourcesInfoQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesInfoQuery;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.beetl.sql.core.SqlId;
@ -26,10 +32,7 @@ import org.springframework.transaction.annotation.Transactional;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
@ -55,6 +58,10 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo> {
@Autowired
private CourseInfoDao courseInfoDao;
@Autowired
private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao;
public PageQuery<ResourcesInfo> queryByCondition(PageQuery query) {
PageQuery ret = resourcesInfoDao.queryByCondition(query);
queryListAfter(ret.getList());
@ -98,6 +105,7 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo> {
/**
* 获取课程资源管理列表
*
* @param query
* @return
*/
@ -137,7 +145,7 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo> {
public void deleteResourcesInfo(String ids) {
for (int i = 0; i < ids.split(",").length; i++) {
ResourcesInfo oldResourcesInfo = queryById(Long.parseLong(ids.split(",")[i]));
if (ObjectUtil.isNotEmpty(oldResourcesInfo)){
if (ObjectUtil.isNotEmpty(oldResourcesInfo)) {
CourseInfo oldCourseInfo = courseInfoDao.single(oldResourcesInfo.getCourseInfoId());
if (null != oldCourseInfo) {
//资源类型(1视频 2课件 3附件)
@ -164,6 +172,59 @@ public class ResourcesInfoService extends CoreBaseService<ResourcesInfo> {
resourcesInfoDao.deleteResourcesInfoByIds(ids);
}
/**
* 课程资源删除
* @param ids
* @param coreUser
*/
public void deleteCourseSystemOAndUniversities(String ids, CoreUser coreUser) {
if (StringUtils.isNotEmpty(ids)) {
String[] split = ids.split(",");
for (String s : split) {
ResourcesInfo resourcesInfo = getById(Long.parseLong(s));
if (!ObjectUtil.isNull(resourcesInfo)) {
if (coreUser.isAdmin()){
courseInfoService.flushCache(resourcesInfo.getCourseInfoId());
CourseInfo oldCourseInfo = courseInfoDao.single(resourcesInfo.getCourseInfoId());
if (null != oldCourseInfo) {
//资源类型(1视频 2课件 3附件)
if (((Integer) 1).equals(resourcesInfo.getResourcesInfoType())) {
CourseInfo c = new CourseInfo();
c.setCourseInfoId(oldCourseInfo.getCourseInfoId());
c.setCourseVideoId(null != oldCourseInfo.getCourseVideoId() && oldCourseInfo.getCourseVideoId().equals(resourcesInfo.getResourcesInfoId()) ? null : oldCourseInfo.getCourseVideoId());
courseInfoDao.updateVideoIdById(c);
} else if (((Integer) 2).equals(resourcesInfo.getResourcesInfoType())) {
CourseInfo c = new CourseInfo();
c.setCourseInfoId(oldCourseInfo.getCourseInfoId());
c.setCourseCoursewareId(null != oldCourseInfo.getCourseCoursewareId() && oldCourseInfo.getCourseCoursewareId().equals(resourcesInfo.getResourcesInfoId()) ? null : oldCourseInfo.getCourseCoursewareId());
courseInfoDao.updateCoursewareIdById(c);
} else if (((Integer) 3).equals(resourcesInfo.getResourcesInfoType())) {
CourseInfo c = new CourseInfo();
c.setCourseInfoId(oldCourseInfo.getCourseInfoId());
c.setCourseEnclosureIds(StringUtils.isNotBlank(oldCourseInfo.getCourseEnclosureIds()) ? (oldCourseInfo.getCourseEnclosureIds().replace(resourcesInfo.getResourcesInfoId().toString(), "").replace(",,", ",")) : oldCourseInfo.getCourseEnclosureIds());
courseInfoDao.updateEnclosureIdsById(c);
}
}
resourcesInfoDao.deleteResourcesInfoByIds(s);
}
} else {
TeacherOpenCourseMergeResourcesInfo teacherOpenCourseMergeResourcesInfo = teacherOpenCourseMergeResourcesInfoDao.getSQLManager()
.lambdaQuery(TeacherOpenCourseMergeResourcesInfo.class)
.andEq(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeResourcesInfoId,s)
.single();
if (!Objects.isNull(teacherOpenCourseMergeResourcesInfo)) {
TeacherOpenCourseMergeResourcesInfo updateQuery = new TeacherOpenCourseMergeResourcesInfo();
updateQuery.setResourcesInfoStatus(GlobalUpStatusEnum.DEL);
updateQuery.setTeacherOpenCourseMergeResourcesInfoId(teacherOpenCourseMergeResourcesInfo.getTeacherOpenCourseMergeResourcesInfoId());
teacherOpenCourseMergeResourcesInfoDao.upsertByTemplate(updateQuery);
}
}
}
}
}
public boolean addAll(List<ResourcesInfo> resourcesInfoList) {
resourcesInfoList.forEach(item -> {

44
web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java
Unescape Escape View File

@ -12,14 +12,19 @@ import com.ibeetl.admin.core.annotation.Function;
import com.ibeetl.admin.core.entity.CoreUser;
import com.ibeetl.admin.core.file.FileService;
import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesInfoDao;
import com.ibeetl.jlw.entity.CourseInfo;
import com.ibeetl.jlw.entity.ResourcesInfo;
import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo;
import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO;
import com.ibeetl.jlw.enums.GlobalUpStatusEnum;
import com.ibeetl.jlw.enums.MoveEnum;
import com.ibeetl.jlw.service.CourseInfoService;
import com.ibeetl.jlw.service.ResourcesInfoService;
import com.ibeetl.jlw.service.TeacherOpenCourseMergeResourcesInfoService;
import com.ibeetl.jlw.service.UniversitiesCollegesJurisdictionCurriculumResourcesService;
import com.ibeetl.jlw.web.query.ResourcesInfoQuery;
import com.ibeetl.jlw.web.query.TeacherOpenCourseMergeResourcesInfoQuery;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -70,6 +75,9 @@ public class ResourcesInfoController{
@Autowired
FileService fileService;
@Autowired
private TeacherOpenCourseMergeResourcesInfoDao teacherOpenCourseMergeResourcesInfoDao;
/* 前端接口 */
@ -316,16 +324,29 @@ public class ResourcesInfoController{
if(result.hasErrors()){
return JsonResult.failMessage(result);
}else {
boolean success = resourcesInfoService.edit(resourcesInfo);
if (success) {
resourcesInfo = resourcesInfoService.queryById(resourcesInfo.getResourcesInfoId());
//移除缓存
courseInfoService.flushCache(resourcesInfo.getCourseInfoId());
if (ObjectUtil.equal(resourcesInfo.getSourceType(),1)){
TeacherOpenCourseMergeResourcesInfo single = teacherOpenCourseMergeResourcesInfoDao.getSQLManager().lambdaQuery(TeacherOpenCourseMergeResourcesInfo.class)
.andEq(TeacherOpenCourseMergeResourcesInfo::getTeacherOpenCourseMergeResourcesInfoId, resourcesInfo.getResourcesInfoId())
.single();
Integer success = null;
if (ObjectUtil.isNotNull(single)){
single.setTeacherOpenCourseMergeCourseInfoId(resourcesInfo.getCourseInfoId());
success = teacherOpenCourseMergeResourcesInfoDao.updateTemplateById(single);
}
return ObjectUtil.equals(success,1) ? JsonResult.success() : JsonResult.failMessage("更新失败");
}else {
boolean success = resourcesInfoService.edit(resourcesInfo);
if (success) {
resourcesInfo = resourcesInfoService.queryById(resourcesInfo.getResourcesInfoId());
//移除缓存
courseInfoService.flushCache(resourcesInfo.getCourseInfoId());
return JsonResult.success();
} else {
return JsonResult.failMessage("更新失败");
return JsonResult.success();
} else {
return JsonResult.failMessage("更新失败");
}
}
}
}
@ -362,6 +383,13 @@ public class ResourcesInfoController{
return JsonResult.success();
}
@PostMapping(MODEL + "/deleteCourseSystemOAndUniversities.json")
@ResponseBody
public JsonResult deleteCourseSystemOAndUniversities(String ids,@SCoreUser CoreUser coreUser) {
resourcesInfoService.deleteCourseSystemOAndUniversities(ids,coreUser);
return JsonResult.success();
}
/**
* 功能描述: <br>
* 排序 移动

4
web/src/main/resources/static/js/jlw/resourcesInfo/index.js
Unescape Escape View File

@ -102,7 +102,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
method: 'post',
even: true,
size: "lg",
url: Common.ctxPath + '/jlw/resourcesInfo/list.json' // 数据接口
url: Common.ctxPath + '/jlw/resourcesInfo/getCurriculumResourceManagementList.json' // 数据接口
, page: Lib.tablePage // 开启分页
, limit: 10,
cols: [[ // 表头
@ -315,7 +315,7 @@ layui.define(['form', 'laydate', 'table'], function (exports) {
function deleteInfo(ids) {
layer.confirm('是否确定删除数据？', function (index) {
var ret = Common.postAjax("/jlw/resourcesInfo/delete.json", {ids: ids});
var ret = Common.postAjax("/jlw/resourcesInfo/deleteCourseSystemOAndUniversities.json", {ids: ids});
layer.msg(ret.code == 0 ? "删除成功！" : ret.msg, {
offset: ['50%'],
icon: ret.code == 0 ? 1 : 2,

2
web/src/main/resources/templates/common/courseInfoSelect.html
Unescape Escape View File

@ -130,7 +130,7 @@ var newId = !isEmpty(id) ? id : ('select_id_' + (name!'0') + '_' + @cn.hutool.c
if (isShowGroupNameHandler()) ele.append('<optgroup label="开课课程类">');
for (let currentAuthCourseInfoDetail of openCourseList) {
var cid = currentAuthCourseInfoDetail.courseId || '-1';
var cName = currentAuthCourseInfoDetail.courseName || '未查询到数据';
var cName = currentAuthCourseInfoDetail.courseInfoName || '未查询到数据';
var cStatus = currentAuthCourseInfoDetail.courseType;
ele.append('<option value="' + cid + '"' + selectedHandler(cid) + ' status="'+cStatus+'">' + cName + '</option>')
}

Write Preview
Loading…
Cancel
Save