diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java index ba1b9077..c2be63cc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsVersionController.java @@ -100,6 +100,7 @@ public class ModelsVersionController extends BaseController { * @return 编辑结果 */ @PutMapping + @ApiOperation("编辑模型") public GenericsAjaxResult edit(@RequestBody ModelsVersion modelsVersion) { return genericsSuccess(this.modelsVersionService.update(modelsVersion)); } @@ -111,6 +112,7 @@ public class ModelsVersionController extends BaseController { * @return 删除是否成功 */ @DeleteMapping("{id}") + @ApiOperation("删除模型") public GenericsAjaxResult deleteById(@PathVariable("id") Integer id) { return genericsSuccess(this.modelsVersionService.removeById(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java index 22f82d57..0027127f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsService.java @@ -80,4 +80,5 @@ public interface ModelsService { String insertModelAndVersion(ModelsVo modelsVo) throws Exception; String readFileContent(Integer modelsId, String version) throws Exception; + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java index 8a565064..c1cabc1d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetServiceImpl.java @@ -306,6 +306,7 @@ public class DatasetServiceImpl implements DatasetService { // 使用Stream API提取version字段,并去重 return versions.stream() .map(DatasetVersion::getVersion) // 提取每个DatasetVersion对象的version属性 + .filter(version -> version != null && !version.isEmpty()) //忽略null或空字符串的version .distinct() // 去重 .collect(Collectors.toList()); // 收集到List中 } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index 2d4de9e0..9ba773c2 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java @@ -229,8 +229,10 @@ public class ExperimentServiceImpl implements ExperimentService { //这里全局参数是一个json数组,需要转换成一个list List> params = JacksonUtil.parseJSONStr2MapList(StringUtils.isEmpty(experiment.getGlobalParam()) ? "[]" : experiment.getGlobalParam()); runReqMap.put("params", params); - - runReqMap.put("experiment", new HashMap().put("name", "experiment-"+experiment.getId())); + //// 实验字段的Map,不要写成一行! + Map experimentMap = new HashMap<>(); + experimentMap.put("name", "experiment-"+experiment.getId()); + runReqMap.put("experiment", experimentMap); Map output = (Map) converMap.get("output"); // 调argo运行接口 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java index 729bb605..6b711468 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java @@ -354,6 +354,7 @@ public class ModelsServiceImpl implements ModelsService { // 使用Stream API提取version字段,并去重 return versions.stream() .map(ModelsVersion::getVersion) // 提取每个ModelVersion对象的version属性 + .filter(version -> version != null && !version.isEmpty()) //忽略null或空字符串的version .distinct() // 去重 .collect(Collectors.toList()); // 收集到List中 } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml index 1cd43358..9ed76e2e 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelsVersionDaoMapper.xml @@ -169,7 +169,7 @@ insert into models_version(models_id, version, url, file_name, file_size, status, description, create_by, create_time, update_by, update_time, state) - values (#{modelsVersion.modelsId}, #{modelsVersion.version}, #{modelsVersion.url}, #{modelsVersion.fileName}, #{modelsVersion.fileSize}, #{modelsVersion.status}, #{modelsVersion.createBy}, #{modelsVersion.createTime}, #{modelsVersion.updateBy}, #{modelsVersion.updateTime}, #{modelsVersion.state}) + values (#{modelsVersion.modelsId}, #{modelsVersion.version}, #{modelsVersion.url}, #{modelsVersion.fileName}, #{modelsVersion.fileSize}, #{modelsVersion.status}, #{modelsVersion.description}, #{modelsVersion.createBy}, #{modelsVersion.createTime}, #{modelsVersion.updateBy}, #{modelsVersion.updateTime}, #{modelsVersion.state}) @@ -178,7 +178,7 @@ (models_id, version, url, file_name, file_size, status, description, create_by, create_time, update_by, update_time, state) values - (#{entity.modelsId}, #{entity.version}, #{entity.url}, #{entity.fileName}, #{entity.fileSize}, #{entity.status}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.state}) + (#{entity.modelsId}, #{entity.version}, #{entity.url}, #{entity.fileName}, #{entity.fileSize}, #{entity.status}, #{entity.description},#{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.state}) @@ -188,7 +188,7 @@ (models_id, version, url, file_name, file_size, status, description, create_by, create_time, update_by, update_time, state) values - (#{entity.modelsId}, #{entity.version}, #{entity.url}, #{entity.fileName}, #{entity.fileSize}, #{entity.status}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.state}) + (#{entity.modelsId}, #{entity.version}, #{entity.url}, #{entity.fileName}, #{entity.fileSize}, #{entity.status},#{entity.description}, #{entity.createBy}, #{entity.createTime}, #{entity.updateBy}, #{entity.updateTime}, #{entity.state}) on duplicate key update models_id = values(models_id),