校准模型创建时的状态

application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelManageController.java

@@ -15,12 +15,10 @@ import com.yice.webadmin.app.dto.ModelDeployDto;
 import com.yice.webadmin.app.dto.ModelManageDto;
 import com.yice.webadmin.app.dto.ModelTaskDto;
 import com.yice.webadmin.app.dto.ModelVersionDto;
-import com.yice.webadmin.app.model.ModelDeploy;
-import com.yice.webadmin.app.model.ModelManage;
-import com.yice.webadmin.app.model.ModelTask;
-import com.yice.webadmin.app.model.ModelVersion;
+import com.yice.webadmin.app.model.*;
 import com.yice.webadmin.app.service.ModelManageService;
 import com.yice.webadmin.app.service.ModelVersionService;
+import com.yice.webadmin.app.service.TuningRunService;
 import com.yice.webadmin.app.vo.ModelManageVo;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -44,7 +42,8 @@ public class ModelManageController {
     @Autowired
     private ModelManageService modelManageService;
     @Autowired
-    private ModelVersionService modelVersionService;
+    private TuningRunService tuningRunService;
+
 
     /**
      * 新增模型管理数据，及其关联的从表数据。
@@ -64,7 +63,7 @@ public class ModelManageController {
         }
         ModelManage modelManage = MyModelUtil.copyTo(modelManageDto, ModelManage.class);
         ModelVersion modelVersion = MyModelUtil.copyTo(modelVersionDto, ModelVersion.class);
-        modelManage = modelManageService.saveAndCreateVersion(modelManage, modelVersion);
+        modelManage = this.tuningRunService.createToModel(modelManage,modelVersion);
         return ResponseResult.success(modelManage.getModelId());
     }
 

application-webadmin/src/main/java/com/yice/webadmin/app/controller/ModelVersionController.java

@@ -18,6 +18,7 @@ import com.yice.webadmin.app.dto.ModelVersionDto;
 import com.yice.webadmin.app.model.ModelVersion;
 import com.yice.webadmin.app.service.ModelVersionService;
 import com.yice.webadmin.app.service.ProxyPythonService;
+import com.yice.webadmin.app.service.TuningRunService;
 import com.yice.webadmin.app.vo.ModelVersionVo;
 import io.swagger.annotations.Api;
 import lombok.extern.slf4j.Slf4j;
@@ -45,6 +46,9 @@ public class ModelVersionController {
     private PythonConfig pythonConfig;
     @Autowired
     private ProxyPythonService proxyPythonService;
+    @Autowired
+    private TuningRunService tuningRunService;
+
 
     /**
      * 新增模型版本数据。
@@ -66,7 +70,7 @@ public class ModelVersionController {
         if (!callResult.isSuccess()) {
             return ResponseResult.errorFrom(callResult);
         }
-        modelVersion = modelVersionService.saveNew(modelVersion);
+        modelVersion = this.tuningRunService.createToModelVersion(modelVersion);
         return ResponseResult.success(modelVersion.getVersionId());
     }
 

application-webadmin/src/main/java/com/yice/webadmin/app/service/ModelManageService.java

@@ -83,4 +83,6 @@ public interface ModelManageService extends IBaseService<ModelManage, Long> {
     List<ModelManage> getModelManageListWithRelation(ModelManage filter, ModelVersion modelVersionFilter, ModelTask modelTaskFilter, ModelDeploy modelDeployFilter, String orderBy);
 
     ModelManage saveAndCreateVersion(ModelManage modelManage, ModelVersion modelVersion);
+    ModelVersion saveAndCreateVersionV(ModelManage modelManage, ModelVersion modelVersion);
+
 }

application-webadmin/src/main/java/com/yice/webadmin/app/service/TuningRunService.java

@@ -2,6 +2,8 @@ package com.yice.webadmin.app.service;
 
 import com.yice.common.core.base.service.IBaseService;
 import com.yice.webadmin.app.dto.RunPublishDto;
+import com.yice.webadmin.app.model.ModelManage;
+import com.yice.webadmin.app.model.ModelVersion;
 import com.yice.webadmin.app.model.TuningRun;
 
 import java.util.List;
@@ -76,4 +78,8 @@ public interface TuningRunService extends IBaseService<TuningRun, Long> {
     List<TuningRun> getTuningRunListWithRelation(TuningRun filter, String orderBy);
 
     boolean publishToModelVersion(RunPublishDto runPublishDto);
+
+    ModelManage createToModel(ModelManage modelManage, ModelVersion modelVersion);
+
+    ModelVersion createToModelVersion(ModelVersion modelVersion);
 }

application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelManageServiceImpl.java

@@ -11,14 +11,8 @@ import com.yice.common.core.object.MyRelationParam;
 import com.yice.common.core.util.MyModelUtil;
 import com.yice.common.sequence.wrapper.IdGeneratorWrapper;
 import com.yice.webadmin.app.dao.ModelManageMapper;
-import com.yice.webadmin.app.model.ModelDeploy;
-import com.yice.webadmin.app.model.ModelManage;
-import com.yice.webadmin.app.model.ModelTask;
-import com.yice.webadmin.app.model.ModelVersion;
-import com.yice.webadmin.app.service.ModelDeployService;
-import com.yice.webadmin.app.service.ModelManageService;
-import com.yice.webadmin.app.service.ModelTaskService;
-import com.yice.webadmin.app.service.ModelVersionService;
+import com.yice.webadmin.app.model.*;
+import com.yice.webadmin.app.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +42,8 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
     private ModelDeployService modelDeployService;
     @Autowired
     private IdGeneratorWrapper idGenerator;
+    @Autowired
+    private TuningRunService tuningRunService;
 
     /**
      * 返回当前Service的主表Mapper对象。
@@ -191,6 +187,16 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
         this.modelVersionService.saveNew(modelVersion);
         return reModelManage;
     }
+    @Transactional
+    @Override
+    public ModelVersion saveAndCreateVersionV(ModelManage modelManage, ModelVersion modelVersion) {
+        ModelManage reModelManage = this.saveNew(modelManage);
+        modelVersion.setModelId(reModelManage.getModelId());
+        if (modelVersion.getBusinessLabel() == null && modelManage.getBusinessLabel() != null) {
+            modelVersion.setBusinessLabel(modelManage.getBusinessLabel());
+        }
+        return this.modelVersionService.saveNew(modelVersion);
+    }
 
     private ModelManage buildDefaultValue(ModelManage modelManage) {
         if (modelManage.getModelId() == null) {

application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelVersionServiceImpl.java

@@ -77,14 +77,7 @@ public class ModelVersionServiceImpl extends BaseService<ModelVersion, Long> imp
         }
         modelVersion.setVersionName(modelName + "_V" + modelVersion.getModelVersion());
         modelVersionMapper.insert(this.buildDefaultValue(modelVersion));
-        //此处应该调用精调运行发布的方法生成模型任务，不应该直接生成！！！！！！！！！！！！！！！！！
-        /*ModelTask modelTask = new ModelTask();
-        modelTask.setModelVersion(modelVersion.getModelVersion());
-        modelTask.setModelId(modelVersion.getModelId());
-        modelTask.setTaskType(0);
-        modelTask.setVersionId(modelVersion.getVersionId());
-        modelTask.setVersionName(modelVersion.getVersionName());
-        this.modelTaskService.saveNew(modelTask);*/
+
         return modelVersion;
     }