From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期三, 03 七月 2024 18:29:31 +0800 Subject: [PATCH] feat:新增随机时间题目配置 --- src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java | 25 +++++++++++++++++++++---- 1 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java b/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java index b62c392..7cb8fb0 100644 --- a/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java +++ b/src/main/java/com/mindskip/xzs/service/impl/OnlineStudySeerviceImpl.java @@ -7,10 +7,11 @@ import com.mindskip.xzs.domain.OnlineStudy; import com.mindskip.xzs.domain.question.QuestionObject; import com.mindskip.xzs.domain.vo.OnlineStudyVO; +import com.mindskip.xzs.domain.vo.StudentOnlineVO; +import com.mindskip.xzs.domain.vo.StudyTypeVO; import com.mindskip.xzs.repository.OnlineStudyMapper; +import com.mindskip.xzs.repository.StudyTypeMapper; import com.mindskip.xzs.service.OnlineStudyService; -import com.mindskip.xzs.utility.JsonUtil; -import jdk.nashorn.internal.ir.IfNode; import lombok.RequiredArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -19,7 +20,6 @@ import java.util.Date; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; /** * @author锛歺p @@ -30,6 +30,7 @@ public class OnlineStudySeerviceImpl implements OnlineStudyService { private final OnlineStudyMapper mapper; + private final StudyTypeMapper studyTypeMapper; @Override public RestResponse add(OnlineStudyVO form) { @@ -70,7 +71,6 @@ @Override public RestResponse page(OnlineStudyVO query) { - PageHelper.startPage(query.getPageNum(), query.getPageSize()); PageInfo<OnlineStudyVO> page = PageHelper.startPage(query.getPageNum(), query.getPageSize()).doSelectPageInfo(() -> mapper.page(query)); page.getList().stream().forEach(item -> { @@ -79,4 +79,21 @@ }); return RestResponse.ok(page.getList()).put("total", page.getTotal()); } + + @Override + public RestResponse byType(StudentOnlineVO query) { + PageInfo<OnlineStudyVO> page = PageHelper.startPage(query.getPageNum(), query.getPageSize()).doSelectPageInfo(() -> + mapper.byType(query)); + page.getList().stream().forEach(item -> { + item.setContentUrl(JSON.parseObject(item.getContentUrlString(), OnlineStudyVO.UploadFile.class)); + item.setAttachment(JSON.parseArray(item.getAttachmentString(), OnlineStudyVO.UploadFile.class)); + }); + return RestResponse.ok(page.getList()).put("total", page.getTotal()); + } + + @Override + public RestResponse typeList() { + List<StudyTypeVO> list = studyTypeMapper.list(); + return RestResponse.ok(list); + } } -- Gitblit v1.8.0