From 9756ff0886d09d49f7371f4e6bb0042ba964f5a9 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, 6 May 2024 14:40:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B7=A5=E4=BD=9C=E7=A9=BA?= =?UTF-8?q?=E9=97=B4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../experiment/ExperimentController.java | 4 ++-- .../workflow/WorkflowController.java | 2 +- .../workspace/WorkspaceController.java | 22 +++++++++++++++++++ .../ruoyi/platform/mapper/WorkflowDao.java | 4 ++++ .../platform/service/ExperimentService.java | 4 ++-- .../platform/service/WorkflowService.java | 2 +- .../platform/service/WorkspaceService.java | 11 ++++++++++ .../service/impl/ExperimentServiceImpl.java | 7 +++--- .../service/impl/WorkflowServiceImpl.java | 7 +++--- .../service/impl/WorkspaceServiceImpl.java | 7 ++++++ .../managementPlatform/WorkflowDaoMapper.xml | 8 +++++++ 11 files changed, 65 insertions(+), 13 deletions(-) create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workspace/WorkspaceController.java create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkspaceService.java create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java 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 cc8fff85..230b77a4 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 @@ -79,7 +79,7 @@ public class ExperimentController extends BaseController { */ @PostMapping @ApiOperation("新增实验") - public GenericsAjaxResult add(@RequestBody Experiment experiment) { + public GenericsAjaxResult add(@RequestBody Experiment experiment) throws Exception { return genericsSuccess(this.experimentService.insert(experiment)); } @@ -131,7 +131,7 @@ public class ExperimentController extends BaseController { */ @PostMapping("/addAndRunExperiment") @ApiOperation("实验创建页面确定并运行") - public GenericsAjaxResult addAndRunExperiment(@RequestBody Experiment experiment) { + public GenericsAjaxResult addAndRunExperiment(@RequestBody Experiment experiment) throws Exception { return genericsSuccess(this.experimentService.addAndRunExperiment(experiment)); } } 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 359b3dfc..eec963b2 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 @@ -79,7 +79,7 @@ public class WorkflowController extends BaseController { */ @PostMapping @ApiOperation("新增流水线") - public GenericsAjaxResult add(@RequestBody Workflow workflow) { + public GenericsAjaxResult add(@RequestBody Workflow workflow) throws Exception { return genericsSuccess(this.workflowService.insert(workflow)); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workspace/WorkspaceController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workspace/WorkspaceController.java new file mode 100644 index 00000000..b5e0a4c7 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/workspace/WorkspaceController.java @@ -0,0 +1,22 @@ +package com.ruoyi.platform.controller.workspace; + +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("workspace") +@Api("工作空间管理") +public class WorkspaceController extends BaseController { + + @GetMapping("/overview") + @ApiOperation("运行概览") + public AjaxResult queryById(@PathVariable("id") Integer id) { + return AjaxResult.success(this.datasetService.queryById(id)); + } +} diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/WorkflowDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/WorkflowDao.java index c870a17f..4dd7135c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/WorkflowDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/WorkflowDao.java @@ -1,5 +1,6 @@ package com.ruoyi.platform.mapper; +import com.ruoyi.platform.domain.Experiment; import com.ruoyi.platform.domain.Workflow; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; @@ -87,5 +88,8 @@ public interface WorkflowDao { * @return 对象列表 */ List queryByName(@Param("name") String name); + + Workflow findByName(@Param("name") String name); + } 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 67e60ac2..4f79f527 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 @@ -40,7 +40,7 @@ public interface ExperimentService { * @param experiment 实例对象 * @return 实例对象 */ - Experiment insert(Experiment experiment); + Experiment insert(Experiment experiment) throws Exception; /** * 修改数据 @@ -60,7 +60,7 @@ public interface ExperimentService { String removeById(Integer id) throws Exception; Experiment runExperiment(Integer id) throws Exception; - Experiment addAndRunExperiment(Experiment experiment); + Experiment addAndRunExperiment(Experiment experiment) throws Exception; /** * 分页查询实验状态 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java index 772c9bd6..935a8918 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkflowService.java @@ -37,7 +37,7 @@ public interface WorkflowService { * @param workflow 实例对象 * @return 实例对象 */ - Workflow insert(Workflow workflow); + Workflow insert(Workflow workflow) throws Exception; /** * 修改数据 diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkspaceService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkspaceService.java new file mode 100644 index 00000000..7d805951 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/WorkspaceService.java @@ -0,0 +1,11 @@ +package com.ruoyi.platform.service; + +/** + * (workspace)服务接口 + * + * @author Xidaray + * @since 2024-5-06 14:38:07 + */ +public class WorkspaceService { + +} 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 3eed94e1..56eb44ba 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 @@ -132,8 +132,9 @@ public class ExperimentServiceImpl implements ExperimentService { * @return 实例对象 */ @Override - public Experiment insert(Experiment experiment) { + public Experiment insert(Experiment experiment) throws Exception { LoginUser loginUser = SecurityUtils.getLoginUser(); + checkDeclaredName(experiment); experiment.setCreateBy(loginUser.getUsername()); experiment.setUpdateBy(loginUser.getUsername()); experiment.setUpdateTime(new Date()); @@ -231,7 +232,7 @@ public class ExperimentServiceImpl implements ExperimentService { //这里全局参数是一个json数组，需要转换成一个list List> params = JacksonUtil.parseJSONStr2MapList(StringUtils.isEmpty(experiment.getGlobalParam()) ? "[]" : experiment.getGlobalParam()); runReqMap.put("params", params); - //// 实验字段的Map，不要写成一行！ + //// 实验字段的Map，不要写成一行！否则会返回null Map experimentMap = new HashMap<>(); experimentMap.put("name", "experiment-"+experiment.getId()); runReqMap.put("experiment", experimentMap); @@ -281,7 +282,7 @@ public class ExperimentServiceImpl implements ExperimentService { } @Override - public Experiment addAndRunExperiment(Experiment experiment) { + public Experiment addAndRunExperiment(Experiment experiment) throws Exception { // 第一步: 调用add方法插入实验记录到数据库 Experiment newExperiment = this.insert(experiment); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java index d09312dc..18b487f5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkflowServiceImpl.java @@ -91,8 +91,9 @@ public class WorkflowServiceImpl implements WorkflowService { * @return 实例对象 */ @Override - public Workflow insert(Workflow workflow) { + public Workflow insert(Workflow workflow) throws Exception { LoginUser loginUser = SecurityUtils.getLoginUser(); + checkDeclaredName(workflow); workflow.setCreateBy(loginUser.getUsername()); workflow.setUpdateBy(loginUser.getUsername()); workflow.setUpdateTime(new Date()); @@ -199,9 +200,7 @@ public class WorkflowServiceImpl implements WorkflowService { } public void checkDeclaredName(Workflow insert) throws Exception { - List existingWorkflowList = workflowDao.queryByName(insert.getName()); - - Workflow existingWorkflow = existingWorkflowList.stream().findFirst().orElse(null); + Workflow existingWorkflow = workflowDao.findByName(insert.getName()); if (existingWorkflow != null) { // 检查找到的流水线是否与要插入的流水线相同 if (insert.getId() != null && insert.getId().equals(existingWorkflow.getId())) { diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java new file mode 100644 index 00000000..d9362433 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/WorkspaceServiceImpl.java @@ -0,0 +1,7 @@ +package com.ruoyi.platform.service.impl; + +import com.ruoyi.platform.service.ModelsService; + +public class WorkspaceServiceImpl implements ModelsService { + +} 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 c1c6bb9e..89572ab2 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 @@ -185,5 +185,13 @@ + + +