Merge remote-tracking branch 'origin/master'

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/vo/FineTuningTaskPageReqVO.java

@@ -24,6 +24,9 @@ public class FineTuningTaskPageReqVO extends PageParam {
     @Schema(description = "训练阶段，使用字典（llm_training_stage）")
     private Integer trainStage;
 
+    @Schema(description = "训练时长")
+    private String trainDuration;
+
     @Schema(description = "微调方法，使用字典（llm_fine_tuning_method）")
     private Integer method;
 

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/vo/FineTuningTaskRespVO.java

@@ -134,7 +134,8 @@ public class FineTuningTaskRespVO {
 
     @Schema(description = "数据集名称")
     private String datasetName;
-
+    @Schema(description = "训练时长")
+    private String trainDuration;
     @Schema(description = "模型广场信息")
     private AigcFineTuningDetailRespVO detailRespVO;
 

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/finetuningtask/vo/FineTuningTaskSaveReqVO.java

@@ -28,6 +28,9 @@ public class FineTuningTaskSaveReqVO {
     @Schema(description = "描述")
     private String taskIntro;
 
+    @Schema(description = "训练时长")
+    private String trainDuration;
+
     @Schema(description = "GPU类型，使用字典（llm_gpu_type）", example = "1")
     private Integer gpuType;
 

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/finetuningtask/FineTuningTaskDO.java

@@ -43,6 +43,7 @@ public class FineTuningTaskDO extends BaseDO {
      * 枚举 {@link TODO llm_training_stage 对应的类}
      */
     private Integer trainStage;
+    private String trainDuration;
     /**
      * 微调方法，使用字典（llm_fine_tuning_method）
      *

yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskSyncService.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.llm.enums.FineTuningTaskStatusConstants;
 import cn.iocoder.yudao.module.llm.enums.FinetuningTaskStatusEnum;
 import cn.iocoder.yudao.module.llm.service.http.TrainHttpService;
 import cn.iocoder.yudao.module.llm.service.http.vo.AigcFineTuningDetailRespVO;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.esotericsoftware.minlog.Log;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -37,6 +38,7 @@ public class FineTuningTaskSyncService {
                     FineTuningTaskDO updateObj = new FineTuningTaskDO();
                     updateObj.setId(fineTuningTaskDO.getId());
                     updateObj.setStatus(status);
+                    updateObj.setTrainDuration(StringUtils.isNotBlank(resp.getTrainDuration())?resp.getTrainDuration():"");
                     fineTuningTaskMapper.updateById(updateObj);
                 }
             }