diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java index 5ca6bcfa2..e6439a22a 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/FineTuningTaskController.java @@ -93,6 +93,13 @@ public class FineTuningTaskController { PageResult pageResult = fineTuningTaskService.getFineTuningTaskPage1(pageReqVO); return success(pageResult); } + @GetMapping("/all") + @Operation(summary = "获得模型调优 —— 微调任务列表") + @PreAuthorize("@ss.hasPermission('llm:fine-tuning-task:query')") + public CommonResult> getFineTuningTaskList() { + List list = fineTuningTaskService.selectAll(); + return success(list); + } @GetMapping("/export-excel") @Operation(summary = "导出模型调优 —— 微调任务 Excel") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java index 6bc3d5887..632f5b04f 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java @@ -100,8 +100,8 @@ public class ModelServiceController { @Operation(summary = "获得模型服务分页") @PreAuthorize("@ss.hasPermission('llm:model-service:query')") public CommonResult> getModelServicePage(@Valid ModelServicePageReqVO pageReqVO) { - PageResult pageResult = modelServiceService.getModelServicePage(pageReqVO); - return success(BeanUtils.toBean(pageResult, ModelServiceRespVO.class)); + PageResult pageResult = modelServiceService.getModelServicePage1(pageReqVO); + return success(pageResult); } @GetMapping("/export-excel") diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/vo/ModelServiceRespVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/vo/ModelServiceRespVO.java index fabb41a7e..261398f27 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/vo/ModelServiceRespVO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/vo/ModelServiceRespVO.java @@ -49,4 +49,11 @@ public class ModelServiceRespVO { @DictFormat("llm_model_status") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Integer status; + @Schema(description = "更新时间", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("更新时间") + private LocalDateTime updateTime; + + @Schema(description = "微调任务名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + private String fineTuningTaskName; + } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataprocesstask/DataProcessTaskServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataprocesstask/DataProcessTaskServiceImpl.java index 3721fe043..414ca4121 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataprocesstask/DataProcessTaskServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/dataprocesstask/DataProcessTaskServiceImpl.java @@ -126,6 +126,7 @@ public class DataProcessTaskServiceImpl implements DataProcessTaskService { @Override public void reStartFineTuningTask(Long id) { + dataProcessService.backups(dataProcessTaskMapper.selectById(id)); dataProcessTaskMapper.updateStatus(id, 1); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java index 87c3d2ee1..f118f566d 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskService.java @@ -71,4 +71,7 @@ public interface FineTuningTaskService { * @param id */ void startFineTuningTask(Long id); + + List selectAll(); + } \ No newline at end of file diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java index 87d254f67..a8f7db577 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java @@ -19,6 +19,7 @@ import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -142,6 +143,12 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService { } + @Override + public List selectAll() { + List fineTuningTaskDOS = fineTuningTaskMapper.selectList(); + return BeanUtils.toBean(fineTuningTaskDOS, FineTuningTaskRespVO.class); + } + @Override public void stopFineTuningTask(Long id) { fineTuningTaskMapper.stopStartTask(id,1); diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java index e1ad3ff29..cd340d062 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java @@ -61,4 +61,6 @@ public interface ModelServiceService { void active(ModelServiceSaveReqVO updateReqVO); void unactive(ModelServiceSaveReqVO updateReqVO); + + PageResult getModelServicePage1(ModelServicePageReqVO pageReqVO); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java index 1d7f3d114..cf2c74ed7 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java @@ -1,5 +1,8 @@ package cn.iocoder.yudao.module.llm.service.modelservice; +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.iocoder.yudao.module.llm.dal.dataobject.finetuningtask.FineTuningTaskDO; +import cn.iocoder.yudao.module.llm.dal.mysql.finetuningtask.FineTuningTaskMapper; import cn.iocoder.yudao.module.llm.service.async.AsyncModelServiceService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -7,6 +10,8 @@ import org.springframework.validation.annotation.Validated; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; + import cn.iocoder.yudao.module.llm.controller.admin.modelservice.vo.*; import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -32,6 +37,8 @@ public class ModelServiceServiceImpl implements ModelServiceService { @Resource private AsyncModelServiceService asyncModelServiceService; + @Resource + private FineTuningTaskMapper fineTuningTaskMapper; @Override public Long createModelService(ModelServiceSaveReqVO createReqVO) { @@ -107,4 +114,24 @@ public class ModelServiceServiceImpl implements ModelServiceService { } + @Override + public PageResult getModelServicePage1(ModelServicePageReqVO pageReqVO) { + PageResult pageResult = modelServiceMapper.selectPage(pageReqVO); + PageResult respVo = BeanUtils.toBean(pageResult, ModelServiceRespVO.class); + if (!CollectionUtils.isAnyEmpty(pageResult.getList())){ + List ids = pageResult.getList().stream() + .map(ModelServiceDO::getFineTuningTask) + .collect(Collectors.toList()); + List fineTuningTaskDOS = fineTuningTaskMapper.selectBatchIds(ids); + Map fineTuningTaskMap = CollectionUtils.convertMap(fineTuningTaskDOS, FineTuningTaskDO::getId); + respVo.getList().forEach(item->{ + FineTuningTaskDO fineTuningTaskDO = fineTuningTaskMap.get(item.getFineTuningTask()); + if(fineTuningTaskDO != null){ + item.setFineTuningTaskName(fineTuningTaskDO.getTaskName()); + } + }); + } + return respVo; + } + }