From e16f5f111109e1154db9418c17ad641c1a461801 Mon Sep 17 00:00:00 2001 From: xuliangtong <1124839262@qq.com> Date: Sun, 23 Oct 2022 20:59:01 +0800 Subject: [PATCH] 1 --- .../jlw/dao/HandsOnSimulationTasksDao.java | 2 ++ .../java/com/ibeetl/jlw/entity/HandsOn.java | 9 ++++++++ .../ibeetl/jlw/service/HandsOnService.java | 21 +++++++++++++++++ .../HandsOnSimulationTasksService.java | 3 +++ .../com/ibeetl/jlw/web/HandsOnController.java | 13 +++++++++++ .../ibeetl/jlw/web/query/HandsOnQuery.java | 11 +++++++++ web/src/main/resources/sql/jlw/handsOn.md | 23 +++++++++++++++++++ 7 files changed, 82 insertions(+) diff --git a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java index b48f2213..03d6f4ac 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/HandsOnSimulationTasksDao.java @@ -24,4 +24,6 @@ public interface HandsOnSimulationTasksDao extends BaseMapper getByIds(String ids); List getValuesByQuery(HandsOnSimulationTasksQuery handsOnSimulationTasksQuery); + + List queryObjectByHandsOnIds(List handsOnIds); } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java index f4f433f4..1f861645 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/HandsOn.java @@ -42,6 +42,9 @@ public class HandsOn extends BaseEntity{ private String handsOnRecommend ; + //开课ID + private Long teacherOpenCourseId; + private Date addTime; private Long orgId; @@ -149,5 +152,11 @@ public class HandsOn extends BaseEntity{ this.handsOnRecommend = handsOnRecommend; } + public Long getTeacherOpenCourseId() { + return teacherOpenCourseId; + } + public void setTeacherOpenCourseId(Long teacherOpenCourseId) { + this.teacherOpenCourseId = teacherOpenCourseId; + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java index 55df1a89..f70965eb 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnService.java @@ -6,6 +6,7 @@ import java.text.DecimalFormat; import java.text.SimpleDateFormat; import java.util.*; import java.math.BigDecimal; +import java.util.stream.Collectors; import cn.jlw.util.ToolUtils; import com.alibaba.fastjson.JSON; @@ -16,6 +17,7 @@ import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.jlw.dao.HandsOnDao; import com.ibeetl.jlw.entity.HandsOn; +import com.ibeetl.jlw.entity.HandsOnSimulationTasks; import com.ibeetl.jlw.web.query.HandsOnQuery; import com.ibeetl.jlw.entity.FileEntity; @@ -46,6 +48,7 @@ import javax.annotation.Resource; public class HandsOnService extends CoreBaseService{ @Resource private HandsOnDao handsOnDao; + @Resource private HandsOnSimulationTasksService handsOnSimulationTasksService; public PageQueryqueryByCondition(PageQuery query){ PageQuery ret = handsOnDao.queryByCondition(query); @@ -156,4 +159,22 @@ public class HandsOnService extends CoreBaseService{ } } + /** + * 学生端-查询课程实操首页 + * @param teacherOpenCourseId + */ + public void getHandonListByTeacherOpenCourseId(Long teacherOpenCourseId) { + + HandsOnQuery handsOnQuery = new HandsOnQuery(); + handsOnQuery.setTeacherOpenCourseId(teacherOpenCourseId); + List handsOnList = handsOnDao.getValuesByQuery(handsOnQuery); + List handsOnIds = handsOnList.stream().map(HandsOn::getHandsOnId).distinct().collect(Collectors.toList()); + List handsOnSimulationTasks = handsOnSimulationTasksService.queryObjectByHandsOnIds(handsOnIds); + for (HandsOn handsOn : handsOnList) { + List collect = handsOnSimulationTasks.stream().filter(v -> v.getHandsOnId().equals(handsOn.getHandsOnId())).collect(Collectors.toList()); + handsOn.set("handsOnSimulationTasks", collect); + } + + + } } diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java index 003f6a30..d231374b 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java @@ -158,4 +158,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService queryObjectByHandsOnIds(List handsOnIds) { + return handsOnSimulationTasksDao.queryObjectByHandsOnIds(handsOnIds); + } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java index ab9c6a59..3a31e531 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/HandsOnController.java @@ -208,4 +208,17 @@ public class HandsOnController{ } + /** + * 学生端-查询课程实操首页 + * @param teacherOpenCourseId 开课ID + * @return + */ + @PostMapping("getHandonListByTeacherOpenCourseId") + public JsonResult getHandonListByTeacherOpenCourseId(Long teacherOpenCourseId) { + handsOnService.getHandonListByTeacherOpenCourseId(teacherOpenCourseId); + return JsonResult.success(); + } + + + } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java index 8ab1703e..9f3332c3 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java +++ b/web/src/main/java/com/ibeetl/jlw/web/query/HandsOnQuery.java @@ -19,6 +19,8 @@ public class HandsOnQuery extends PageParam { @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @Query(name = "实操主键", display = false) private Long handsOnId; + @Query(name = "开课ID", display = false) + private Long teacherOpenCourseId; @Query(name = "归属课程", display = false) private Long courseInfoId; @Query(name = "归属章节", display = false) @@ -103,6 +105,14 @@ public class HandsOnQuery extends PageParam { this.handsOnRecommend = handsOnRecommend; } + public Long getTeacherOpenCourseId() { + return teacherOpenCourseId; + } + + public void setTeacherOpenCourseId(Long teacherOpenCourseId) { + this.teacherOpenCourseId = teacherOpenCourseId; + } + public HandsOn pojo(){ HandsOn pojo = new HandsOn(); pojo.setHandsOnId(this.getHandsOnId()); @@ -114,6 +124,7 @@ public class HandsOnQuery extends PageParam { pojo.setOrgId(this.getOrgId()); pojo.setUserId(this.getUserId()); pojo.setTrainingData(this.getTrainingData()); + pojo.setTeacherOpenCourseId(this.getTeacherOpenCourseId()); return pojo; } diff --git a/web/src/main/resources/sql/jlw/handsOn.md b/web/src/main/resources/sql/jlw/handsOn.md index e326c97e..5fcb4727 100644 --- a/web/src/main/resources/sql/jlw/handsOn.md +++ b/web/src/main/resources/sql/jlw/handsOn.md @@ -13,6 +13,9 @@ queryByCondition @if(!isEmpty(handsOnId)){ and t.hands_on_id =#handsOnId# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} @if(!isEmpty(courseInfoId)){ and t.course_info_id =#courseInfoId# @} @@ -52,6 +55,9 @@ queryByConditionQuery @if(!isEmpty(handsOnRecommend)){ and t.hands_on_recommend =#handsOnRecommend# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} @@ -134,6 +140,9 @@ getHandsOnValues @if(!isEmpty(handsOnRecommend)){ and t.hands_on_recommend =#handsOnRecommend# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} getValuesByQuery @@ -159,6 +168,20 @@ getValuesByQuery @if(!isEmpty(handsOnRecommend)){ and t.hands_on_recommend =#handsOnRecommend# @} + @if(!isEmpty(teacherOpenCourseId)){ + and t.teacher_open_course_id =#teacherOpenCourseId# + @} + + + +queryObjectByHandsOnIds +=== + +* 根据开课ID查询 + select t.* + from hands_on t + where t.teacher_open_course_id in( #join(handsOnIds)#) +