From 573a1b7c508d8aa76b0f6d0f88b15ad4bef3fc2f Mon Sep 17 00:00:00 2001 From: sun-zewen <1837149054@qq.com> Date: Thu, 24 Aug 2023 23:16:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=9A=84=E5=AF=B9=E8=B1=A1=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatisplus/mapper/SherlyMapper.java | 7 ------ .../convertor/ScheduleTaskConvertor.java | 24 +++++++++++++++++++ .../manager/quartz/ScheduleTaskManager.java | 6 ++++- .../mapper/quartz/ScheduleTaskMapper.java | 6 +++-- 4 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/ScheduleTaskConvertor.java diff --git a/sherly-boot-core/sherly-boot-common/src/main/java/org/oswh/sherly/common/modules/mybatisplus/mapper/SherlyMapper.java b/sherly-boot-core/sherly-boot-common/src/main/java/org/oswh/sherly/common/modules/mybatisplus/mapper/SherlyMapper.java index 9913292..b15d37b 100644 --- a/sherly-boot-core/sherly-boot-common/src/main/java/org/oswh/sherly/common/modules/mybatisplus/mapper/SherlyMapper.java +++ b/sherly-boot-core/sherly-boot-common/src/main/java/org/oswh/sherly/common/modules/mybatisplus/mapper/SherlyMapper.java @@ -21,13 +21,6 @@ import java.util.List; */ public interface SherlyMapper extends BaseMapper { - default PageResult selectPage(PageQuery pageQuery, Class clazz, Wrapper wrapper) { - IPage page = SherlyMybatisPlusUtils.getPage(pageQuery); - selectPage(page, wrapper); - List result = BeanUtils.copyList(page.getRecords(), clazz); - return PageResult.build(result, page.getTotal()); - } - default Page selectPage(PageQuery pageQuery, Wrapper wrapper) { Page page = SherlyMybatisPlusUtils.getPage(pageQuery); return selectPage(page, wrapper); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/ScheduleTaskConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/ScheduleTaskConvertor.java new file mode 100644 index 0000000..cc8d2e6 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/ScheduleTaskConvertor.java @@ -0,0 +1,24 @@ +package org.oswh.sherly.convertor; + +import org.apache.ibatis.annotations.Mapper; +import org.mapstruct.factory.Mappers; +import org.oswh.sherly.controller.quartz.dto.ScheduleTaskPageRespDTO; +import org.oswh.sherly.model.ScheduleTaskDO; + +import java.util.List; + +/** + * @author 孙泽文 + * @date 2023/8/24 + */ +@Mapper +public interface ScheduleTaskConvertor { + + ScheduleTaskConvertor INSTANCE = Mappers.getMapper(ScheduleTaskConvertor.class); + + ScheduleTaskPageRespDTO convertToPageRespDTO(ScheduleTaskDO scheduleTask); + + List convertToPageRespDTO (List questions); + + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java index a951612..750ca66 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/quartz/ScheduleTaskManager.java @@ -1,5 +1,6 @@ package org.oswh.sherly.manager.quartz; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.SneakyThrows; import org.oswh.sherly.common.enums.UsableEnum; import org.oswh.sherly.common.model.PageResult; @@ -7,6 +8,7 @@ import org.oswh.sherly.controller.quartz.dto.ScheduleTaskInsertReqDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskPageReqDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskPageRespDTO; import org.oswh.sherly.controller.quartz.dto.ScheduleTaskUpdateReqDTO; +import org.oswh.sherly.convertor.ScheduleTaskConvertor; import org.oswh.sherly.mapper.quartz.ScheduleTaskMapper; import org.oswh.sherly.model.ScheduleTaskDO; import org.oswh.sherly.other.quartz.util.ScheduleTaskUtil; @@ -54,7 +56,9 @@ public class ScheduleTaskManager { * @return */ public PageResult listPage(ScheduleTaskPageReqDTO dto) { - return scheduleTaskMapper.listPage(dto); + Page page = scheduleTaskMapper.listPage(dto); + List result = ScheduleTaskConvertor.INSTANCE.convertToPageRespDTO(page.getRecords()); + return PageResult.build(result,page.getTotal()); } /** diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/quartz/ScheduleTaskMapper.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/quartz/ScheduleTaskMapper.java index 604c157..f8df3ed 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/quartz/ScheduleTaskMapper.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/quartz/ScheduleTaskMapper.java @@ -1,6 +1,7 @@ package org.oswh.sherly.mapper.quartz; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.oswh.sherly.common.enums.UsableEnum; import org.oswh.sherly.common.model.PageResult; import org.oswh.sherly.common.modules.mybatisplus.mapper.SherlyMapper; @@ -15,8 +16,9 @@ import org.springframework.stereotype.Repository; */ @Repository public interface ScheduleTaskMapper extends SherlyMapper { - default PageResult listPage(ScheduleTaskPageReqDTO dto) { - return selectPage(dto, ScheduleTaskPageRespDTO.class, null); + + default Page listPage(ScheduleTaskPageReqDTO dto) { + return selectPage(dto, null); } default void enableOne(String scheduleTaskId, UsableEnum usable) { -- Gitee