From 67b5a00a146063aa4924209a69f7f13556d55155 Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Mon, 8 Jan 2024 11:26:59 +0800 Subject: [PATCH 01/45] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/mapper/DatasetVersionDao.java | 1 + .../java/com/ruoyi/platform/mapper/ModelsVersionDao.java | 2 ++ .../ruoyi/platform/service/DatasetVersionService.java | 3 +++ .../com/ruoyi/platform/service/ModelsVersionService.java | 3 +++ .../ruoyi/platform/service/impl/DatasetServiceImpl.java | 5 ++++- .../platform/service/impl/DatasetVersionServiceImpl.java | 6 ++++++ .../ruoyi/platform/service/impl/ModelsServiceImpl.java | 7 ++++++- .../platform/service/impl/ModelsVersionServiceImpl.java | 6 ++++++ .../managementPlatform/DatasetVersionDaoMapper.xml | 9 +++++++-- .../mapper/managementPlatform/ModelsVersionDaoMapper.xml | 7 ++++++- 10 files changed, 44 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java index 0389be86..61d8d604 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java @@ -80,5 +80,6 @@ public interface DatasetVersionDao { */ int deleteById(Integer id); + List queryByDatasetId(Integer datasetId); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java index 5d7e8768..dbbf5125 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelsVersionDao.java @@ -80,5 +80,7 @@ public interface ModelsVersionDao { */ int deleteById(Integer id); + List queryByModelsId(Integer modelsId); + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java index 2c15b384..3c7bf079 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetVersionService.java @@ -7,6 +7,8 @@ import com.ruoyi.platform.domain.DatasetVersion; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; + /** * (DatasetVersion)表服务接口 * @@ -58,4 +60,5 @@ public interface DatasetVersionService { String removeById(Integer id); + List queryByDatasetId(Integer datasetId); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java index a6086e1e..b34fab1d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelsVersionService.java @@ -7,6 +7,8 @@ import com.ruoyi.platform.domain.ModelsVersion; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; + /** * (ModelsVersion)表服务接口 * @@ -58,4 +60,5 @@ public interface ModelsVersionService { String removeById(Integer id); + List queryByModelsId(Integer modelsId); } 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 425992fa..896e1a59 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 @@ -30,6 +30,7 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.List; /** * (Dataset)表服务实现类 @@ -42,7 +43,6 @@ public class DatasetServiceImpl implements DatasetService { @Resource private DatasetDao datasetDao; - private DatasetService datasetService; @Resource private DatasetVersionDao datasetVersionDao; @@ -158,6 +158,9 @@ public class DatasetServiceImpl implements DatasetService { if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ return "无权限删除该数据集"; } + if (datasetVersionService.queryByDatasetId(id).size()>0){ + return "请先删除该数据集的版本文件"; + } dataset.setState(0); return this.datasetDao.update(dataset)>0?"删除数据集成功":"删除数据集失败"; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java index 9cd7110a..3bcbdedc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DatasetVersionServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.List; /** * (DatasetVersion)表服务实现类 @@ -117,4 +118,9 @@ public class DatasetVersionServiceImpl implements DatasetVersionService { return this.datasetVersionDao.update(datasetVersion)>0?"删除数据集版本成功":"删除数据集版本失败"; } + @Override + public List queryByDatasetId(Integer datasetId) { + return datasetVersionDao.queryByDatasetId(datasetId); + } + } 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 e0ba2305..377a9edd 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 @@ -6,6 +6,7 @@ import com.ruoyi.platform.domain.ModelsVersion; import com.ruoyi.platform.mapper.ModelsDao; import com.ruoyi.platform.mapper.ModelsVersionDao; import com.ruoyi.platform.service.ModelsService; +import com.ruoyi.platform.service.ModelsVersionService; import com.ruoyi.platform.utils.MinioUtil; import com.ruoyi.system.api.model.LoginUser; import io.minio.MinioClient; @@ -43,6 +44,8 @@ public class ModelsServiceImpl implements ModelsService { private ModelsVersionDao modelsVersionDao; private MinioClient minioClient; + @Resource + private ModelsVersionService modelsVersionService; @Value("${minio.endpoint}") private String minioEndpoint; @@ -148,7 +151,9 @@ public class ModelsServiceImpl implements ModelsService { if (!(StringUtils.equals(username,"admin") || StringUtils.equals(username,createdBy))){ return "无权限删除该模型"; } - + if (modelsVersionService.queryByModelsId(id).size()>0){ + return "请先删除该数据集的版本文件"; + } models.setState(0); return this.modelsDao.update(models)>0?"删除成功":"删除失败"; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java index be91ad3d..22bb348a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsVersionServiceImpl.java @@ -14,6 +14,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.Date; +import java.util.List; /** * (ModelsVersion)表服务实现类 @@ -122,4 +123,9 @@ public class ModelsVersionServiceImpl implements ModelsVersionService { modelsVersion.setState(0); return this.modelsVersionDao.update(modelsVersion)>0?"删除成功":"删除失败"; } + + @Override + public List queryByModelsId(Integer modelsId){ + return modelsVersionDao.queryByModelsId(modelsId); + } } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml index ca1a31b5..f6eb60cd 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml @@ -18,7 +18,12 @@ - + @@ -26,7 +31,7 @@ select id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state from dataset_version - where id = #{id} and state = 1 + where dataset_id = #{datasetId} and state = 1 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 c8a27a6c..72a515b5 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 @@ -16,7 +16,12 @@ - + @@ -92,10 +92,12 @@ - insert into workflow(name, description, dag, create_by, create_time, update_by, update_time, state) - values (#{name}, #{description}, #{dag}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{state}) + insert into workflow(name, description, dag, create_by, create_time, update_by, update_time,state) + values (#{workflow.name}, #{workflow.description}, #{workflow.dag}, #{workflow.createBy}, #{workflow.createTime}, #{workflow.updateBy}, #{workflow.updateTime}, #{workflow.state}) + + insert into workflow(name, description, dag, create_by, create_time, update_by, update_time, state) values @@ -127,32 +129,32 @@ update workflow - - name = #{name}, + + name = #{workflow.name}, - - description = #{description}, + + description = #{workflow.description}, - - dag = #{dag}, + + dag = #{workflow.dag}, - - create_by = #{createBy}, + + create_by = #{workflow.createBy}, - - create_time = #{createTime}, + + create_time = #{workflow.createTime}, - - update_by = #{updateBy}, + + update_by = #{workflow.updateBy}, - - update_time = #{updateTime}, + + update_time = #{workflow.updateTime}, - - state = #{state}, + + state = #{workflow.state} - where id = #{id} + where id = #{workflow.id} @@ -167,8 +169,8 @@ from workflow state = 1 - - and name like "%"#{name}"%" + + and name like "%"#{workflow.name}"%" From 940cde9e791da02a1ad1bde55d4cfa5e78918fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 9 Jan 2024 09:37:38 +0800 Subject: [PATCH 03/45] =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E7=A7=8D=E7=B1=BBid=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/ComponentController.java | 18 ++++++++++++++++++ .../ruoyi/platform/mapper/ComponentDao.java | 4 ++++ .../platform/service/ComponentService.java | 5 +++++ .../service/impl/ComponentServiceImpl.java | 14 ++++++++++++++ .../managementPlatform/ComponentDaoMapper.xml | 6 ++++++ 5 files changed, 47 insertions(+) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java index 8e9cc051..abbd3a12 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java @@ -11,6 +11,8 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; /** * (Component)表控制层 @@ -41,6 +43,22 @@ public class ComponentController { return ResponseEntity.ok(this.componentService.queryByPage(component, pageRequest)); } + + /** + * 查询全部 + * + * + * + * @return 查询结果 + */ + @GetMapping("/components/all") + @ApiOperation("查询全部") + public ResponseEntity>> queryAll(){ + return ResponseEntity.ok(this.componentService.queryAllGroupedByCategory()); + } + + + /** * 通过主键查询单条数据 * diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java index 3b7f3685..ce42dca6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ComponentDao.java @@ -29,6 +29,9 @@ public interface ComponentDao { */ Component queryById(Integer id); + + List queryAll(); + /** * 查询指定行数据 * @@ -90,5 +93,6 @@ public interface ComponentDao { // 检查相同category_id下的component_name是否存在 Integer countByNameAndCategoryId(@Param("componentName") String componentName, @Param("categoryId") Integer categoryId); + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java index a1a60951..df8b5500 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ComponentService.java @@ -5,6 +5,9 @@ import com.ruoyi.platform.vo.ComponentVo; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import java.util.List; +import java.util.Map; + /** * (Component)表服务接口 * @@ -56,4 +59,6 @@ public interface ComponentService { String removeById(Integer id); + Map> queryAllGroupedByCategory(); + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java index 9b5bd44d..a1a2638c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ComponentServiceImpl.java @@ -16,6 +16,9 @@ import org.springframework.data.domain.PageRequest; import javax.annotation.Resource; import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * (Component)表服务实现类 @@ -30,6 +33,8 @@ public class ComponentServiceImpl implements ComponentService { @Value("${pipeline.control_strategy}") private String controlStrategy; + + /** * 通过ID查询单条数据 * @@ -46,6 +51,13 @@ public class ComponentServiceImpl implements ComponentService { return this.componentDao.queryById(id); } + @Override + public Map> queryAllGroupedByCategory() { + List componentList = this.componentDao.queryAll(); + Map> groupedComponent = componentList.stream().collect(Collectors.groupingBy(Component::getCategoryId)); + return groupedComponent; + } + /** * 分页查询 * @@ -150,4 +162,6 @@ public class ComponentServiceImpl implements ComponentService { component.setState(0); return this.componentDao.update(component)>0?"删除成功":"删除失败"; } + + } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ComponentDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ComponentDaoMapper.xml index 832cdee7..c51a1767 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ComponentDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ComponentDaoMapper.xml @@ -31,6 +31,12 @@ where id = #{id} and state = 1 + + + + select - id,category_id,component_name,component_Label,images,working_directory,command,env_virables,resources_standard,control_strategy,mount_path,in_parameters,out_parameters,create_by,create_time,update_by,update_time,state + id,category_id,component_name,component_Label,images,working_directory,command,env_virables,resources_standard,control_strategy,mount_path,in_parameters,out_parameters,description,icon_path,create_by,create_time,update_by,update_time,state from component where id = #{id} and state = 1 @@ -40,7 +42,7 @@ - select id,experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state + select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state from experiment_ins where id = #{id} and state = 1 + + + + diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml index 49c787a5..8b522836 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml @@ -118,6 +118,7 @@ and update_time = #{experimentIns.updateTime} + order by update_time DESC limit #{pageable.offset}, #{pageable.pageSize} diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml index ba2e313c..755a11da 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml @@ -54,6 +54,7 @@ and update_time = #{workflow.updateTime} + order by update_time DESC limit #{pageable.offset}, #{pageable.pageSize} From 0446f75c10874eddf861f44c360e1302e946aa4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Mon, 15 Jan 2024 14:58:31 +0800 Subject: [PATCH 18/45] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=A9=BC=E5=B3=B0=E8=BD=AC=E4=B8=8B=E5=88=92=E7=BA=BF?= =?UTF-8?q?=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ruoyi/platform/domain/DatasetVersion.java | 4 ++++ .../src/main/java/com/ruoyi/platform/domain/Experiment.java | 3 +++ .../main/java/com/ruoyi/platform/domain/ExperimentIns.java | 4 ++++ .../src/main/java/com/ruoyi/platform/domain/Models.java | 4 ++++ .../main/java/com/ruoyi/platform/domain/ModelsVersion.java | 4 ++++ .../src/main/java/com/ruoyi/platform/domain/Workflow.java | 3 +++ 6 files changed, 22 insertions(+) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java index 7649dc82..4a70baeb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2024-01-03 16:57:12 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class DatasetVersion implements Serializable { private static final long serialVersionUID = -96998451993465838L; /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java index d7ee965c..154d85fc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.common.core.web.domain.BaseEntity; import java.io.Serializable; @@ -16,6 +18,7 @@ import java.util.List; * @author makejava * @since 2023-11-07 15:08:22 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Experiment extends BaseEntity implements Serializable { private static final long serialVersionUID = 409135817108439880L; @TableId diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java index ea6552b1..df586a76 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.io.Serializable; import java.util.Date; @@ -9,6 +12,7 @@ import java.util.Date; * @author makejava * @since 2023-11-09 09:48:36 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class ExperimentIns implements Serializable { private static final long serialVersionUID = 623464560240790680L; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index 185476c5..480a998f 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2023-11-28 16:24:19 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Models implements Serializable { private static final long serialVersionUID = -59896385986032571L; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 8dd03f39..376bd529 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2024-01-05 09:02:42 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class ModelsVersion implements Serializable { private static final long serialVersionUID = -20181111893295288L; /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java index 0edc4077..40098889 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java @@ -2,6 +2,8 @@ package com.ruoyi.platform.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.platform.handler.BaseMetaObjectHandler; import org.springframework.stereotype.Component; @@ -17,6 +19,7 @@ import java.util.Date; */ @Component @Table(name = "workflow") +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Workflow extends BaseMetaObjectHandler implements Serializable { private static final long serialVersionUID = -28387946419827568L; /** From b97e939fbb569991b3cc98f703909c72630d43a6 Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Mon, 15 Jan 2024 15:19:23 +0800 Subject: [PATCH 19/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DatasetController.java | 2 +- .../controller/model/ModelsController.java | 3 ++- .../ruoyi/platform/domain/DatasetVersion.java | 4 +++ .../ruoyi/platform/domain/ModelsVersion.java | 4 +++ .../service/impl/DatasetServiceImpl.java | 4 +-- .../service/impl/ModelsServiceImpl.java | 3 ++- .../com/ruoyi/platform/utils/BeansUtils.java | 27 +++++++++++++++++++ .../ModelsVersionDaoMapper.xml | 8 +++--- 8 files changed, 46 insertions(+), 9 deletions(-) create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/BeansUtils.java diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index c1c76f16..8ddf05b1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -134,7 +134,7 @@ public class DatasetController { */ @PostMapping("/upload_pipeline") @ApiOperation(value = "从流水线上传数据集", notes = "并将信息存入数据库。") - public ResponseEntity uploadDatasetPipeline(@RequestBody DatasetVersion datasetVersion) { + public ResponseEntity uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) { return ResponseEntity.ok(this.datasetService.uploadDatasetPipeline(datasetVersion)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index 3e031c6b..ee600097 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation; import org.springframework.core.io.InputStreamResource; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -117,7 +118,7 @@ public class ModelsController { */ @PostMapping("/upload_pipeline") @ApiOperation("从流水线上传模型,并将信息存入数据库") - public ResponseEntity uploadModelsPipeline(@RequestBody ModelsVersion modelsVersion){ + public ResponseEntity uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion){ return ResponseEntity.ok(this.modelsService.uploadModelsPipeline(modelsVersion)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java index 7649dc82..4a70baeb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2024-01-03 16:57:12 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class DatasetVersion implements Serializable { private static final long serialVersionUID = -96998451993465838L; /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 8dd03f39..376bd529 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -1,5 +1,8 @@ package com.ruoyi.platform.domain; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; + import java.util.Date; import java.io.Serializable; @@ -9,6 +12,7 @@ import java.io.Serializable; * @author Xidaray * @since 2024-01-05 09:02:42 */ +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class ModelsVersion implements Serializable { private static final long serialVersionUID = -20181111893295288L; /** 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 aa8a0a32..67d8894b 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 @@ -9,6 +9,7 @@ import com.ruoyi.platform.mapper.DatasetDao; import com.ruoyi.platform.mapper.DatasetVersionDao; import com.ruoyi.platform.service.DatasetService; import com.ruoyi.platform.service.DatasetVersionService; +import com.ruoyi.platform.utils.BeansUtils; import com.ruoyi.platform.utils.MinioUtil; import com.ruoyi.system.api.model.LoginUser; import io.minio.MinioClient; @@ -289,8 +290,7 @@ public class DatasetServiceImpl implements DatasetService { datasetVersionDao.insert(datasetVersion); }else { //改表 - BeanUtils.copyProperties(datasetVersion, version); - Date createTime = version.getCreateTime(); + BeansUtils.copyPropertiesIgnoreNull(datasetVersion, version); Date createTime = version.getCreateTime(); String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); url = "datasets/" + username + "/" + dataset.getName() + "-" + timestamp + "/" + datasetVersion.getVersion() + "/" + datasetVersion.getFileName(); version.setUrl(url); 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 a53e4bd8..cf57be7f 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 @@ -9,6 +9,7 @@ import com.ruoyi.platform.mapper.ModelsDao; import com.ruoyi.platform.mapper.ModelsVersionDao; import com.ruoyi.platform.service.ModelsService; import com.ruoyi.platform.service.ModelsVersionService; +import com.ruoyi.platform.utils.BeansUtils; import com.ruoyi.platform.utils.MinioUtil; import com.ruoyi.system.api.model.LoginUser; import io.minio.MinioClient; @@ -281,7 +282,7 @@ public class ModelsServiceImpl implements ModelsService { modelsVersionDao.insert(modelsVersion); }else { //改表 - BeanUtils.copyProperties(modelsVersion, version); + BeansUtils.copyPropertiesIgnoreNull(modelsVersion, version); Date createTime = version.getCreateTime(); String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); url = "models/" + username + "/" + models.getName() + "-" + timestamp + "/" + modelsVersion.getVersion() + "/" + modelsVersion.getFileName(); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/BeansUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/BeansUtils.java new file mode 100644 index 00000000..aa4f578f --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/BeansUtils.java @@ -0,0 +1,27 @@ +package com.ruoyi.platform.utils; + +import com.ruoyi.common.core.utils.bean.BeanUtils; +import org.springframework.beans.BeanWrapper; +import org.springframework.beans.BeanWrapperImpl; + +import java.util.HashSet; +import java.util.Set; + +public class BeansUtils { + + public static String[] getNullPropertyNames(Object source) { + final BeanWrapper src = new BeanWrapperImpl(source); + java.beans.PropertyDescriptor[] pds = src.getPropertyDescriptors(); + Set emptyNames = new HashSet(); + for(java.beans.PropertyDescriptor pd : pds) { + Object srcValue = src.getPropertyValue(pd.getName()); + if (srcValue == null) emptyNames.add(pd.getName()); + } + String[] result = new String[emptyNames.size()]; + return emptyNames.toArray(result); + } + + public static void copyPropertiesIgnoreNull(Object src, Object target){ + BeanUtils.copyProperties(src, target, getNullPropertyNames(src)); + } +} 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 5433074f..bf38bf71 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 @@ -36,11 +36,11 @@ from models_version state = 1 - - and models_id = #{modelsVersion.modelsId} + + and models_id = #{modelsId} - - and version = #{modelsVersion.version} + + and version = #{version} limit 1 From 947446d884875e861d5649f8655318d70ff03c23 Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Mon, 15 Jan 2024 16:41:44 +0800 Subject: [PATCH 20/45] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=81=A5=E5=A3=AE=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/dataset/DatasetController.java | 2 +- .../ruoyi/platform/controller/model/ModelsController.java | 2 +- .../java/com/ruoyi/platform/service/DatasetService.java | 2 +- .../java/com/ruoyi/platform/service/ModelsService.java | 2 +- .../ruoyi/platform/service/impl/DatasetServiceImpl.java | 8 ++++++-- .../ruoyi/platform/service/impl/ModelsServiceImpl.java | 8 ++++++-- .../mapper/managementPlatform/DatasetVersionDaoMapper.xml | 8 ++++---- 7 files changed, 20 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 8ddf05b1..41835e39 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -134,7 +134,7 @@ public class DatasetController { */ @PostMapping("/upload_pipeline") @ApiOperation(value = "从流水线上传数据集", notes = "并将信息存入数据库。") - public ResponseEntity uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) { + public ResponseEntity uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) throws Exception { return ResponseEntity.ok(this.datasetService.uploadDatasetPipeline(datasetVersion)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index ee600097..c672da91 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -118,7 +118,7 @@ public class ModelsController { */ @PostMapping("/upload_pipeline") @ApiOperation("从流水线上传模型,并将信息存入数据库") - public ResponseEntity uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion){ + public ResponseEntity uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { return ResponseEntity.ok(this.modelsService.uploadModelsPipeline(modelsVersion)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java index bd153109..7c34bb58 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java @@ -69,5 +69,5 @@ public interface DatasetService { String uploadDataset(MultipartFile file, Integer id) throws Exception; - String uploadDatasetPipeline(DatasetVersion datasetVersion); + String uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; } 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 cba02bfb..12f74599 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 @@ -66,5 +66,5 @@ public interface ModelsService { String uploadModels(MultipartFile file, Integer id) throws Exception; - String uploadModelsPipeline(ModelsVersion modelsVersion); + String uploadModelsPipeline(ModelsVersion modelsVersion) 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 67d8894b..e47ef09a 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 @@ -270,11 +270,15 @@ public class DatasetServiceImpl implements DatasetService { } @Override - public String uploadDatasetPipeline(DatasetVersion datasetVersion) { + public String uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception { String username = SecurityUtils.getLoginUser().getUsername(); // 检查是否存在 - DatasetVersion version = datasetVersionService.queryByDatasetVersion(datasetVersion); Dataset dataset = this.queryById(datasetVersion.getDatasetId()); + if (dataset == null) { + throw new Exception("数据集不存在，请检查数据集id"); + } + + DatasetVersion version = datasetVersionService.queryByDatasetVersion(datasetVersion); String url = ""; if (version == null) { //插表,因为这里是一次直接插表所以这里定掉date，然后用DAO插入 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 cf57be7f..01e7ab0e 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 @@ -262,11 +262,15 @@ public class ModelsServiceImpl implements ModelsService { @Override - public String uploadModelsPipeline(ModelsVersion modelsVersion) { + public String uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception { String username = SecurityUtils.getLoginUser().getUsername(); // 检查是否存在 - ModelsVersion version = modelsVersionService.queryByModelsVersion(modelsVersion); Models models = this.queryById(modelsVersion.getModelsId()); + if (models == null) { + throw new Exception("模型不存在，请检查模型id"); + } + + ModelsVersion version = modelsVersionService.queryByModelsVersion(modelsVersion); String url = ""; if (version == null) { //插表,因为这里是一次直接插表所以这里定掉date，然后用DAO插入 diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml index 634ae38a..1b5ed5be 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml @@ -40,11 +40,11 @@ from dataset_version state = 1 - - and dataset_id = #{datasetVersion.datasetId} + + and dataset_id = #{datasetId} - - and version = #{datasetVersion.version} + + and version = #{version} limit 1 From 65966c67d015a475533dde46b0b7354cef5667f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Tue, 16 Jan 2024 09:47:23 +0800 Subject: [PATCH 21/45] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9F=A5=E8=AF=A2mapper=E6=96=87=E4=BB=B6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/service/impl/DatasetServiceImpl.java | 3 ++- .../mapper/managementPlatform/DatasetVersionDaoMapper.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) 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 e47ef09a..2d8cea7d 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 @@ -294,7 +294,8 @@ public class DatasetServiceImpl implements DatasetService { datasetVersionDao.insert(datasetVersion); }else { //改表 - BeansUtils.copyPropertiesIgnoreNull(datasetVersion, version); Date createTime = version.getCreateTime(); + BeansUtils.copyPropertiesIgnoreNull(datasetVersion, version); + Date createTime = version.getCreateTime(); String timestamp = new SimpleDateFormat("yyyyMMdd-HHmmss").format(createTime); url = "datasets/" + username + "/" + dataset.getName() + "-" + timestamp + "/" + datasetVersion.getVersion() + "/" + datasetVersion.getFileName(); version.setUrl(url); diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml index 1b5ed5be..b9240f6c 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/DatasetVersionDaoMapper.xml @@ -18,7 +18,7 @@ - select id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state from dataset_version @@ -27,7 +27,7 @@ - select id,dataset_id,version,url,file_name,file_size,available_cluster,status,create_by,create_time,update_by,update_time,state from dataset_version From b123904898f0bb975aae3291683dcc6a1ef71a3d Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Wed, 17 Jan 2024 14:05:21 +0800 Subject: [PATCH 22/45] =?UTF-8?q?swgger=E6=96=87=E6=A1=A3=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/domain/Component.java | 16 ++++++++++++++++ .../platform/domain/ComputingResource.java | 17 +++++++++++++---- .../com/ruoyi/platform/domain/Dataset.java | 15 ++++++++++----- .../ruoyi/platform/domain/DatasetVersion.java | 18 +++++++++++++----- .../com/ruoyi/platform/domain/Experiment.java | 16 +++++++++------- .../ruoyi/platform/domain/ExperimentIns.java | 12 ++++++++++-- .../java/com/ruoyi/platform/domain/Models.java | 13 +++++++++---- .../ruoyi/platform/domain/ModelsVersion.java | 17 ++++++++++++----- .../com/ruoyi/platform/domain/Workflow.java | 11 +++++++---- 9 files changed, 99 insertions(+), 36 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java index f20b6ae5..baae12fb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java @@ -3,6 +3,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; @@ -23,14 +24,17 @@ public class Component implements Serializable { /** * 类别ID，数据字典配置 */ + @ApiModelProperty(name = "category_id") private Integer categoryId; /** * 组件name */ + @ApiModelProperty(name = "category_name") private String componentName; /** * 组件面板名 */ + @ApiModelProperty(name = "component_label") private String componentLabel; /** * 镜像 @@ -40,6 +44,7 @@ public class Component implements Serializable { /** * 工作目录 */ + @ApiModelProperty(name = "working_directory") private String workingDirectory; /** * 启动命令 @@ -49,26 +54,32 @@ public class Component implements Serializable { * 环境变量 */ @JsonProperty("env_variables") + @ApiModelProperty(name = "env_variables") private String envVirables; /** * 资源规格 */ + @ApiModelProperty(name = "resources_standard") private String resourcesStandard; /** * 控制策略 */ + @ApiModelProperty(name = "control_strategy") private String controlStrategy; /** * 挂载路径 */ + @ApiModelProperty(name = "mount_path") private String mountPath; /** * 输入参数 */ + @ApiModelProperty(name = "in_parameters") private String inParameters; /** * 输出参数 */ + @ApiModelProperty(name = "out_parameters") private String outParameters; /** * 描述 @@ -78,25 +89,30 @@ public class Component implements Serializable { /** * 图标路径 */ + @ApiModelProperty(name = "icon_path") private String iconPath; /** * 创建者 */ //@JsonProperty("creater") + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; /** * 更新者 */ //@JsonProperty("modify_by") + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java index 9d7cc441..1acbc4e6 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -22,6 +23,7 @@ public class ComputingResource implements Serializable { /** * 计算资源 */ + @ApiModelProperty(name = "computing_resource") private String computingResource; /** * 规格 @@ -31,21 +33,28 @@ public class ComputingResource implements Serializable { * 描述 */ private String description; -/** + /** * 创建者 */ + + //@JsonProperty("creater") + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + //@JsonProperty("modify_by") + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1， 生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java index 8af6a324..cc8eef6d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -25,23 +26,27 @@ public class Dataset implements Serializable { private String description; // private String url; - + @ApiModelProperty(name = "data_type") private Integer dataType; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java index 4a70baeb..81f069d5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -19,7 +20,7 @@ public class DatasetVersion implements Serializable { * 主键 */ private Integer id; - + @ApiModelProperty(name = "dataset_id") private Integer datasetId; /** * 版本 @@ -32,34 +33,41 @@ public class DatasetVersion implements Serializable { /** * 文件名 */ + @ApiModelProperty(name = "file_name") private String fileName; /** * 文件大小 */ + @ApiModelProperty(name = "file_size") private String fileSize; /** * 可用集群 */ + @ApiModelProperty(name = "available_cluster") private String availableCluster; /** * 状态 */ private Integer status; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0失效，1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java index 154d85fc..20c0179d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; @@ -24,35 +25,36 @@ public class Experiment extends BaseEntity implements Serializable { @TableId private Integer id; private String name; + @ApiModelProperty(name = "workflow_id") private Long workflowId; /** * 全局参数 */ + @ApiModelProperty(name = "global_param") private String globalParam; /** * 简介 */ private String description; /** - * 创建人 + * 创建者 */ - @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ - @TableField(fill = FieldFill.INSERT) + @ApiModelProperty(name = "create_time") private Date createTime; /** - * 更新人 + * 更新者 */ - - @TableField(fill = FieldFill.INSERT_UPDATE) + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ - @TableField(fill = FieldFill.INSERT_UPDATE) + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java index df586a76..6da30f60 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; @@ -20,38 +21,45 @@ public class ExperimentIns implements Serializable { /** * 实验ID */ + @ApiModelProperty(name = "experiment_id") private Integer experimentId; /** * argo返回name */ + @ApiModelProperty(name = "argo_ins_name") private String argoInsName; /** * argo返回命名空间 */ + @ApiModelProperty(name = "argo_ins_ns") private String argoInsNs; /** * 实例运行状态 */ private String status; - + @ApiModelProperty(name = "nodes_status") private String nodesStatus; - + @ApiModelProperty(name = "nodes_logs") private String nodesLogs; /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index 480a998f..78765aaf 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -27,21 +28,25 @@ public class Models implements Serializable { // private String url; private Integer modelType; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index 376bd529..ca983e12 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -2,6 +2,7 @@ package com.ruoyi.platform.domain; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; import java.util.Date; import java.io.Serializable; @@ -19,7 +20,7 @@ public class ModelsVersion implements Serializable { * 主键 */ private Integer id; - + @ApiModelProperty(name = "models_id") private Integer modelsId; /** * 版本 @@ -32,30 +33,36 @@ public class ModelsVersion implements Serializable { /** * 文件名 */ + @ApiModelProperty(name = "file_name") private String fileName; /** * 文件大小 */ + @ApiModelProperty(name = "file_size") private String fileSize; /** * 状态 */ private Integer status; -/** + /** * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; -/** + /** * 创建时间 */ + @ApiModelProperty(name = "create_time") private Date createTime; -/** + /** * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; -/** + /** * 更新时间 */ + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0失效，1生效 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java index 40098889..dfdab8dc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java @@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.PropertyNamingStrategy; import com.fasterxml.jackson.databind.annotation.JsonNaming; import com.ruoyi.platform.handler.BaseMetaObjectHandler; +import io.swagger.annotations.ApiModelProperty; import org.springframework.stereotype.Component; import javax.persistence.Table; @@ -40,22 +41,24 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable { */ private String dag; /** - * 创建人 + * 创建者 */ + @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(name = "create_time") private Date createTime; /** - * 更新人 + * 更新者 */ + @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 From 3b4b2bf11591110d51d2efec2183d85548c2269c Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Wed, 17 Jan 2024 14:15:55 +0800 Subject: [PATCH 23/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DatasetController.java | 5 +++-- .../controller/model/ModelsController.java | 5 +++-- .../com/ruoyi/platform/service/DatasetService.java | 6 ++++-- .../com/ruoyi/platform/service/ModelsService.java | 6 ++++-- .../platform/service/impl/DatasetServiceImpl.java | 14 ++++++++++---- .../platform/service/impl/ModelsServiceImpl.java | 14 ++++++++++---- 6 files changed, 34 insertions(+), 16 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 41835e39..51edc038 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.Map; /** * (Dataset)表控制层 @@ -123,7 +124,7 @@ public class DatasetController { @ApiImplicitParam(name = "file", value = "要上传的数据集文件", required = true, dataType = "file", paramType = "form"), @ApiImplicitParam(name = "dataset_version_id", value = "数据集版本表id", required = true, dataType = "integer", paramType = "path") }) - public ResponseEntity uploadDataset(@RequestParam("file") MultipartFile file, + public ResponseEntity uploadDataset(@RequestParam("file") MultipartFile file, @PathVariable("dataset_version_id") Integer dataset_version_id) throws Exception { return ResponseEntity.ok(this.datasetService.uploadDataset(file, dataset_version_id)); } @@ -134,7 +135,7 @@ public class DatasetController { */ @PostMapping("/upload_pipeline") @ApiOperation(value = "从流水线上传数据集", notes = "并将信息存入数据库。") - public ResponseEntity uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) throws Exception { + public ResponseEntity uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) throws Exception { return ResponseEntity.ok(this.datasetService.uploadDatasetPipeline(datasetVersion)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index c672da91..a25a6c2a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.Map; /** * (Models)表控制层 @@ -107,7 +108,7 @@ public class ModelsController { @PostMapping("/upload/{models_version_id}") @ApiOperation(value = "上传模型", notes = "根据模型版本表id上传模型文件，并将信息存入数据库。") - public ResponseEntity uploadModels(@RequestParam("file") MultipartFile file, @PathVariable("models_version_id") Integer models_version_id) throws Exception { + public ResponseEntity uploadModels(@RequestParam("file") MultipartFile file, @PathVariable("models_version_id") Integer models_version_id) throws Exception { return ResponseEntity.ok(this.modelsService.uploadModels(file,models_version_id)); } @@ -118,7 +119,7 @@ public class ModelsController { */ @PostMapping("/upload_pipeline") @ApiOperation("从流水线上传模型,并将信息存入数据库") - public ResponseEntity uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { + public ResponseEntity uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { return ResponseEntity.ok(this.modelsService.uploadModelsPipeline(modelsVersion)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java index 7c34bb58..085af37d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/DatasetService.java @@ -8,6 +8,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; +import java.util.Map; + /** * (Dataset)表服务接口 * @@ -67,7 +69,7 @@ public interface DatasetService { ResponseEntity downloadDataset(Integer id); - String uploadDataset(MultipartFile file, Integer id) throws Exception; + Map uploadDataset(MultipartFile file, Integer id) throws Exception; - String uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; + Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception; } 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 12f74599..d0883c35 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 @@ -10,6 +10,8 @@ import org.springframework.data.domain.PageRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.multipart.MultipartFile; +import java.util.Map; + /** * (Models)表服务接口 * @@ -64,7 +66,7 @@ public interface ModelsService { ResponseEntity downloadModels(Integer id); - String uploadModels(MultipartFile file, Integer id) throws Exception; + Map uploadModels(MultipartFile file, Integer id) throws Exception; - String uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception; + Map uploadModelsPipeline(ModelsVersion modelsVersion) 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 2d8cea7d..0b14f0e7 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 @@ -33,7 +33,9 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * (Dataset)表服务实现类 @@ -215,7 +217,7 @@ public class DatasetServiceImpl implements DatasetService { * @return 是否成功 */ @Override - public String uploadDataset(MultipartFile file, Integer id) throws Exception { + public Map uploadDataset(MultipartFile file, Integer id) throws Exception { if (file.isEmpty()) { throw new Exception("文件为空，无法上传"); } @@ -263,14 +265,16 @@ public class DatasetServiceImpl implements DatasetService { datasetVersionToUse.setFileName(fileName); datasetVersionToUse.setFileSize(String.valueOf(sizeInKB)); datasetVersionDao.update(datasetVersionToUse); - return "数据集成功上传到: " + objectName; } catch (Exception e) { throw new Exception("上传到数据集失败: " + e.getMessage(), e); } + Map result = new HashMap(); + result.put("url",objectName); + return result; } @Override - public String uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception { + public Map uploadDatasetPipeline(DatasetVersion datasetVersion) throws Exception { String username = SecurityUtils.getLoginUser().getUsername(); // 检查是否存在 Dataset dataset = this.queryById(datasetVersion.getDatasetId()); @@ -301,7 +305,9 @@ public class DatasetServiceImpl implements DatasetService { version.setUrl(url); datasetVersionService.update(version); } - return "数据集成功上传到: " + url; + Map result = new HashMap(); + result.put("url",url); + return result; } 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 01e7ab0e..f42282f8 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 @@ -33,6 +33,8 @@ import java.io.ByteArrayOutputStream; import java.io.InputStream; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; +import java.util.Map; /** * (Models)表服务实现类 @@ -206,7 +208,7 @@ public class ModelsServiceImpl implements ModelsService { * @return 是否成功 */ @Override - public String uploadModels(MultipartFile file, Integer id) throws Exception { + public Map uploadModels(MultipartFile file, Integer id) throws Exception { if (file.isEmpty()) { throw new Exception("文件为空，无法上传"); } @@ -254,15 +256,17 @@ public class ModelsServiceImpl implements ModelsService { modelsVersionToUse.setFileName(fileName); modelsVersionToUse.setFileSize(String.valueOf(sizeInKB)); modelsVersionDao.update(modelsVersionToUse); - return "模型成功上传到: " + objectName; } catch (Exception e) { throw new Exception("上传到模型失败: " + e.getMessage(), e); } + Map result = new HashMap(); + result.put("url",objectName); + return result; } @Override - public String uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception { + public Map uploadModelsPipeline(ModelsVersion modelsVersion) throws Exception { String username = SecurityUtils.getLoginUser().getUsername(); // 检查是否存在 Models models = this.queryById(modelsVersion.getModelsId()); @@ -293,7 +297,9 @@ public class ModelsServiceImpl implements ModelsService { version.setUrl(url); modelsVersionService.update(version); } - return "模型成功上传到: " + url; + Map result = new HashMap(); + result.put("url",url); + return result; } private String extractFileName(String urlStr) { From 5ca889bd82ca0c73949302d33a3fbe909bdf8f08 Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Wed, 17 Jan 2024 15:05:24 +0800 Subject: [PATCH 24/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/ComponentController.java | 33 +++++++------- .../controller/dataset/DatasetController.java | 43 +++++++++--------- .../dataset/DatasetVersionController.java | 27 ++++++------ .../experiment/ExperimentController.java | 44 +++++++++---------- .../experiment/ExperimentInsController.java | 31 +++++++------ .../controller/model/ModelsController.java | 44 +++++++++---------- .../model/ModelsVersionController.java | 21 ++++----- .../ComputingResourceController.java | 27 ++++++------ .../workflow/WorkflowController.java | 33 +++++++------- .../impl/ExperimentInsServiceImpl.java | 16 ++++--- 10 files changed, 154 insertions(+), 165 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java index 7b2cfa1e..eee2cb66 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/component/ComponentController.java @@ -1,18 +1,15 @@ package com.ruoyi.platform.controller.component; -import com.ruoyi.platform.domain.*; -import com.ruoyi.platform.service.*; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.Component; +import com.ruoyi.platform.service.ComponentService; import com.ruoyi.platform.vo.ComponentVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.List; -import java.util.Map; /** * (Component)表控制层 @@ -38,9 +35,9 @@ public class ComponentController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage( Component component, int page, int size) { + public AjaxResult queryByPage( Component component, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.componentService.queryByPage(component, pageRequest)); + return AjaxResult.success(this.componentService.queryByPage(component, pageRequest)); } @@ -53,8 +50,8 @@ public class ComponentController { */ @GetMapping("/components/all") @ApiOperation("查询全部") - public ResponseEntity queryAll() throws Exception { - return ResponseEntity.ok(this.componentService.queryAllGroupedByCategory()); + public AjaxResult queryAll() throws Exception { + return AjaxResult.success(this.componentService.queryAllGroupedByCategory()); } @@ -67,8 +64,8 @@ public class ComponentController { */ @GetMapping("{id}") @ApiOperation("根据id查询") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.componentService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.componentService.queryById(id)); } /** @@ -79,8 +76,8 @@ public class ComponentController { */ @PostMapping @ApiOperation("添加组件") - public ResponseEntity add(@RequestBody ComponentVo component) { - return ResponseEntity.ok(this.componentService.insert(component)); + public AjaxResult add(@RequestBody ComponentVo component) { + return AjaxResult.success(this.componentService.insert(component)); } /** @@ -91,8 +88,8 @@ public class ComponentController { */ @PutMapping @ApiOperation("编辑组件") - public ResponseEntity edit(@RequestBody ComponentVo component) { - return ResponseEntity.ok(this.componentService.update(component)); + public AjaxResult edit(@RequestBody ComponentVo component) { + return AjaxResult.success(this.componentService.update(component)); } /** @@ -103,8 +100,8 @@ public class ComponentController { */ @DeleteMapping("{id}") @ApiOperation("根据id删除组件") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.componentService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.componentService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java index 51edc038..1bba562b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetController.java @@ -1,20 +1,19 @@ package com.ruoyi.platform.controller.dataset; -import com.ruoyi.platform.domain.*; -import com.ruoyi.platform.service.*; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.Dataset; +import com.ruoyi.platform.domain.DatasetVersion; +import com.ruoyi.platform.service.DatasetService; +import com.ruoyi.platform.service.DatasetVersionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.springframework.core.io.InputStreamResource; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.Map; /** * (Dataset)表控制层 @@ -45,9 +44,9 @@ public class DatasetController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(Dataset dataset, int page,int size) { + public AjaxResult queryByPage(Dataset dataset, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.datasetService.queryByPage(dataset, pageRequest)); + return AjaxResult.success(this.datasetService.queryByPage(dataset, pageRequest)); } /** @@ -58,8 +57,8 @@ public class DatasetController { */ @GetMapping("{id}") @ApiOperation("根据id查询数据集") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.datasetService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.datasetService.queryById(id)); } /** @@ -70,8 +69,8 @@ public class DatasetController { */ @PostMapping @ApiOperation("添加数据集") - public ResponseEntity add(@RequestBody Dataset dataset) { - return ResponseEntity.ok(this.datasetService.insert(dataset)); + public AjaxResult add(@RequestBody Dataset dataset) { + return AjaxResult.success(this.datasetService.insert(dataset)); } @@ -83,8 +82,8 @@ public class DatasetController { */ @PutMapping @ApiOperation("编辑数据集") - public ResponseEntity edit(@RequestBody Dataset dataset) { - return ResponseEntity.ok(this.datasetService.update(dataset)); + public AjaxResult edit(@RequestBody Dataset dataset) { + return AjaxResult.success(this.datasetService.update(dataset)); } /** @@ -95,8 +94,8 @@ public class DatasetController { */ @DeleteMapping({"{id}"}) @ApiOperation("删除数据集") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.datasetService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.datasetService.removeById(id)); } /** @@ -107,8 +106,8 @@ public class DatasetController { */ @GetMapping("/download/{dataset_version_id}") @ApiOperation(value = "下载数据集", notes = "根据数据集版本表id下载数据集文件") - public ResponseEntity downloadDataset(@PathVariable("dataset_version_id") Integer dataset_version_id) { - return datasetService.downloadDataset(dataset_version_id); + public AjaxResult downloadDataset(@PathVariable("dataset_version_id") Integer dataset_version_id) { + return AjaxResult.success(datasetService.downloadDataset(dataset_version_id)); } /** @@ -124,9 +123,9 @@ public class DatasetController { @ApiImplicitParam(name = "file", value = "要上传的数据集文件", required = true, dataType = "file", paramType = "form"), @ApiImplicitParam(name = "dataset_version_id", value = "数据集版本表id", required = true, dataType = "integer", paramType = "path") }) - public ResponseEntity uploadDataset(@RequestParam("file") MultipartFile file, + public AjaxResult uploadDataset(@RequestParam("file") MultipartFile file, @PathVariable("dataset_version_id") Integer dataset_version_id) throws Exception { - return ResponseEntity.ok(this.datasetService.uploadDataset(file, dataset_version_id)); + return AjaxResult.success(this.datasetService.uploadDataset(file, dataset_version_id)); } /** @@ -135,8 +134,8 @@ public class DatasetController { */ @PostMapping("/upload_pipeline") @ApiOperation(value = "从流水线上传数据集", notes = "并将信息存入数据库。") - public ResponseEntity uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) throws Exception { - return ResponseEntity.ok(this.datasetService.uploadDatasetPipeline(datasetVersion)); + public AjaxResult uploadDatasetPipeline(@RequestBody(required =false) DatasetVersion datasetVersion) throws Exception { + return AjaxResult.success(this.datasetService.uploadDatasetPipeline(datasetVersion)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java index 82f9a492..685d214b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/dataset/DatasetVersionController.java @@ -1,11 +1,10 @@ package com.ruoyi.platform.controller.dataset; -import com.ruoyi.platform.domain.*; -import com.ruoyi.platform.service.*; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.DatasetVersion; +import com.ruoyi.platform.service.DatasetVersionService; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,9 +35,9 @@ public class DatasetVersionController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(DatasetVersion datasetVersion, int page,int size) { + public AjaxResult queryByPage(DatasetVersion datasetVersion, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.datasetVersionService.queryByPage(datasetVersion, pageRequest)); + return AjaxResult.success(this.datasetVersionService.queryByPage(datasetVersion, pageRequest)); } @@ -50,8 +49,8 @@ public class DatasetVersionController { */ @GetMapping("{id}") @ApiOperation("根据id查询数据集版本") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.datasetVersionService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.datasetVersionService.queryById(id)); } /** @@ -62,8 +61,8 @@ public class DatasetVersionController { */ @PostMapping @ApiOperation("添加数据集版本") - public ResponseEntity add(@RequestBody DatasetVersion datasetVersion) { - return ResponseEntity.ok(this.datasetVersionService.insert(datasetVersion)); + public AjaxResult add(@RequestBody DatasetVersion datasetVersion) { + return AjaxResult.success(this.datasetVersionService.insert(datasetVersion)); } /** @@ -74,8 +73,8 @@ public class DatasetVersionController { */ @PutMapping @ApiOperation("编辑数据集版本") - public ResponseEntity edit(@RequestBody DatasetVersion datasetVersion) { - return ResponseEntity.ok(this.datasetVersionService.update(datasetVersion)); + public AjaxResult edit(@RequestBody DatasetVersion datasetVersion) { + return AjaxResult.success(this.datasetVersionService.update(datasetVersion)); } /** @@ -86,8 +85,8 @@ public class DatasetVersionController { */ @DeleteMapping({"{id}"}) @ApiOperation("删除数据集版本") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.datasetVersionService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.datasetVersionService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java index c5d097a6..1bbe9ac9 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java @@ -1,14 +1,12 @@ package com.ruoyi.platform.controller.experiment; -import com.ruoyi.platform.domain.*; -import com.ruoyi.platform.service.*; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.Experiment; +import com.ruoyi.platform.service.ExperimentService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import io.swagger.models.auth.In; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -37,22 +35,22 @@ public class ExperimentController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(Experiment experiment, int page,int size) { + public AjaxResult queryByPage(Experiment experiment, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.experimentService.queryByPage(experiment, pageRequest)); + return AjaxResult.success(this.experimentService.queryByPage(experiment, pageRequest)); } @GetMapping(("/status")) @ApiOperation("查询实验状态") - public Page selectStatus(@RequestBody Experiment experiment, PageRequest pageRequest){ - return this.experimentService.selectStatus(experiment, pageRequest); + public AjaxResult selectStatus(@RequestBody Experiment experiment, PageRequest pageRequest){ + return AjaxResult.success(this.experimentService.selectStatus(experiment, pageRequest)); } @GetMapping(("/configuration")) - public ResponseEntity showExperimentConfig(@RequestBody Experiment experiment){ - return this.experimentService.showExperimentConfig(experiment); + public AjaxResult showExperimentConfig(@RequestBody Experiment experiment){ + return AjaxResult.success(this.experimentService.showExperimentConfig(experiment)); } /** @@ -63,8 +61,8 @@ public class ExperimentController { */ @GetMapping("{id}") @ApiOperation("通过id查询实验") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.experimentService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.experimentService.queryById(id)); } /** @@ -75,8 +73,8 @@ public class ExperimentController { */ @PostMapping @ApiOperation("新增实验") - public ResponseEntity add(@RequestBody Experiment experiment) { - return ResponseEntity.ok(this.experimentService.insert(experiment)); + public AjaxResult add(@RequestBody Experiment experiment) { + return AjaxResult.success(this.experimentService.insert(experiment)); } /** @@ -87,8 +85,8 @@ public class ExperimentController { */ @PutMapping @ApiOperation("编辑实验") - public ResponseEntity edit(@RequestBody Experiment experiment) { - return ResponseEntity.ok(this.experimentService.update(experiment)); + public AjaxResult edit(@RequestBody Experiment experiment) { + return AjaxResult.success(this.experimentService.update(experiment)); } /** @@ -99,8 +97,8 @@ public class ExperimentController { */ @DeleteMapping("{id}") @ApiOperation("删除流水线") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.experimentService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.experimentService.removeById(id)); } @@ -115,8 +113,8 @@ public class ExperimentController { */ @PutMapping("/experiments/{id}") @ApiOperation("运行实验") - public ResponseEntity runExperiment(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.experimentService.runExperiment(id)); + public AjaxResult runExperiment(@PathVariable("id") Integer id) { + return AjaxResult.success(this.experimentService.runExperiment(id)); } /** @@ -127,8 +125,8 @@ public class ExperimentController { */ @PostMapping("/addAndRunExperiment") @ApiOperation("实验创建页面确定并运行") - public ResponseEntity addAndRunExperiment(@RequestBody Experiment experiment) { - return ResponseEntity.ok(this.experimentService.addAndRunExperiment(experiment)); + public AjaxResult addAndRunExperiment(@RequestBody Experiment experiment) { + return AjaxResult.success(this.experimentService.addAndRunExperiment(experiment)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java index 609e7685..e3df2ee1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java @@ -1,12 +1,11 @@ package com.ruoyi.platform.controller.experiment; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.service.ExperimentInsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,9 +34,9 @@ public class ExperimentInsController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(ExperimentIns experimentIns, int page, int size) { + public AjaxResult queryByPage(ExperimentIns experimentIns, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.experimentInsService.queryByPage(experimentIns, pageRequest)); + return AjaxResult.success(this.experimentInsService.queryByPage(experimentIns, pageRequest)); } /** @@ -48,8 +47,8 @@ public class ExperimentInsController { */ @GetMapping("{id}") @ApiOperation("通过id查询实验实例") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.experimentInsService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.experimentInsService.queryById(id)); } @@ -62,8 +61,8 @@ public class ExperimentInsController { */ @PostMapping @ApiOperation("新增实验实例") - public ResponseEntity add(@RequestBody ExperimentIns experimentIns) { - return ResponseEntity.ok(this.experimentInsService.insert(experimentIns)); + public AjaxResult add(@RequestBody ExperimentIns experimentIns) { + return AjaxResult.success(this.experimentInsService.insert(experimentIns)); } /** @@ -74,8 +73,8 @@ public class ExperimentInsController { */ @PutMapping @ApiOperation("编辑实验实例") - public ResponseEntity edit(@RequestBody ExperimentIns experimentIns) { - return ResponseEntity.ok(this.experimentInsService.update(experimentIns)); + public AjaxResult edit(@RequestBody ExperimentIns experimentIns) { + return AjaxResult.success(this.experimentInsService.update(experimentIns)); } /** @@ -86,8 +85,8 @@ public class ExperimentInsController { */ @DeleteMapping("{id}") @ApiOperation("删除实验实例") - public ResponseEntity deleteById( @PathVariable("id") Integer id) { - return ResponseEntity.ok(this.experimentInsService.removeById(id)); + public AjaxResult deleteById( @PathVariable("id") Integer id) { + return AjaxResult.success(this.experimentInsService.removeById(id)); } /** @@ -98,8 +97,8 @@ public class ExperimentInsController { */ @PutMapping("{id}") @ApiOperation("终止实验实例") - public boolean terminateExperimentIns(@PathVariable("id") Integer id) { - return this.experimentInsService.terminateExperimentIns(id); + public AjaxResult terminateExperimentIns(@PathVariable("id") Integer id) { + return AjaxResult.success(this.experimentInsService.terminateExperimentIns(id)); } /** @@ -110,8 +109,8 @@ public class ExperimentInsController { */ @GetMapping(("/log/{id}")) - public String showExperimentInsLog(@PathVariable("id") Integer id){ - return this.experimentInsService.showExperimentInsLog(id); + public AjaxResult showExperimentInsLog(@PathVariable("id") Integer id){ + return AjaxResult.success(this.experimentInsService.showExperimentInsLog(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java index a25a6c2a..01a77555 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/model/ModelsController.java @@ -1,21 +1,17 @@ package com.ruoyi.platform.controller.model; - -import com.ruoyi.platform.domain.*; -import com.ruoyi.platform.service.*; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.Models; +import com.ruoyi.platform.domain.ModelsVersion; +import com.ruoyi.platform.service.ModelsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.core.io.InputStreamResource; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; -import java.util.Map; /** * (Models)表控制层 @@ -43,9 +39,9 @@ public class ModelsController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(Models models, int page, int size) { + public AjaxResult queryByPage(Models models, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.modelsService.queryByPage(models, pageRequest)); + return AjaxResult.success(this.modelsService.queryByPage(models, pageRequest)); } /** @@ -56,8 +52,8 @@ public class ModelsController { */ @GetMapping("{id}") @ApiOperation("根据id查询") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.modelsService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.modelsService.queryById(id)); } /** @@ -68,8 +64,8 @@ public class ModelsController { */ @PostMapping @ApiOperation("添加模型") - public ResponseEntity add(@RequestBody Models models) { - return ResponseEntity.ok(this.modelsService.insert(models)); + public AjaxResult add(@RequestBody Models models) { + return AjaxResult.success(this.modelsService.insert(models)); } /** @@ -80,8 +76,8 @@ public class ModelsController { */ @PutMapping @ApiOperation("编辑模型") - public ResponseEntity edit(@RequestBody Models models) { - return ResponseEntity.ok(this.modelsService.update(models)); + public AjaxResult edit(@RequestBody Models models) { + return AjaxResult.success(this.modelsService.update(models)); } /** @@ -92,8 +88,8 @@ public class ModelsController { */ @DeleteMapping("{id}") @ApiOperation("删除模型") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.modelsService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.modelsService.removeById(id)); } /** @@ -108,8 +104,8 @@ public class ModelsController { @PostMapping("/upload/{models_version_id}") @ApiOperation(value = "上传模型", notes = "根据模型版本表id上传模型文件，并将信息存入数据库。") - public ResponseEntity uploadModels(@RequestParam("file") MultipartFile file, @PathVariable("models_version_id") Integer models_version_id) throws Exception { - return ResponseEntity.ok(this.modelsService.uploadModels(file,models_version_id)); + public AjaxResult uploadModels(@RequestParam("file") MultipartFile file, @PathVariable("models_version_id") Integer models_version_id) throws Exception { + return AjaxResult.success(this.modelsService.uploadModels(file,models_version_id)); } @@ -119,8 +115,8 @@ public class ModelsController { */ @PostMapping("/upload_pipeline") @ApiOperation("从流水线上传模型,并将信息存入数据库") - public ResponseEntity uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { - return ResponseEntity.ok(this.modelsService.uploadModelsPipeline(modelsVersion)); + public AjaxResult uploadModelsPipeline(@RequestBody(required =false) ModelsVersion modelsVersion) throws Exception { + return AjaxResult.success(this.modelsService.uploadModelsPipeline(modelsVersion)); } /** @@ -131,8 +127,8 @@ public class ModelsController { */ @GetMapping("/download/{models_version_id}") @ApiOperation(value = "下载模型", notes = "根据模型版本表id下载模型文件。") - public ResponseEntity downloadModels(@PathVariable("models_version_id") Integer models_version_id) { - return modelsService.downloadModels(models_version_id); + public AjaxResult downloadModels(@PathVariable("models_version_id") Integer models_version_id) { + return AjaxResult.success(modelsService.downloadModels(models_version_id)); } } 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 801146f3..4034afcb 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 @@ -1,5 +1,6 @@ package com.ruoyi.platform.controller.model; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.platform.domain.*; import com.ruoyi.platform.service.*; import io.swagger.annotations.ApiOperation; @@ -35,9 +36,9 @@ public class ModelsVersionController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(ModelsVersion modelsVersion, int page, int size) { + public AjaxResult queryByPage(ModelsVersion modelsVersion, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.modelsVersionService.queryByPage(modelsVersion, pageRequest)); + return AjaxResult.success(this.modelsVersionService.queryByPage(modelsVersion, pageRequest)); } /** @@ -47,8 +48,8 @@ public class ModelsVersionController { * @return 单条数据 */ @GetMapping("{id}") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.modelsVersionService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.modelsVersionService.queryById(id)); } /** @@ -58,8 +59,8 @@ public class ModelsVersionController { * @return 新增结果 */ @PostMapping - public ResponseEntity add(@RequestBody ModelsVersion modelsVersion) { - return ResponseEntity.ok(this.modelsVersionService.insert(modelsVersion)); + public AjaxResult add(@RequestBody ModelsVersion modelsVersion) { + return AjaxResult.success(this.modelsVersionService.insert(modelsVersion)); } /** @@ -69,8 +70,8 @@ public class ModelsVersionController { * @return 编辑结果 */ @PutMapping - public ResponseEntity edit(@RequestBody ModelsVersion modelsVersion) { - return ResponseEntity.ok(this.modelsVersionService.update(modelsVersion)); + public AjaxResult edit(@RequestBody ModelsVersion modelsVersion) { + return AjaxResult.success(this.modelsVersionService.update(modelsVersion)); } /** @@ -80,8 +81,8 @@ public class ModelsVersionController { * @return 删除是否成功 */ @DeleteMapping("{id}") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.modelsVersionService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.modelsVersionService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java index 53289a1b..f2a178fc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/resources/ComputingResourceController.java @@ -1,12 +1,11 @@ package com.ruoyi.platform.controller.resources; -import com.ruoyi.platform.domain.*; -import com.ruoyi.platform.service.*; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.platform.domain.ComputingResource; +import com.ruoyi.platform.service.ComputingResourceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -35,9 +34,9 @@ public class ComputingResourceController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(ComputingResource computingResource, int page, int size) { + public AjaxResult queryByPage(ComputingResource computingResource, int page, int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.computingResourceService.queryByPage(computingResource, pageRequest)); + return AjaxResult.success(this.computingResourceService.queryByPage(computingResource, pageRequest)); } /** @@ -48,8 +47,8 @@ public class ComputingResourceController { */ @GetMapping("{id}") @ApiOperation("根据id查询") - public ResponseEntity queryById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.computingResourceService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.computingResourceService.queryById(id)); } /** @@ -60,8 +59,8 @@ public class ComputingResourceController { */ @PostMapping @ApiOperation("新增计算资源") - public ResponseEntity add(@RequestBody ComputingResource computingResource) { - return ResponseEntity.ok(this.computingResourceService.insert(computingResource)); + public AjaxResult add(@RequestBody ComputingResource computingResource) { + return AjaxResult.success(this.computingResourceService.insert(computingResource)); } /** @@ -72,8 +71,8 @@ public class ComputingResourceController { */ @PutMapping @ApiOperation("编辑计算资源") - public ResponseEntity edit(@RequestBody ComputingResource computingResource) { - return ResponseEntity.ok(this.computingResourceService.update(computingResource)); + public AjaxResult edit(@RequestBody ComputingResource computingResource) { + return AjaxResult.success(this.computingResourceService.update(computingResource)); } /** @@ -84,8 +83,8 @@ public class ComputingResourceController { */ @DeleteMapping("{id}") @ApiOperation("删除计算资源") - public ResponseEntity deleteById(@PathVariable("id") Integer id) { - return ResponseEntity.ok(this.computingResourceService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.computingResourceService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java index 0d731153..4a4bb1e3 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workflow/WorkflowController.java @@ -1,12 +1,11 @@ package com.ruoyi.platform.controller.workflow; +import com.ruoyi.common.core.web.domain.AjaxResult; import com.ruoyi.platform.domain.Workflow; import com.ruoyi.platform.service.WorkflowService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -40,9 +39,9 @@ public class WorkflowController { */ @GetMapping @ApiOperation("分页查询") - public ResponseEntity> queryByPage(Workflow workflow, int page,int size) { + public AjaxResult queryByPage(Workflow workflow, int page,int size) { PageRequest pageRequest = PageRequest.of(page,size); - return ResponseEntity.ok(this.workflowService.queryByPage(workflow, pageRequest)); + return AjaxResult.success(this.workflowService.queryByPage(workflow, pageRequest)); } @@ -54,8 +53,8 @@ public class WorkflowController { */ @GetMapping("name/{name}") @ApiOperation("按流水线名字模糊查询流水线") - public ResponseEntity> queryByName(@PathVariable("name") String name) { - return ResponseEntity.ok(this.workflowService.queryByName(name)); + public AjaxResult queryByName(@PathVariable("name") String name) { + return AjaxResult.success(this.workflowService.queryByName(name)); } /** @@ -66,8 +65,8 @@ public class WorkflowController { */ @GetMapping("{id}") @ApiOperation("根据id查询单条数据") - public ResponseEntity queryById(@PathVariable("id") Long id) { - return ResponseEntity.ok(this.workflowService.queryById(id)); + public AjaxResult queryById(@PathVariable("id") Long id) { + return AjaxResult.success(this.workflowService.queryById(id)); } /** @@ -78,8 +77,8 @@ public class WorkflowController { */ @PostMapping @ApiOperation("新增") - public ResponseEntity add(@RequestBody Workflow workflow) { - return ResponseEntity.ok(this.workflowService.insert(workflow)); + public AjaxResult add(@RequestBody Workflow workflow) { + return AjaxResult.success(this.workflowService.insert(workflow)); } @@ -91,8 +90,8 @@ public class WorkflowController { */ @ApiOperation("复制流水线记录") @PostMapping("duplicate/{id}") - public ResponseEntity duplicateWorkflow(@PathVariable("id") Long id) { - return ResponseEntity.ok(this.workflowService.duplicateWorkflow(id)); + public AjaxResult duplicateWorkflow(@PathVariable("id") Long id) { + return AjaxResult.success(this.workflowService.duplicateWorkflow(id)); } /** @@ -103,7 +102,7 @@ public class WorkflowController { // @ApiOperation("流水线保存") // @PutMapping("/saveWorkflow/{id}") // public ResponseEntity saveWorkflow(@PathVariable("id") Long id) { -// return ResponseEntity.ok(this.workflowService.saveWorkflow(id)); +// return AjaxResult.success(this.workflowService.saveWorkflow(id)); // } @@ -115,8 +114,8 @@ public class WorkflowController { */ @PutMapping @ApiOperation("编辑流水线") - public ResponseEntity edit(@RequestBody Workflow workflow) { - return ResponseEntity.ok(this.workflowService.update(workflow)); + public AjaxResult edit(@RequestBody Workflow workflow) { + return AjaxResult.success(this.workflowService.update(workflow)); } /** @@ -130,8 +129,8 @@ public class WorkflowController { */ @DeleteMapping("{id}") @ApiOperation("删除流水线") - public ResponseEntity deleteById(@PathVariable("id") Long id) { - return ResponseEntity.ok(this.workflowService.removeById(id)); + public AjaxResult deleteById(@PathVariable("id") Long id) { + return AjaxResult.success(this.workflowService.removeById(id)); } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index ec2a041d..74c4aa3d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -114,13 +114,15 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { public Page queryByPage(ExperimentIns experimentIns, PageRequest pageRequest) { long total = this.experimentInsDao.count(experimentIns); List experimentInsList = this.experimentInsDao.queryAllByLimit(experimentIns, pageRequest); - for (ExperimentIns ins: experimentInsList) { - //如果实验实例不为空或者 - if (experimentIns!=null && StringUtils.isEmpty(experimentIns.getStatus())) { - Integer experimentInsId = experimentIns.getId(); - String status = this.queryStatusFromArgo(ins.getArgoInsNs(), ins.getArgoInsName(), experimentInsId ); - ins.setStatus(status); - this.update(experimentIns); + if (experimentInsList!=null && experimentInsList.size()>0) { + for (ExperimentIns ins : experimentInsList) { + //如果实验实例不为空或者 + if (ins != null && StringUtils.isEmpty(ins.getStatus())) { + Integer experimentInsId = ins.getId(); + String status = this.queryStatusFromArgo(ins.getArgoInsNs(), ins.getArgoInsName(), experimentInsId); + ins.setStatus(status); + this.update(ins); + } } } return new PageImpl<>(experimentInsList, pageRequest, total); From 6ccdb11fbe4bc93208dc86a26afe023d929ef33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Wed, 17 Jan 2024 15:20:20 +0800 Subject: [PATCH 25/45] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E3=80=81=E7=BB=93=E6=9D=9F?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../experiment/ExperimentController.java | 5 ++-- .../experiment/ExperimentInsController.java | 1 + .../ruoyi/platform/domain/ExperimentIns.java | 27 +++++++++++++++++++ .../platform/mapper/DatasetVersionDao.java | 4 +++ .../platform/mapper/ExperimentInsDao.java | 4 +-- .../service/ExperimentInsService.java | 1 + .../platform/service/ExperimentService.java | 2 +- .../impl/ExperimentInsServiceImpl.java | 3 +-- .../service/impl/ExperimentServiceImpl.java | 26 +++++++++++++++--- .../ExperimentInsDaoMapper.xml | 6 ++--- 10 files changed, 64 insertions(+), 15 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java index c5d097a6..8eac37d7 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java @@ -44,7 +44,8 @@ public class ExperimentController { @GetMapping(("/status")) @ApiOperation("查询实验状态") - public Page selectStatus(@RequestBody Experiment experiment, PageRequest pageRequest){ + public Page selectStatus(Experiment experiment, int page,int size){ + PageRequest pageRequest = PageRequest.of(page,size); return this.experimentService.selectStatus(experiment, pageRequest); } @@ -115,7 +116,7 @@ public class ExperimentController { */ @PutMapping("/experiments/{id}") @ApiOperation("运行实验") - public ResponseEntity runExperiment(@PathVariable("id") Integer id) { + public ResponseEntity runExperiment(@PathVariable("id") Integer id) throws Exception { return ResponseEntity.ok(this.experimentService.runExperiment(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java index 609e7685..3b486ae4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentInsController.java @@ -100,6 +100,7 @@ public class ExperimentInsController { @ApiOperation("终止实验实例") public boolean terminateExperimentIns(@PathVariable("id") Integer id) { return this.experimentInsService.terminateExperimentIns(id); + } /** diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java index 6da30f60..e9ccb8ac 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java @@ -41,6 +41,20 @@ public class ExperimentIns implements Serializable { private String nodesStatus; @ApiModelProperty(name = "nodes_logs") private String nodesLogs; + + /** + * 开始时间 + */ + @ApiModelProperty(name = "start_time") + private Date startTime; + + /** + * 结束时间 + */ + @ApiModelProperty(name = "finish_time") + private Date finishTime; + + /** * 创建者 */ @@ -127,6 +141,19 @@ public class ExperimentIns implements Serializable { this.nodesLogs = nodesLogs; } + public void setStartTime(Date startTime) { + this.startTime = startTime; + } + + public Date getStartTime() {return startTime;} + + public void setFinishTime(Date finishTime) { + this.finishTime = finishTime; + } + + public Date getFinishTime() {return finishTime;} + + public String getCreateBy() { return createBy; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java index cd03cf26..56c4751d 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/DatasetVersionDao.java @@ -55,6 +55,8 @@ public interface DatasetVersionDao { */ int insertBatch(@Param("entities") List entities); + + /** * 批量新增或按主键更新数据（MyBatis原生foreach方法） * @@ -83,5 +85,7 @@ public interface DatasetVersionDao { List queryByDatasetId(Integer datasetId); DatasetVersion queryByDatasetVersion(DatasetVersion datasetVersion); + + } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java index 063a1a87..a8169bbc 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java @@ -37,7 +37,7 @@ public interface ExperimentInsDao { * @param experimentIns 查询条件 * @return 总行数 */ - long count(@Param("experimentIns")ExperimentIns experimentIns); + long count(@Param("experimentIns") ExperimentIns experimentIns); /** * 新增数据 @@ -45,7 +45,7 @@ public interface ExperimentInsDao { * @param experimentIns 实例对象 * @return 影响行数 */ - int insert(ExperimentIns experimentIns); + int insert(@Param("experimentIns") ExperimentIns experimentIns); /** * 批量新增数据（MyBatis原生foreach方法） diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java index 821c7e89..e86fa575 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentInsService.java @@ -68,6 +68,7 @@ public interface ExperimentInsService { */ boolean deleteById(Integer id); + List queryByExperimentId(Integer id); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java index 7e112e59..9e3b8a63 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ExperimentService.java @@ -56,7 +56,7 @@ public interface ExperimentService { */ boolean deleteById(Integer id); String removeById(Integer id); - Experiment runExperiment(Integer id); + Experiment runExperiment(Integer id) throws Exception; Experiment addAndRunExperiment(Experiment experiment); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index ec2a041d..17836896 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -301,9 +301,8 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { // 检查响应是否为空或无内容 if (StringUtils.isEmpty(req)) { throw new RuntimeException("终止响应内容为空。"); - } - + } // 将响应的JSON字符串转换为Map对象 Map runResMap = JsonUtils.jsonToMap(req); // 从响应Map中直接获取"errCode"的值 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 644f206c..bb2344d5 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 @@ -5,6 +5,7 @@ import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.domain.Workflow; import com.ruoyi.platform.mapper.ExperimentDao; +import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.service.ExperimentInsService; import com.ruoyi.platform.service.ExperimentService; import com.ruoyi.platform.service.WorkflowService; @@ -35,6 +36,11 @@ public class ExperimentServiceImpl implements ExperimentService { @Resource private ExperimentDao experimentDao; + @Resource + private ExperimentInsDao experimentInsDao; + + + @Resource @Lazy private WorkflowService workflowService; @@ -192,7 +198,7 @@ public class ExperimentServiceImpl implements ExperimentService { * @return 是否成功 */ @Override - public Experiment runExperiment(Integer id) { + public Experiment runExperiment(Integer id) throws Exception { //先查出实验记录 Experiment experiment = this.queryById(id); @@ -200,13 +206,18 @@ public class ExperimentServiceImpl implements ExperimentService { System.out.println("No experiment"); } + Workflow workflow = workflowService.queryById(experiment.getWorkflowId()); + if(workflow == null) { + throw new RuntimeException("流水线不存在，请先创建流水线"); + } + String dag = workflow.getDag(); // 调argo转换接口 try { String convertRes = HttpUtils.sendPost(argoUrl + argoConvert, dag); if (convertRes == null || StringUtils.isEmpty(convertRes)) { - throw new RuntimeException("Failed to convert workflow."); + throw new RuntimeException("转换流水线失败"); } Map converMap = JsonUtils.jsonToMap(convertRes); // 组装运行接口json @@ -234,13 +245,16 @@ public class ExperimentServiceImpl implements ExperimentService { experimentIns.setArgoInsNs((String) metadata.get("namespace")); experimentIns.setArgoInsName((String) metadata.get("name")); //插入ExperimentIns表中 - experimentInsService.insert(experimentIns); + experimentInsDao.insert(experimentIns); }catch (Exception e){ throw new RuntimeException(e); } List experimentIns = experimentInsService.queryByExperimentId(id); + + experiment.setExperimentInsList(experimentIns); + return experiment; } @@ -253,7 +267,11 @@ public class ExperimentServiceImpl implements ExperimentService { throw new RuntimeException("Failed to add experiment."); } // 调用runExperiment方法运行实验 - newExperiment = this.runExperiment(newExperiment.getId()); + try { + newExperiment = this.runExperiment(newExperiment.getId()); + } catch (Exception e) { + throw new RuntimeException(e); + } return newExperiment; } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml index 8b522836..dcbc102b 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml @@ -19,8 +19,6 @@ - - - select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state + select id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, start_time, finish_time, create_by, create_time, update_by, update_time, state from experiment_ins where id = #{id} and state = 1 select - id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, create_by, create_time, update_by, update_time, state + id, experiment_id, argo_ins_name, argo_ins_ns, status, nodes_status, nodes_logs, start_time, finish_time, create_by, create_time, update_by, update_time, state from experiment_ins state = 1 @@ -103,6 +111,12 @@ and nodes_logs = #{experimentIns.nodesLogs} + + and start_time = #{experimentIns.startTime} + + + and finish_time = #{experimentIns.finishTime} + and create_by = #{experimentIns.createBy} @@ -147,6 +161,12 @@ and nodes_logs = #{experimentIns.nodesLogs} + + and start_time = #{experimentIns.startTime} + + + and finish_time = #{experimentIns.finishTime} + and create_by = #{experimentIns.createBy} @@ -164,25 +184,25 @@ - insert into experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_logs,create_by,create_time,update_by,update_time,state) - values (#{experimentIns.experimentId},#{experimentIns.argoInsName},#{experimentIns.argoInsNs},#{experimentIns.status},#{experimentIns.nodesStatus},#{experimentIns.nodesLogs},#{experimentIns.createBy},#{experimentIns.createTime},#{experimentIns.updateBy},#{experimentIns.updateTime},#{experimentIns.state}) + insert into experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_logs,start_time,finish_time,create_by,create_time,update_by,update_time,state) + values (#{experimentIns.experimentId},#{experimentIns.argoInsName},#{experimentIns.argoInsNs},#{experimentIns.status},#{experimentIns.nodesStatus},#{experimentIns.nodesLogs},#{experimentIns.startTime},#{experimentIns.finishTime},#{experimentIns.createBy},#{experimentIns.createTime},#{experimentIns.updateBy},#{experimentIns.updateTime},#{experimentIns.state}) insert into - experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_logs,create_by,create_time,update_by,update_time,state) + experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,nodes_logs,start_time,finish_time,create_by,create_time,update_by,update_time,state) values - (#{entity.experimentId},#{entity.argoInsName},#{entity.argoInsNs},#{entity.status},#{entity.nodesStatus},#{entity.nodesLogs},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state}) + (#{entity.experimentId},#{entity.argoInsName},#{entity.argoInsNs},#{entity.status},#{entity.nodesStatus},#{entity.nodesLogs},#{entity.startTime},#{entity.finishTime},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state}) insert into - experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,create_by,create_time,update_by,update_time,state) + experiment_ins(experiment_id,argo_ins_name,argo_ins_ns,status,nodes_status,start_time,finish_time,create_by,create_time,update_by,update_time,state) values - (#{entity.experimentId},#{entity.argoInsName},#{entity.argoInsNs},#{entity.status},#{entity.nodesStatus},#{entity.nodesLogs},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state}) + (#{entity.experimentId},#{entity.argoInsName},#{entity.argoInsNs},#{entity.status},#{entity.nodesStatus},#{entity.startTime},#{entity.finishTime},#{entity.createBy},#{entity.createTime},#{entity.updateBy},#{entity.updateTime},#{entity.state}) on duplicate key update experiment_id = values(experiment_id)argo_ins_name = values(argo_ins_name)argo_ins_ns = @@ -211,6 +231,12 @@ nodes_logs = #{experimentIns.nodesLogs}, + + start_time = #{experimentIns.startTime}, + + + finish_time = #{experimentIns.finishTime}, + create_by = #{experimentIns.createBy}, From 12da7d2c4fe1be39d50b26803951fe0dc54b0332 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Wed, 17 Jan 2024 16:27:48 +0800 Subject: [PATCH 27/45] =?UTF-8?q?workflow=20mapper=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/controller/experiment/ExperimentController.java | 2 +- .../platform/service/impl/ExperimentInsServiceImpl.java | 1 + .../mapper/managementPlatform/WorkflowDaoMapper.xml | 5 +++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java index 1bbe9ac9..29210880 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/experiment/ExperimentController.java @@ -113,7 +113,7 @@ public class ExperimentController { */ @PutMapping("/experiments/{id}") @ApiOperation("运行实验") - public AjaxResult runExperiment(@PathVariable("id") Integer id) { + public AjaxResult runExperiment(@PathVariable("id") Integer id) throws Exception { return AjaxResult.success(this.experimentService.runExperiment(id)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index efab3a83..e9dcd214 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -63,6 +63,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { @Override public ExperimentIns queryById(Integer id) { ExperimentIns experimentIns = this.experimentInsDao.queryById(id); + //获取实例当前状态 String currentStatus = experimentIns.getStatus(); // 检查是否需要调用接口查询状态：当原本状态为null或running或Pending时调用argo接口 diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml index 755a11da..fe4a1fac 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/WorkflowDaoMapper.xml @@ -33,7 +33,7 @@ and id = #{workflow.id} - and name = #{workflow.name} + and name like "%"#{workflow.name}"%" and description = #{workflow.description} @@ -68,7 +68,7 @@ and id = #{workflow.id} - and name = #{workflow.name} + and name like "%"#{workflow.name}"%" and description = #{workflow.description} @@ -171,6 +171,7 @@ state = 1 + and name like "%"#{workflow.name}"%" From 54178069a7ff50d1475a68b405d71388557e4ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Thu, 18 Jan 2024 08:52:03 +0800 Subject: [PATCH 28/45] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=9B=9E=E6=97=B6?= =?UTF-8?q?=E9=97=B4feature=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/platform/mapper/ExperimentInsDao.java | 4 ++-- .../service/impl/ExperimentInsServiceImpl.java | 16 ++++++++++++++-- .../ExperimentInsDaoMapper.xml | 16 ++++++++-------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java index a8169bbc..48951900 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ExperimentInsDao.java @@ -29,7 +29,7 @@ public interface ExperimentInsDao { * @param pageable 分页对象 * @return 对象列表 */ - List queryAllByLimit(@Param("experimentIns")ExperimentIns experimentIns, @Param("pageable") Pageable pageable); + List queryAllByLimit(@Param("experimentIns") ExperimentIns experimentIns, @Param("pageable") Pageable pageable); /** * 统计总行数 @@ -70,7 +70,7 @@ public interface ExperimentInsDao { * @param experimentIns 实例对象 * @return 影响行数 */ - int update(ExperimentIns experimentIns); + int update(@Param("experimentIns") ExperimentIns experimentIns); /** * 通过主键删除数据 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index e9dcd214..fa1eebf8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -17,6 +17,7 @@ import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -77,7 +78,6 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { } } - return experimentIns; } @@ -242,6 +242,19 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { if (status == null || status.isEmpty()) { throw new RuntimeException("工作流状态为空。"); } + //解析流水线开始时间，开始时间一定存在，所以不需要判断 + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + + String startedAtString = (String) status.get("startedAt"); + Date startTime = dateFormat.parse(startedAtString); + experimentIns.setStartTime(startTime); + + //解析流水线结束时间 + String finishedAtString = (String) status.get("finishedAt"); + if (finishedAtString != null && !finishedAtString.isEmpty()) { + Date finishTime = dateFormat.parse(finishedAtString); + experimentIns.setFinishTime(finishTime); + } // 解析nodes字段,提取节点状态并转换为JSON字符串 Map nodes = (Map) status.get("nodes"); @@ -262,7 +275,6 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { } - /** * 终止已经创建的实验实例 * diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml index e9005805..9a4462fb 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml @@ -62,10 +62,10 @@ and nodes_logs = #{experimentIns.nodesLogs} - + and start_time = #{experimentIns.startTime} - + and finish_time = #{experimentIns.finishTime} @@ -111,10 +111,10 @@ and nodes_logs = #{experimentIns.nodesLogs} - + and start_time = #{experimentIns.startTime} - + and finish_time = #{experimentIns.finishTime} @@ -161,10 +161,10 @@ and nodes_logs = #{experimentIns.nodesLogs} - + and start_time = #{experimentIns.startTime} - + and finish_time = #{experimentIns.finishTime} @@ -231,10 +231,10 @@ nodes_logs = #{experimentIns.nodesLogs}, - + start_time = #{experimentIns.startTime}, - + finish_time = #{experimentIns.finishTime}, From 4d6c43fa3df1b0c89a9c6791fdf720616e2a4a25 Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Thu, 18 Jan 2024 09:52:29 +0800 Subject: [PATCH 29/45] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=B1=E4=BA=8Eswagg?= =?UTF-8?q?er2.0=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/platform/domain/Component.java | 5 +++++ .../ruoyi/platform/domain/ComputingResource.java | 4 ++++ .../java/com/ruoyi/platform/domain/Dataset.java | 9 ++++----- .../com/ruoyi/platform/domain/DatasetVersion.java | 5 +++++ .../java/com/ruoyi/platform/domain/Experiment.java | 14 +++++--------- .../com/ruoyi/platform/domain/ExperimentIns.java | 4 +++- .../java/com/ruoyi/platform/domain/Models.java | 9 +++++---- .../com/ruoyi/platform/domain/ModelsVersion.java | 5 +++++ .../java/com/ruoyi/platform/domain/Workflow.java | 5 +++++ 9 files changed, 41 insertions(+), 19 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java index baae12fb..b627bfb8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Component.java @@ -20,6 +20,7 @@ public class Component implements Serializable { /** * 主键 */ + @ApiModelProperty(name = "id") private Integer id; /** * 类别ID，数据字典配置 @@ -40,6 +41,7 @@ public class Component implements Serializable { * 镜像 */ @JsonProperty("image") + @ApiModelProperty(name = "image") private String images; /** * 工作目录 @@ -49,6 +51,7 @@ public class Component implements Serializable { /** * 启动命令 */ + @ApiModelProperty(name = "command") private String command; /** * 环境变量 @@ -84,6 +87,7 @@ public class Component implements Serializable { /** * 描述 */ + @ApiModelProperty(name = "description") private String description; /** @@ -117,6 +121,7 @@ public class Component implements Serializable { /** * 0,失效 1生效 */ + @ApiModelProperty(name = "state") private Integer state; public Integer getId() { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java index 1acbc4e6..84a80d83 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ComputingResource.java @@ -19,6 +19,7 @@ public class ComputingResource implements Serializable { /** * 主键 */ + @ApiModelProperty(name = "id") private Integer id; /** * 计算资源 @@ -28,10 +29,12 @@ public class ComputingResource implements Serializable { /** * 规格 */ + @ApiModelProperty(name = "standard") private String standard; /** * 描述 */ + @ApiModelProperty(name = "description") private String description; /** * 创建者 @@ -59,6 +62,7 @@ public class ComputingResource implements Serializable { /** * 0,失效 1， 生效 */ + @ApiModelProperty(name = "state") private Integer state; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java index cc8eef6d..bf6c8e2e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Dataset.java @@ -16,16 +16,14 @@ import java.io.Serializable; @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Dataset implements Serializable { private static final long serialVersionUID = 918442714458737041L; - + @ApiModelProperty(name = "id") private Integer id; - + @ApiModelProperty(name = "name") private String name; -// private String version; - + @ApiModelProperty(name = "description") private String description; -// private String url; @ApiModelProperty(name = "data_type") private Integer dataType; /** @@ -51,6 +49,7 @@ public class Dataset implements Serializable { /** * 0,失效 1生效 */ + @ApiModelProperty(name = "state") private Integer state; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java index 81f069d5..b53fb427 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/DatasetVersion.java @@ -19,16 +19,19 @@ public class DatasetVersion implements Serializable { /** * 主键 */ + @ApiModelProperty(name = "id") private Integer id; @ApiModelProperty(name = "dataset_id") private Integer datasetId; /** * 版本 */ + @ApiModelProperty(name = "version") private String version; /** * 数据集存储地址 */ + @ApiModelProperty(name = "url") private String url; /** * 文件名 @@ -48,6 +51,7 @@ public class DatasetVersion implements Serializable { /** * 状态 */ + @ApiModelProperty(name = "status") private Integer status; /** * 创建者 @@ -72,6 +76,7 @@ public class DatasetVersion implements Serializable { /** * 0失效，1生效 */ + @ApiModelProperty(name = "state") private Integer state; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java index 20c0179d..cb0430e1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Experiment.java @@ -20,12 +20,13 @@ import java.util.List; * @since 2023-11-07 15:08:22 */ @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) -public class Experiment extends BaseEntity implements Serializable { +public class Experiment implements Serializable { private static final long serialVersionUID = 409135817108439880L; - @TableId +// @ApiModelProperty(name = "id") private Integer id; +// @ApiModelProperty(name = "name") private String name; - @ApiModelProperty(name = "workflow_id") +// @ApiModelProperty(name = "workflow_id") private Long workflowId; /** * 全局参数 @@ -35,33 +36,28 @@ public class Experiment extends BaseEntity implements Serializable { /** * 简介 */ + @ApiModelProperty(name = "description") private String description; /** * 创建者 */ - @ApiModelProperty(name = "create_by") private String createBy; /** * 创建时间 */ - @ApiModelProperty(name = "create_time") private Date createTime; /** * 更新者 */ - @ApiModelProperty(name = "update_by") private String updateBy; /** * 更新时间 */ - @ApiModelProperty(name = "update_time") private Date updateTime; /** * 0,失效 1生效 */ - @TableLogic private Integer state; - private List experimentInsList; public String getName() { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java index 6da30f60..1a539276 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ExperimentIns.java @@ -16,7 +16,7 @@ import java.util.Date; @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class ExperimentIns implements Serializable { private static final long serialVersionUID = 623464560240790680L; - + @ApiModelProperty(name = "id") private Integer id; /** * 实验ID @@ -36,6 +36,7 @@ public class ExperimentIns implements Serializable { /** * 实例运行状态 */ + @ApiModelProperty(name = "status") private String status; @ApiModelProperty(name = "nodes_status") private String nodesStatus; @@ -64,6 +65,7 @@ public class ExperimentIns implements Serializable { /** * 0,失效 1生效 */ + @ApiModelProperty(name = "state") private Integer state; public ExperimentIns() { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java index 78765aaf..d0417b06 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Models.java @@ -16,17 +16,17 @@ import java.io.Serializable; @JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) public class Models implements Serializable { private static final long serialVersionUID = -59896385986032571L; - + @ApiModelProperty(name = "id") private Integer id; - + @ApiModelProperty(name = "name") private String name; // private String version; - + @ApiModelProperty(name = "description") private String description; // private String url; - + @ApiModelProperty(name = "model_type") private Integer modelType; /** * 创建者 @@ -51,6 +51,7 @@ public class Models implements Serializable { /** * 0,失效 1生效 */ + @ApiModelProperty(name = "state") private Integer state; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java index ca983e12..24f58500 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/ModelsVersion.java @@ -19,16 +19,19 @@ public class ModelsVersion implements Serializable { /** * 主键 */ + @ApiModelProperty(name = "id") private Integer id; @ApiModelProperty(name = "models_id") private Integer modelsId; /** * 版本 */ + @ApiModelProperty(name = "version") private String version; /** * 模型存储地址 */ + @ApiModelProperty(name = "url") private String url; /** * 文件名 @@ -43,6 +46,7 @@ public class ModelsVersion implements Serializable { /** * 状态 */ + @ApiModelProperty(name = "status") private Integer status; /** * 创建者 @@ -67,6 +71,7 @@ public class ModelsVersion implements Serializable { /** * 0失效，1生效 */ + @ApiModelProperty(name = "state") private Integer state; diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java index dfdab8dc..1bbd543a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/Workflow.java @@ -27,18 +27,22 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable { * id */ @TableId + @ApiModelProperty(name = "id") private Long id; /** * 工作流名称 */ + @ApiModelProperty(name = "name") private String name; /** * DAG工作流描述 */ + @ApiModelProperty(name = "description") private String description; /** * DAG图 */ + @ApiModelProperty(name = "dag") private String dag; /** * 创建者 @@ -63,6 +67,7 @@ public class Workflow extends BaseMetaObjectHandler implements Serializable { /** * 0,失效 1生效 */ + @ApiModelProperty(name = "state") private Integer state; From e66a74ba363f721f3d6fffc3a6365dd5e462bd20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Thu, 18 Jan 2024 11:36:50 +0800 Subject: [PATCH 30/45] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=BA=94=E5=8F=8A=E6=97=B6=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExperimentInsServiceImpl.java | 14 +++++++++----- .../service/impl/ExperimentServiceImpl.java | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index fa1eebf8..06b29b44 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -93,13 +93,17 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { public List getByExperimentId(Integer experimentId) { List experimentInsList = experimentInsDao.getByExperimentId(experimentId); for (ExperimentIns experimentIns: experimentInsList) { - if (experimentIns!=null && StringUtils.isEmpty(experimentIns.getStatus())) { - Integer experimentInsId = experimentIns.getId(); - String status = this.queryStatusFromArgo(experimentIns.getArgoInsNs(), experimentIns.getArgoInsName(),experimentInsId); - experimentIns.setStatus(status); - this.update(experimentIns); + if ( experimentIns!=null && (StringUtils.isEmpty(experimentIns.getStatus())) || StringUtils.equals(experimentIns.getStatus(), "Running") || StringUtils.equals(experimentIns.getStatus(),"Pending")) { +// //当原本状态为null或running或Pending时才调用argo接口 + String newStatus = this.queryStatusFromArgo(experimentIns.getArgoInsNs(), experimentIns.getArgoInsName(),experimentIns.getId()); + experimentIns.setStatus(newStatus); + //只有当新状态是终止态时才更新数据库 + if (!(StringUtils.equals(newStatus, "Running") || StringUtils.equals(newStatus,"Pending"))) { + this.update(experimentIns); + } } } + return experimentInsList; } 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 bb2344d5..a8699a9b 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 @@ -245,7 +245,7 @@ public class ExperimentServiceImpl implements ExperimentService { experimentIns.setArgoInsNs((String) metadata.get("namespace")); experimentIns.setArgoInsName((String) metadata.get("name")); //插入ExperimentIns表中 - experimentInsDao.insert(experimentIns); + experimentInsService.insert(experimentIns); }catch (Exception e){ throw new RuntimeException(e); From b4b292cea22e75720c6f043a8de6d4f690ce6c7f Mon Sep 17 00:00:00 2001 From: fans <1141904845@qq.com> Date: Thu, 18 Jan 2024 14:05:50 +0800 Subject: [PATCH 31/45] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=8C=E8=BD=AC=E5=8C=96utc?= =?UTF-8?q?=E4=B8=BA=E4=B8=8A=E6=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ExperimentInsServiceImpl.java | 6 ++-- .../com/ruoyi/platform/utils/DateUtils.java | 33 +++++++++++++++++++ 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DateUtils.java diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index fa1eebf8..357701a5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.platform.mapper.ExperimentDao; import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.service.ExperimentInsService; import com.ruoyi.platform.service.WorkflowService; +import com.ruoyi.platform.utils.DateUtils; import com.ruoyi.platform.utils.HttpUtils; import com.ruoyi.platform.utils.JsonUtils; import com.ruoyi.system.api.model.LoginUser; @@ -245,14 +246,13 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { //解析流水线开始时间，开始时间一定存在，所以不需要判断 SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); - String startedAtString = (String) status.get("startedAt"); - Date startTime = dateFormat.parse(startedAtString); + Date startTime = DateUtils.convertUTCtoShanghaiDate((String) status.get("startedAt")); experimentIns.setStartTime(startTime); //解析流水线结束时间 String finishedAtString = (String) status.get("finishedAt"); if (finishedAtString != null && !finishedAtString.isEmpty()) { - Date finishTime = dateFormat.parse(finishedAtString); + Date finishTime = DateUtils.convertUTCtoShanghaiDate(finishedAtString); experimentIns.setFinishTime(finishTime); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DateUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DateUtils.java new file mode 100644 index 00000000..a426ba57 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/DateUtils.java @@ -0,0 +1,33 @@ +package com.ruoyi.platform.utils; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.TimeZone; + +public class DateUtils { + + public static Date convertUTCtoShanghaiDate(String utcTime) throws ParseException { + + // Create a SimpleDateFormat object with the UTC date format + SimpleDateFormat utcFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'"); + utcFormatter.setTimeZone(TimeZone.getTimeZone("UTC")); + + // Parse the UTC time string into a Date object + Date utcDate = utcFormatter.parse(utcTime); + + // Create a SimpleDateFormat object with the Shanghai date format + SimpleDateFormat shanghaiFormatter = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + shanghaiFormatter.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); + + // Format the UTC Date object in Shanghai time + String shanghaiTime = shanghaiFormatter.format(utcDate); + + // Parse the Shanghai time string into a Date object + Date shanghaiDate = shanghaiFormatter.parse(shanghaiTime); + + // Return the Shanghai Date object + return shanghaiDate; + } + +} From 132ce8fdd9a3c58f6ec2c730958196bfcbf12011 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Thu, 18 Jan 2024 15:40:12 +0800 Subject: [PATCH 32/45] =?UTF-8?q?argo=E6=9F=A5=E8=AF=A2=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86=E8=8A=82=E7=82=B9=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExperimentInsServiceImpl.java | 17 +++++++++++------ .../ExperimentInsDaoMapper.xml | 5 ++++- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java index a022cf12..ebec9473 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java @@ -19,10 +19,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * (ExperimentIns)表服务实现类 @@ -262,11 +259,19 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { // 解析nodes字段,提取节点状态并转换为JSON字符串 Map nodes = (Map) status.get("nodes"); - if (nodes == null || nodes.isEmpty()) { throw new RuntimeException("工作流的节点数据为空。"); } - String nodeStatusJson = JsonUtils.mapToJson(nodes); + + Map modifiedNodes = new LinkedHashMap<>(); + + for (Map.Entry nodeEntry : nodes.entrySet()) { + Map nodeDetails = (Map) nodeEntry.getValue(); + String templateName = (String) nodeDetails.get("templateName"); + modifiedNodes.put(templateName, nodeDetails); + } + + String nodeStatusJson = JsonUtils.mapToJson(modifiedNodes); experimentIns.setNodesStatus(nodeStatusJson); this.experimentInsDao.update(experimentIns); diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml index 9a4462fb..a7db4ae7 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ExperimentInsDaoMapper.xml @@ -32,9 +32,12 @@ + + + + + + +
+ + 任务信息 +
+ + + + + + + + + + + + + + + + + +