流水线模板优化

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java

@@ -518,7 +518,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                     if (datasets != null) {
                         for (Map<String, Object> dataset : datasets) {
                             DatasetTempStorage datasetTempStorage = new DatasetTempStorage();
-                            datasetTempStorage.setRepoId(Integer.valueOf((String) dataset.get("dataset_id")));
+                            datasetTempStorage.setRepoId((Integer) dataset.get("dataset_id"));
                             datasetTempStorage.setName((String) dataset.get("dataset_identifier"));
                             datasetTempStorage.setVersion((String) dataset.get("dataset_version"));
                             datasetTempStorage.setCreateBy((String) dataset.get("owner"));
@@ -599,7 +599,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                 for (Map<String, Object> dataset : trainDatasetList) {
                     if (!dataset.containsKey("dataset_ref")) {
                         NewDatasetVo newDatasetVo = new NewDatasetVo();
-                        newDatasetVo.setId(Integer.valueOf((String) dataset.get("dataset_id")));
+                        newDatasetVo.setId((Integer) dataset.get("dataset_id"));
                         newDatasetVo.setName((String) dataset.get("dataset_name"));
                         newDatasetVo.setVersion((String) dataset.get("dataset_version"));
                         newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier"));
@@ -623,7 +623,7 @@ public class ExperimentServiceImpl implements ExperimentService {
             List<Map<String, Object>> modelsList = (List<Map<String, Object>>) modelTrainMap.get("models");
             if (modelsList != null) {
                 Map<String, Object> parentModelMap = modelsList.get(0);
-                String id = (String) parentModelMap.get("model_id");
+                Integer id = (Integer) parentModelMap.get("model_id");
                 String identifier = (String) parentModelMap.get("model_identifier");
                 String version = (String) parentModelMap.get("model_version");
 
@@ -649,7 +649,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                     for (Map<String, Object> dataset : testDatasetList) {
                         if (!dataset.containsKey("dataset_ref")) {
                             NewDatasetVo newDatasetVo = new NewDatasetVo();
-                            newDatasetVo.setId(Integer.valueOf((String) dataset.get("dataset_id")));
+                            newDatasetVo.setId((Integer) dataset.get("dataset_id"));
                             newDatasetVo.setName((String) dataset.get("dataset_name"));
                             newDatasetVo.setVersion((String) dataset.get("dataset_version"));
                             newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier"));
@@ -672,7 +672,7 @@ public class ExperimentServiceImpl implements ExperimentService {
 
                     for (int j = 0; j < modelTargetList.size(); j++) {
                         Map<String, Object> targetModel = modelTargetList.get(i);
-                        modelMetaVo.setId(Integer.valueOf((String) targetModel.get("model_id")));
+                        modelMetaVo.setId((Integer) targetModel.get("model_id"));
                         modelMetaVo.setIdentifier((String) targetModel.get("model_identifier"));
                         modelMetaVo.setName((String) targetModel.get("model_name"));
                         modelMetaVo.setVersion((String) targetModel.get("model_version"));
@@ -692,7 +692,7 @@ public class ExperimentServiceImpl implements ExperimentService {
 //                        }
 //                        modelMetaVo.setModelVersionVos(versionVos);
 
-                        modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id")));
+                        modelDependency.setRepoId((Integer) targetModel.get("model_id"));
                         modelDependency.setIdentifier((String) targetModel.get("model_identifier"));
                         modelDependency.setVersion((String) targetModel.get("model_version"));
                         modelDependency.setModelName((String) targetModel.get("model_name"));

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java

@@ -389,8 +389,12 @@ public class WorkflowServiceImpl implements WorkflowService {
     public void saveModelWorkFlow(Map<String, Object> inParameters, Long workflowId, String workflowName) throws Exception {
         try {
             Map<String, Object> model = (Map<String, Object>) inParameters.get("--model_name");
-            LinkedHashMap<String, Object> value = (LinkedHashMap<String, Object>) model.get("value");
-            insertAssetWorkFlow(workflowId, workflowName, Long.valueOf((Integer) value.get("id")), (String) value.get("version"), Constant.Asset_Type_Model);
+            Object value = model.get("value");
+            if (value instanceof String) {
+                return;
+            }
+            LinkedHashMap<String, Object> valueMap = (LinkedHashMap<String, Object>) model.get("value");
+            insertAssetWorkFlow(workflowId, workflowName, Long.valueOf((Integer) valueMap.get("id")), (String) valueMap.get("version"), Constant.Asset_Type_Model);
         } catch (Exception e) {
             throw new Exception("模型参数有误：" + e);
         }