优化终止实验bug

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

@@ -1,5 +1,6 @@
 package com.ruoyi.platform.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSON;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.domain.DatasetTempStorage;
@@ -435,11 +436,13 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
                     HashMap queryMap = new HashMap<String, Integer>();
                     queryMap.put("insId", experimentIns.getId());
                     ModelDependency1 modelDependency1 = modelDependency1Dao.queryByInsId(JSON.toJSONString(queryMap));
-                    if (StringUtils.isNotEmpty(modelDependency1.getVersion())) {
-                        String relativePath = ci4sUsername + "/model/" + modelDependency1.getRepoId() + "/" + modelDependency1.getIdentifier() + "/" + modelDependency1.getVersion() + "/model";
-                        modelsService.deleteVersion(modelDependency1.getRepoId(), modelDependency1.getIdentifier(), modelDependency1.getOwner(), modelDependency1.getVersion(), relativePath);
-                    } else {
-                        modelDependency1Dao.deleteModelById(modelDependency1.getId());
+                    if (modelDependency1 != null) {
+                        if (StringUtils.isNotEmpty(modelDependency1.getVersion())) {
+                            String relativePath = ci4sUsername + "/model/" + modelDependency1.getRepoId() + "/" + modelDependency1.getIdentifier() + "/" + modelDependency1.getVersion() + "/model";
+                            modelsService.deleteVersion(modelDependency1.getRepoId(), modelDependency1.getIdentifier(), modelDependency1.getOwner(), modelDependency1.getVersion(), relativePath);
+                        } else {
+                            modelDependency1Dao.deleteModelById(modelDependency1.getId());
+                        }
                     }
                 }
                 //删除导出数据集版本
@@ -447,7 +450,8 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
                     HashMap queryMap = new HashMap<String, Integer>();
                     queryMap.put("ins_id", experimentIns.getId());
                     DatasetTempStorage datasetTempStorage = datasetTempStorageDao.queryByInsId(JSON.toJSONString(queryMap));
-                    Map<String, Object> source = JsonUtils.jsonToMap(datasetTempStorage.getSource());
+                    Map<String, Object> source = JSONUtil.toBean(datasetTempStorage.getSource(), Map.class);
+//                    Map<String, Object> source = JSONUtil.parseObj(datasetTempStorage.getSource());
                     String relativePath = ci4sUsername + "/datasets/" + source.get("repo_id") + "/" + source.get("identifier") + "/" + source.get("version") + "/dataset";
                     newDatasetService.deleteDatasetVersionNew((Integer) source.get("repo_id"), (String) source.get("identifier"), (String) source.get("owner"), (String) source.get("version"), relativePath);
                 }