修改返回名称

This commit is contained in:
limin 2025-02-18 10:50:29 +08:00
parent b4c53ad546
commit a3f7074d9d
2 changed files with 28 additions and 5 deletions

View File

@ -144,4 +144,6 @@ public class FineTuningTaskRespVO {
private JSONObject checkPointDataJSON;
private String cardServerName;
}

View File

@ -9,9 +9,12 @@ import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuning
import cn.iocoder.yudao.module.llm.dal.dataobject.basemodel.BaseModelDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.dataset.DatasetDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.finetuningtask.FineTuningTaskDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO;
import cn.iocoder.yudao.module.llm.dal.dataobject.servername.ServerNameDO;
import cn.iocoder.yudao.module.llm.dal.mysql.basemodel.BaseModelMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.finetuningtask.FineTuningTaskMapper;
import cn.iocoder.yudao.module.llm.dal.mysql.servername.ServerNameMapper;
import cn.iocoder.yudao.module.llm.enums.FinetuningTaskStatusEnum;
import cn.iocoder.yudao.module.llm.service.async.AsyncFineTuningTaskService;
import cn.iocoder.yudao.module.llm.service.http.TrainHttpService;
@ -29,10 +32,7 @@ import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@ -61,6 +61,9 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService {
@Resource
TrainHttpService trainHttpService;
@Resource
private ServerNameMapper serverNameMapper;
@Resource
private ModelServiceService modelServiceService;
@ -238,7 +241,25 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService {
fineTuningTaskDOS = fineTuningTaskDOS.stream()
.filter(item -> item.getStatus().equals(FinetuningTaskStatusEnum.FINISHED.getStatus()))
.collect(Collectors.toList());
return BeanUtils.toBean(fineTuningTaskDOS, FineTuningTaskRespVO.class);
List<FineTuningTaskRespVO> respVOS = BeanUtils.toBean(fineTuningTaskDOS, FineTuningTaskRespVO.class);
// 提取gpu_typeIds
List<Long> gpuTypeIds = fineTuningTaskDOS.stream()
.map(FineTuningTaskDO::getGpuType)
.filter(Objects::nonNull)
.collect(Collectors.toList());
List<ServerNameDO> serverNameDOS = serverNameMapper.selectList(new LambdaQueryWrapper<ServerNameDO>()
.in(ServerNameDO::getId, gpuTypeIds));
Map<Long, ServerNameDO> longServerNameDOMap = cn.iocoder.yudao.framework.common.util.collection.CollectionUtils
.convertMap(serverNameDOS, ServerNameDO::getId);
respVOS.forEach(item -> {
ServerNameDO serverNameDO = longServerNameDOMap.get(item.getGpuType());
if (serverNameDO != null) {
item.setCardServerName(serverNameDO.getCardServerName());
}
});
// 根据gpu_typeIds查询gpu_type
return respVOS;
}
/**