From 8d30a7fa0d3f18b7bfb8486f0c9ed72d16050e8d 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, 29 May 2024 16:21:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=AE=9E=E9=AA=8C=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=87=8D=E5=90=8D=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/experiment/ExperimentController.java | 2 +- .../ruoyi/platform/service/ExperimentInsService.java | 2 +- .../com/ruoyi/platform/service/ExperimentService.java | 2 +- .../service/impl/ExperimentInsServiceImpl.java | 3 ++- .../platform/service/impl/ExperimentServiceImpl.java | 10 ++++------ 5 files changed, 9 insertions(+), 10 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 230b77a..7eba2b2 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 @@ -91,7 +91,7 @@ public class ExperimentController extends BaseController { */ @PutMapping @ApiOperation("编辑实验") - public GenericsAjaxResult edit(@RequestBody Experiment experiment) throws IOException { + public GenericsAjaxResult edit(@RequestBody Experiment experiment) throws Exception { return genericsSuccess(this.experimentService.update(experiment)); } 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 e802016..15c5d34 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 @@ -100,7 +100,7 @@ public interface ExperimentInsService { /** * 查询非终止态的实例 - * @return + * */ List queryByExperimentIsNotTerminated(); 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 4f79f52..62100e5 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 @@ -48,7 +48,7 @@ public interface ExperimentService { * @param experiment 实例对象 * @return 实例对象 */ - Experiment update(Experiment experiment) throws IOException; + Experiment update(Experiment experiment) throws Exception; /** * 通过主键删除数据 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 940c4a0..a18bb1e 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 @@ -580,8 +580,9 @@ public class ExperimentInsServiceImpl implements ExperimentInsService { flag = StringUtils.equals("Terminated", (String) workflowMap.get("phase")); } } - return flag; } } + + 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 56eb44b..7b08295 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 @@ -151,8 +151,9 @@ public class ExperimentServiceImpl implements ExperimentService { * @return 实例对象 */ @Override - public Experiment update(Experiment experiment) throws IOException { + public Experiment update(Experiment experiment) throws Exception { LoginUser loginUser = SecurityUtils.getLoginUser(); + checkDeclaredName(experiment); experiment.setUpdateBy(loginUser.getUsername()); experiment.setUpdateTime(new Date()); this.experimentDao.update(experiment); @@ -207,12 +208,9 @@ public class ExperimentServiceImpl implements ExperimentService { public Experiment runExperiment(Integer id) throws Exception { //先查出实验记录 Experiment experiment = this.queryById(id); - if (experiment == null) { System.out.println("No experiment"); } - - Workflow workflow = workflowService.queryById(experiment.getWorkflowId()); if(workflow == null) { throw new RuntimeException("流水线不存在，请先创建流水线"); @@ -232,7 +230,7 @@ public class ExperimentServiceImpl implements ExperimentService { //这里全局参数是一个json数组，需要转换成一个list List> params = JacksonUtil.parseJSONStr2MapList(StringUtils.isEmpty(experiment.getGlobalParam()) ? "[]" : experiment.getGlobalParam()); runReqMap.put("params", params); - //// 实验字段的Map，不要写成一行！否则会返回null + // 实验字段的Map，不要写成一行！否则会返回null Map experimentMap = new HashMap<>(); experimentMap.put("name", "experiment-"+experiment.getId()); runReqMap.put("experiment", experimentMap); @@ -332,7 +330,7 @@ public class ExperimentServiceImpl implements ExperimentService { // 现在我们知道还有另一个具有相同名称的流水线 Field[] fields = Experiment.class.getDeclaredFields(); for (Field field : fields) { - field.setAccessible(true); // 使私有字段可访问 + field.setAccessible(true); if ("name".equals(field.getName()) && field.isAnnotationPresent(CheckDuplicate.class)) { // 如果字段是“name”并且标记了CheckDuplicate注解 CheckDuplicate annotation = field.getAnnotation(CheckDuplicate.class);