diff --git a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java index 49d99634..2d1e8f1f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/ResourcesInfoController.java @@ -21,21 +21,15 @@ import com.ibeetl.jlw.entity.ResourcesInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeCourseInfo; import com.ibeetl.jlw.entity.TeacherOpenCourseMergeResourcesInfo; import com.ibeetl.jlw.entity.vo.ResourcesCourseInfoAuthDetailsVO; -import com.ibeetl.jlw.enums.AddTypeEnum; -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.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.beetl.sql.core.engine.PageQuery; -import org.beetl.sql.core.query.LambdaQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; @@ -53,7 +47,6 @@ import java.math.RoundingMode; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Objects; import java.util.stream.Collectors; import static cn.hutool.core.util.ArrayUtil.join; @@ -283,8 +276,21 @@ public class ResourcesInfoController { public ModelAndView previewData(Long resourcesInfoId) { ModelAndView view = new ModelAndView("/jlw/previewPage/previewData.html"); ResourcesInfo resourcesInfo = resourcesInfoService.getById(resourcesInfoId); - view.addObject("resourcesInfo", resourcesInfo); - view.addObject("resourcesInfoContent", resourcesInfo.getResourcesInfoContent().replaceAll("\\\\", "/")); + + // 系统资源 + if (resourcesInfo != null) { + view.addObject("resourcesInfo", resourcesInfo); + view.addObject("resourcesInfoContent", resourcesInfo.getResourcesInfoContent().replaceAll("\\\\", "/")); + } + + // 开课资源 + else { + TeacherOpenCourseMergeResourcesInfo tocResourceInfo = teacherOpenCourseMergeResourcesInfoDao.single(resourcesInfoId); + // 用到的字段都是同名的,所以这里直接返回就可以了 + view.addObject("resourcesInfo", tocResourceInfo); + view.addObject("resourcesInfoContent", tocResourceInfo.getResourcesInfoContent().replaceAll("\\\\", "/")); + } + return view; }