DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor(llm): 调整模型评估任务查询逻辑

Browse Source 
- 移除了 ModelAssessTaskAutoServiceImpl 和 ModelAssessTaskManualServiceImpl 中对状态的限制查询
- 在 ModelServiceServiceImpl 中添加了 TODO 注释，计划后续增加对所有进行中的任务进行校验
This commit is contained in:
Liuyang 2025-02-07 11:21:42 +08:00
parent 1cc30f38c2
commit 76ccaeb9c5
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskauto/ModelAssessTaskAutoServiceImpl.java
View File

@ -208,6 +208,7 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
PageResult<ModelAssessTaskAutoDO> modelAssessTaskAutoDOPageResult = modelAssessTaskAutoMapper.selectPage(pageReqVO);
PageResult<ModelAssessTaskAutoRespVO> result = BeanUtils.toBean(modelAssessTaskAutoDOPageResult, ModelAssessTaskAutoRespVO.class);
if (CollectionUtils.isNotEmpty(result.getList())) {
// 我的模型获取校验
List<Long> serviceIds = modelAssessTaskAutoDOPageResult.getList().stream().
@ -313,7 +314,7 @@ public class ModelAssessTaskAutoServiceImpl implements ModelAssessTaskAutoServic
LambdaQueryWrapper<ModelAssessTaskAutoDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper = condition.apply(queryWrapper, param);
queryWrapper.in(ModelAssessTaskAutoDO::getStatus, 2, 3);
// queryWrapper.in(ModelAssessTaskAutoDO::getStatus, 2, 3);
List<ModelAssessTaskAutoDO> modelAssessTaskAutoDOS = modelAssessTaskAutoMapper.selectList(queryWrapper);
if (CollectionUtils.isEmpty(modelAssessTaskAutoDOS)) {

2
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelassesstaskmanual/ModelAssessTaskManualServiceImpl.java
View File

@ -290,7 +290,7 @@ public class ModelAssessTaskManualServiceImpl implements ModelAssessTaskManualSe
LambdaQueryWrapper<ModelAssessTaskManualDO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper = condition.apply(queryWrapper, param);
queryWrapper.in(ModelAssessTaskManualDO::getStatus, 2, 3);
// queryWrapper.in(ModelAssessTaskManualDO::getStatus, 2, 3);
List<ModelAssessTaskManualDO> modelAssessTaskManualDOS = modelAssessTaskManualMapper.selectList(queryWrapper);
if (CollectionUtils.isEmpty(modelAssessTaskManualDOS)) {

1
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java
View File

@ -155,6 +155,7 @@ public class ModelServiceServiceImpl implements ModelServiceService {
// 校验 基座模型 是否在 应用中心 有使用
validateModelUsesInApplicationCenter(id, modelName);
// TODO: 2.7 因为使用完成再删除，页面会显现为空，所以暂时全部校验
// 校验 基座模型 是否在 模型评估任务-人工 有使用 （是否为进行中）
validateModelUsesInModelAssessTaskManual(id, modelName);
// 校验 基座模型 是否在 模型评估任务-自动 有使用 （是否为进行中、推理中）