From 5a45668c612481afcf72c789f3d4d83562476f11 Mon Sep 17 00:00:00 2001 From: liwq <122639653@qq.com> Date: Tue, 14 Oct 2025 15:54:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20ai=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/dal/mysql/aisample/AiSampleMapper.java | 22 ++++++++++++++++ .../dal/mysql/aisample/AiSampleTagMapper.java | 26 +++++++++---------- .../service/aisample/AiSampleServiceImpl.java | 11 +++++--- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleMapper.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleMapper.java index e1a0722..cfed0f5 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleMapper.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleMapper.java @@ -1,11 +1,14 @@ package com.tashow.cloud.ai.dal.mysql.aisample; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.tashow.cloud.ai.controller.admin.aisample.vo.AiSamplePageReqVO; import com.tashow.cloud.ai.dal.dataobject.aisample.AiSampleDO; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.mybatis.mybatis.core.mapper.BaseMapperX; import com.tashow.cloud.mybatis.mybatis.core.query.LambdaQueryWrapperX; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; /** * 样本库 Mapper @@ -18,4 +21,23 @@ public interface AiSampleMapper extends BaseMapperX { .likeIfPresent(AiSampleDO::getSampleName, reqVO.getSampleName()) .orderByDesc(AiSampleDO::getId)); } + + + @Select("") + IPage getAiSamplePage(Page objectPage, AiSamplePageReqVO pageReqVO); } \ No newline at end of file diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleTagMapper.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleTagMapper.java index cd5777a..9056d3d 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleTagMapper.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/dal/mysql/aisample/AiSampleTagMapper.java @@ -23,19 +23,19 @@ public interface AiSampleTagMapper extends BaseMapperX { .orderByDesc(AiSampleTagDO::getId)); } - @Select("") IPage getAiSampleTagPage(Page page, AiSampleTagPageReqVO pageReqVO); diff --git a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/aisample/AiSampleServiceImpl.java b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/aisample/AiSampleServiceImpl.java index 39aa0b0..2c11b88 100644 --- a/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/aisample/AiSampleServiceImpl.java +++ b/tashow-module/tashow-module-ai/src/main/java/com/tashow/cloud/ai/service/aisample/AiSampleServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.tashow.cloud.ai.controller.admin.aisample.vo.*; import com.tashow.cloud.ai.dal.dataobject.aisample.AiSampleDO; import com.tashow.cloud.ai.dal.dataobject.aisample.AiSampleTagDO; @@ -14,6 +15,7 @@ import com.tashow.cloud.ai.dal.mysql.aisample.AiSampleTagRelateMapper; import com.tashow.cloud.common.pojo.PageResult; import com.tashow.cloud.common.util.object.BeanUtils; import com.tashow.cloud.infraapi.api.file.FileApi; +import com.tashow.cloud.mybatis.mybatis.core.util.MyBatisUtils; import jakarta.annotation.Resource; import lombok.SneakyThrows; import org.springframework.beans.factory.annotation.Value; @@ -149,9 +151,10 @@ public class AiSampleServiceImpl implements AiSampleService { @Override public PageResult getAiSamplePage(AiSamplePageReqVO pageReqVO) { - PageResult aiSampleDOPageResult = aiSampleMapper.selectPage(pageReqVO); +// PageResult aiSampleDOPageResult = aiSampleMapper.selectPage(pageReqVO); + IPage aiSampleDOPageResult = aiSampleMapper.getAiSamplePage(MyBatisUtils.buildPage(pageReqVO),pageReqVO); //根据样本id获取关联的标签id - List sampleIds = aiSampleDOPageResult.getList().stream().map(AiSampleDO::getId).toList(); + List sampleIds = aiSampleDOPageResult.getRecords().stream().map(AiSampleDO::getId).toList(); List tagRelateDOS = aiSampleTagRelateMapper.selectList( new LambdaQueryWrapper() .in(!sampleIds.isEmpty(), AiSampleTagRelateDO::getSampleId, sampleIds)); @@ -162,7 +165,7 @@ public class AiSampleServiceImpl implements AiSampleService { .in(!tagIds.isEmpty(), AiSampleTagDO::getId, tagIds)); //封装标签信息 - for (AiSampleDO aiSampleDO : aiSampleDOPageResult.getList()) { + for (AiSampleDO aiSampleDO : aiSampleDOPageResult.getRecords()) { List list = tagRelateDOS.stream() .filter(a -> ObjectUtil.equals(aiSampleDO.getId(), a.getSampleId())) .toList(); @@ -171,7 +174,7 @@ public class AiSampleServiceImpl implements AiSampleService { aiSampleDO.setTags(list1); aiSampleDO.setSampleFilePath(aiSampleDO.getSampleFilePath()); } - return aiSampleDOPageResult; + return new PageResult<>(aiSampleDOPageResult.getRecords(), aiSampleDOPageResult.getTotal()); } } \ No newline at end of file