From 71d938c746145ba136cea2a8ffb8589131e263da Mon Sep 17 00:00:00 2001 From: wgf <121463602@qq.com> Date: Sat, 12 Aug 2023 00:08:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=A4=E6=96=AD=E6=8E=88=E6=9D=83?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=98=AF=E5=90=A6=E5=86=8D=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ibeetl/jlw/service/CourseInfoService.java | 32 ++++++++++++++++--- .../jlw/service/TeacherOpenCourseService.java | 8 ++++- .../ibeetl/jlw/web/CourseInfoController.java | 17 ++++++++++ .../jlw/web/TeacherOpenCourseController.java | 6 ++++ 4 files changed, 57 insertions(+), 6 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java index dc7d3ba1..6182ef93 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/CourseInfoService.java @@ -16,14 +16,12 @@ import com.ibeetl.admin.core.service.CorePlatformService; import com.ibeetl.admin.core.service.CoreUserService; import com.ibeetl.admin.core.util.PlatformException; import com.ibeetl.admin.core.web.JsonResult; -import com.ibeetl.jlw.dao.CourseInfoDao; -import com.ibeetl.jlw.dao.ResourcesApplicationCourseDao; -import com.ibeetl.jlw.dao.ResourcesInfoDao; -import com.ibeetl.jlw.dao.TeacherOpenCourseMergeCourseInfoDao; +import com.ibeetl.jlw.dao.*; import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.enums.MoveEnum; import com.ibeetl.jlw.web.query.CourseInfoQuery; import com.ibeetl.jlw.web.query.ResourcesInfoQuery; +import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionCurriculumResourcesQuery; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -91,6 +89,9 @@ public class CourseInfoService extends CoreBaseService { @Autowired private CourseLabelService courseLabelService; + @Autowired + private UniversitiesCollegesJurisdictionCurriculumResourcesDao universitiesCollegesJurisdictionCurriculumResourcesDao; + private final List> results = new ArrayList<>(); @@ -116,7 +117,7 @@ public class CourseInfoService extends CoreBaseService { courseInfoId = c.getCourseInfoParentId(); for (int j = 0; j < 25; j++) { CourseInfo courseInfoParent = queryById(courseInfoId); - if (courseInfoParent == null){ + if (courseInfoParent == null) { break; } if (((Integer) 1).equals(courseInfoParent.getCourseInfoType())) { @@ -1644,4 +1645,25 @@ public class CourseInfoService extends CoreBaseService { return ret; } + /** + * 判断授权课程是否再使用 + */ + public boolean getSystemCourseUse(Long courseInfoId) { + if (ObjectUtil.isEmpty(courseInfoId)) { + return false; + } + List allByQuery = universitiesCollegesJurisdictionCurriculumResourcesDao.getSQLManager().lambdaQuery(UniversitiesCollegesJurisdictionCurriculumResources.class) + .andEq(UniversitiesCollegesJurisdictionCurriculumResources::getCourseInfoId, courseInfoId) + .select(); + if (CollectionUtil.isEmpty(allByQuery)) { + return false; + } + for (UniversitiesCollegesJurisdictionCurriculumResources resources : allByQuery) { + if (resources.getUseEndTime().getTime() > new Date().getTime() && !ObjectUtil.equals(resources.getUseType(), 0)) { + return true; + } + } + return false; + } + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java index 08b187e4..ba972de5 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseService.java @@ -304,9 +304,15 @@ public class TeacherOpenCourseService extends CoreBaseService * 判断课程是否再使用 */ public boolean getCourseUse(Long teacherOpenCourseId){ + if (ObjectUtil.isEmpty(teacherOpenCourseId)){ + return false; + } TeacherOpenCourse teacherOpenCourse = new TeacherOpenCourse(); teacherOpenCourse.setTeacherOpenCourseId(teacherOpenCourseId); List teacherOpenCourses = getValues(teacherOpenCourse); - return CollectionUtil.isNotEmpty(teacherOpenCourses) && teacherOpenCourses.get(0).getEndTime().getTime() > new Date().getTime(); + if (CollectionUtil.isNotEmpty(teacherOpenCourses)){ + return teacherOpenCourses.get(0).getEndTime().getTime() > new Date().getTime(); + } + return false; } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java index 77b71801..2896783f 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/CourseInfoController.java @@ -75,6 +75,23 @@ public class CourseInfoController { return JsonResult.success(page); } + /** + * 判断授权课程是否再使用 + * @param courseInfoId + * @param coreUser + * @return + */ + @GetMapping(API + "/getSystemCourseUse.do") + @ResponseBody + public JsonResult getSystemCourseUse(Long courseInfoId,@SCoreUser CoreUser coreUser) { + if(null == coreUser){ + return JsonResult.failMessage("请登录后再操作"); + }else{ + return JsonResult.success(courseInfoService.getSystemCourseUse(courseInfoId)); + } + + } + @PostMapping(API + "/getKzPageList.do") @ResponseBody public JsonResult getKzPageList(CourseInfoQuery condition) { diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java index 6487467e..d8a9d780 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseController.java @@ -94,6 +94,12 @@ public class TeacherOpenCourseController{ } } + /** + * 判断课程是否再使用 + * @param teacherOpenCourseId + * @param coreUser + * @return + */ @GetMapping(API + "/getCourseUse.do") @ResponseBody public JsonResultgetCourseUse(Long teacherOpenCourseId,@SCoreUser CoreUser coreUser) {