From 8fcf579cca99485af3c18d91dc5b843300b29b01 Mon Sep 17 00:00:00 2001 From: chenjiale Date: Fri, 26 Sep 2025 13:38:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor(alert):=E9=87=8D=E6=9E=84=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E7=89=88=E6=9C=AC=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除了对 ModelVersionMapper 的直接依赖 - 引入 ModelVersionService 和 Page 工具类实现分页查询 - 使用 LambdaQueryWrapperX 构建查询条件 -通过 BeanUtils 转换查询结果为 DO 对象- 调整了 RunModelServiceImpl 的依赖注入方式为构造器注入 --- .../dal/mysql/model/ModelVersionMapper.java | 23 --------------- .../calcgroup/CalcGroupServiceImpl.java | 6 ---- .../service/model/RunModelServiceImpl.java | 28 ++++++++++++++----- 3 files changed, 21 insertions(+), 36 deletions(-) delete mode 100644 yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelVersionMapper.java diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelVersionMapper.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelVersionMapper.java deleted file mode 100644 index 5cb6958..0000000 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelVersionMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package cn.iocoder.yudao.module.alert.dal.mysql.model; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; -import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelPageReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionPageReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionRespVO; -import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelDO; -import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface ModelVersionMapper extends BaseMapperX { - - default PageResult selectPage(ModelVersionPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .eqIfPresent(ModelVersionDO::getModelId, reqVO.getModelId()) - - .orderByAsc(ModelVersionDO::getId)); - } - -} diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/calcgroup/CalcGroupServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/calcgroup/CalcGroupServiceImpl.java index 43a16b5..7da4ed0 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/calcgroup/CalcGroupServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/calcgroup/CalcGroupServiceImpl.java @@ -2,14 +2,8 @@ package cn.iocoder.yudao.module.alert.service.calcgroup; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.module.alert.controller.admin.calcgroup.vo.CalcGroupPageReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelPageReqVO; -import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionPageReqVO; import cn.iocoder.yudao.module.alert.dal.dataobject.calcgroup.CalcGroupDO; -import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelDO; -import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO; import cn.iocoder.yudao.module.alert.dal.mysql.calcgroup.CalcGroupMapper; -import cn.iocoder.yudao.module.alert.dal.mysql.model.ModelMapper; -import cn.iocoder.yudao.module.alert.dal.mysql.model.ModelVersionMapper; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java index abd417c..d2b634c 100644 --- a/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java +++ b/yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/service/model/RunModelServiceImpl.java @@ -1,31 +1,45 @@ package cn.iocoder.yudao.module.alert.service.model; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelPageReqVO; import cn.iocoder.yudao.module.alert.controller.admin.model.vo.ModelVersionPageReqVO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelDO; import cn.iocoder.yudao.module.alert.dal.dataobject.model.ModelVersionDO; import cn.iocoder.yudao.module.alert.dal.mysql.model.ModelMapper; -import cn.iocoder.yudao.module.alert.dal.mysql.model.ModelVersionMapper; +import cn.iocoder.yudao.module.alert.dao.domain.ModelVersion; +import cn.iocoder.yudao.module.alert.dao.service.ModelVersionService; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @Service @Slf4j +@RequiredArgsConstructor public class RunModelServiceImpl implements RunModelService { - @Resource - private ModelMapper modelMapper; - @Resource - private ModelVersionMapper modelVersionMapper; + + private final ModelVersionService modelVersionService; @Override public PageResult getModelPage(ModelPageReqVO reqVO) { - return modelMapper.selectPage(reqVO); + Page page = modelVersionService.page(new Page<>(reqVO.getPageNo(), reqVO.getPageSize()), + new LambdaQueryWrapperX() + .likeIfPresent(ModelVersion::getModelName, reqVO.getModelName()) + .orderByAsc(ModelVersion::getId)); + return new PageResult<>(BeanUtils.toBean(page.getRecords(), ModelDO.class), + page.getTotal()); } @Override public PageResult getModelVersionPage (ModelVersionPageReqVO reqVO) { - return modelVersionMapper.selectPage(reqVO); + Page page = modelVersionService.page(new Page<>(reqVO.getPageNo(), reqVO.getPageSize()), + new LambdaQueryWrapperX() + .eqIfPresent(ModelVersion::getModelId, reqVO.getModelId()) + .orderByAsc(ModelVersion::getId)); + return new PageResult<>(BeanUtils.toBean(page.getRecords(), ModelVersionDO.class), + page.getTotal()); }