diff --git a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/blueprint/authoring/PracticeBlueprintAuthoringService.java b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/blueprint/authoring/PracticeBlueprintAuthoringService.java index d83593b0..20b90d41 100644 --- a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/blueprint/authoring/PracticeBlueprintAuthoringService.java +++ b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/blueprint/authoring/PracticeBlueprintAuthoringService.java @@ -5,8 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.education.dal.dataobject.catalog.PracticeBlueprintDO; public interface PracticeBlueprintAuthoringService { - default PageResult getPage(PageParam pageParam) { throw new UnsupportedOperationException(); } - default PracticeBlueprintDO get(Long id) { throw new UnsupportedOperationException(); } + PageResult getPage(PageParam pageParam); + PracticeBlueprintDO get(Long id); Long createDraft(PracticeBlueprintAuthoringCommand command); int reviseDraft(Long id, PracticeBlueprintAuthoringCommand command); int activate(Long id, int expectedVersion, Long actorId); diff --git a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/category/authoring/CategoryAuthoringService.java b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/category/authoring/CategoryAuthoringService.java index 0bbe9910..a9fe3e81 100644 --- a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/category/authoring/CategoryAuthoringService.java +++ b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/category/authoring/CategoryAuthoringService.java @@ -5,8 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.education.dal.dataobject.catalog.CategoryDO; public interface CategoryAuthoringService { - default PageResult getPage(PageParam pageParam) { throw new UnsupportedOperationException(); } - default CategoryDO get(Long categoryId) { throw new UnsupportedOperationException(); } + PageResult getPage(PageParam pageParam); + CategoryDO get(Long categoryId); Long createDraft(CategoryAuthoringCommand command); int reviseDraft(Long categoryId, CategoryAuthoringCommand command); int activate(Long categoryId, int expectedAuthoringVersion, Long actorId); diff --git a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/collection/authoring/QuestionCollectionAuthoringService.java b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/collection/authoring/QuestionCollectionAuthoringService.java index a4c37b14..e2ad357e 100644 --- a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/collection/authoring/QuestionCollectionAuthoringService.java +++ b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/collection/authoring/QuestionCollectionAuthoringService.java @@ -7,8 +7,8 @@ import cn.iocoder.yudao.module.education.dal.dataobject.catalog.QuestionCollecti import java.util.List; public interface QuestionCollectionAuthoringService { - default PageResult getPage(PageParam pageParam) { throw new UnsupportedOperationException(); } - default QuestionCollectionDO get(Long collectionId) { throw new UnsupportedOperationException(); } + PageResult getPage(PageParam pageParam); + QuestionCollectionDO get(Long collectionId); Long createDraft(QuestionCollectionAuthoringCommand command); int reviseDraft(Long collectionId, QuestionCollectionAuthoringCommand command); int replaceMembership(Long collectionId, List questionIds, int expectedAuthoringVersion); diff --git a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/contentnode/authoring/ContentNodeAuthoringService.java b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/contentnode/authoring/ContentNodeAuthoringService.java index d4dca516..b32ee085 100644 --- a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/contentnode/authoring/ContentNodeAuthoringService.java +++ b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/contentnode/authoring/ContentNodeAuthoringService.java @@ -5,8 +5,8 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.education.dal.dataobject.catalog.ContentNodeDO; public interface ContentNodeAuthoringService { - default PageResult getPage(PageParam pageParam) { throw new UnsupportedOperationException(); } - default ContentNodeDO get(Long nodeId) { throw new UnsupportedOperationException(); } + PageResult getPage(PageParam pageParam); + ContentNodeDO get(Long nodeId); Long createDraft(ContentNodeAuthoringCommand command); int reviseDraft(Long nodeId, ContentNodeAuthoringCommand command); int activate(Long nodeId, int expectedAuthoringVersion, Long actorId); diff --git a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleService.java b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleService.java index e261fbe8..fdb4b95c 100644 --- a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleService.java +++ b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleService.java @@ -7,15 +7,13 @@ import cn.iocoder.yudao.module.education.dal.dataobject.catalog.QuestionDO; /** 租户自有题目的显式发布生命周期。 */ public interface TenantQuestionLifecycleService { - default PageResult getPage(PageParam pageParam) { throw new UnsupportedOperationException(); } + PageResult getPage(PageParam pageParam); - default QuestionDO get(Long questionId) { throw new UnsupportedOperationException(); } + QuestionDO get(Long questionId); Long createDraft(QuestionDraftCommand command); - default int reviseDraft(Long questionId, QuestionDraftCommand command, int expectedContentVersion) { - throw new UnsupportedOperationException(); - } + int reviseDraft(Long questionId, QuestionDraftCommand command, int expectedContentVersion); int place(Long questionId, QuestionPlacementCommand command); diff --git a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleServiceImpl.java b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleServiceImpl.java index a176081b..7fbcf3e4 100644 --- a/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleServiceImpl.java +++ b/yudao-module-education/src/main/java/cn/iocoder/yudao/module/education/service/question/authoring/TenantQuestionLifecycleServiceImpl.java @@ -1,6 +1,8 @@ package cn.iocoder.yudao.module.education.service.question.authoring; import cn.iocoder.yudao.framework.common.exception.ServiceException; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.json.JsonUtils; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; @@ -63,6 +65,23 @@ public class TenantQuestionLifecycleServiceImpl implements TenantQuestionLifecyc this.auditMapper = auditMapper; } + @Override + public PageResult getPage(PageParam pageParam) { + assertAuthoringMode(); + return questionMapper.selectTenantOwnedPage(pageParam, TenantContextHolder.getRequiredTenantId()); + } + + @Override + public QuestionDO get(Long questionId) { + assertAuthoringMode(); + Long tenantId = TenantContextHolder.getRequiredTenantId(); + QuestionDO question = questionMapper.selectTenantOwnedById(tenantId, questionId); + if (question == null) { + throw exception(QUESTION_AUTHORING_NOT_FOUND); + } + return question; + } + @Override @Transactional(rollbackFor = Exception.class) public int place(Long questionId, QuestionPlacementCommand command) {