refactor(alert):重构模型版本分页查询逻辑

- 移除了对 ModelVersionMapper 的直接依赖
- 引入 ModelVersionService 和 Page 工具类实现分页查询
- 使用 LambdaQueryWrapperX 构建查询条件
-通过 BeanUtils 转换查询结果为 DO 对象- 调整了 RunModelServiceImpl 的依赖注入方式为构造器注入

yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml

@@ -43,18 +43,18 @@
             <artifactId>postgresql</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>com.microsoft.sqlserver</groupId>
-            <artifactId>mssql-jdbc</artifactId>
-            <version>11.2.0.jre11</version>
+<!--        <dependency>-->
+<!--            <groupId>com.microsoft.sqlserver</groupId>-->
+<!--            <artifactId>mssql-jdbc</artifactId>-->
+<!--            <version>11.2.0.jre11</version>-->
 
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-        <groupId>com.microsoft.sqlserver</groupId>
-        <artifactId>sqljdbc4</artifactId>
-        <version>4.0</version>
-        </dependency>
+<!--            <optional>true</optional>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--        <groupId>com.microsoft.sqlserver</groupId>-->
+<!--        <artifactId>sqljdbc4</artifactId>-->
+<!--        <version>4.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.dameng</groupId>
             <artifactId>DmJdbcDriver18</artifactId>

yudao-module-alert/yudao-module-alert-biz/src/main/java/cn/iocoder/yudao/module/alert/dal/mysql/model/ModelVersionMapper.java

@@ -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<ModelVersionDO> {
-
-    default PageResult<ModelVersionDO> selectPage(ModelVersionPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ModelVersionDO>()
-                .eqIfPresent(ModelVersionDO::getModelId, reqVO.getModelId())
-
-                .orderByAsc(ModelVersionDO::getId));
-    }
-
-}

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;

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<ModelDO> getModelPage(ModelPageReqVO reqVO) {
-        return modelMapper.selectPage(reqVO);
+        Page<ModelVersion> page = modelVersionService.page(new Page<>(reqVO.getPageNo(), reqVO.getPageSize()),
+                new LambdaQueryWrapperX<ModelVersion>()
+                        .likeIfPresent(ModelVersion::getModelName, reqVO.getModelName())
+                        .orderByAsc(ModelVersion::getId));
+        return new PageResult<>(BeanUtils.toBean(page.getRecords(), ModelDO.class),
+                page.getTotal());
     }
 
     @Override
     public PageResult<ModelVersionDO> getModelVersionPage (ModelVersionPageReqVO reqVO) {
-        return modelVersionMapper.selectPage(reqVO);
+        Page<ModelVersion> page = modelVersionService.page(new Page<>(reqVO.getPageNo(), reqVO.getPageSize()),
+                new LambdaQueryWrapperX<ModelVersion>()
+                        .eqIfPresent(ModelVersion::getModelId, reqVO.getModelId())
+                        .orderByAsc(ModelVersion::getId));
+        return new PageResult<>(BeanUtils.toBean(page.getRecords(), ModelVersionDO.class),
+                page.getTotal());
     }
 
 

yudao-server/src/main/resources/application-local.yaml

@@ -66,9 +66,8 @@ spring:
         slave: # 模拟从库，可根据自己需要修改
 #          lazy: true # 开启懒加载，保证启动速度
 #          url: jdbc:mysql://120.26.116.243:3306/alert?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
-          url: jdbc:sqlserver://47.98.32.148:1433;DatabaseName=alert # SQLServer 连接的示例
-          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-          username: sa
+          url: jdbc:mysql://120.26.116.243:3306/alert?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
+          username: root
           password: powerSIS#123
   #        tdengine: # IoT 数据库（需要 IoT 物联网再开启噢！）
   #          url: jdbc:TAOS-RS://127.0.0.1:6041/ruoyi_vue_pro