From f8f4c2a245502d76401abea106ccf47d02ed899a Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Fri, 14 Jun 2024 16:33:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/scheduling/ExperimentInstanceStatusTask.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java index 91ed6847..4680285e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java @@ -34,7 +34,7 @@ public class ExperimentInstanceStatusTask { private ModelDependencyDao modelDependencyDao; private List experimentIds = new ArrayList<>(); - @Scheduled(cron = "0/30 * * * * ?") // 每30S执行一次 + @Scheduled(cron = "0/14 * * * * ?") // 每30S执行一次 public void executeExperimentInsStatus() throws IOException { // 首先查到所有非终止态的实验实例 List experimentInsList = experimentInsService.queryByExperimentIsNotTerminated(); @@ -49,7 +49,7 @@ public class ExperimentInstanceStatusTask { }catch (Exception e){ experimentIns.setStatus("Failed"); } - if (!StringUtils.equals(oldStatus,experimentIns.getStatus())){ +// if (!StringUtils.equals(oldStatus,experimentIns.getStatus())){ experimentIns.setUpdateTime(new Date()); // 线程安全的添加操作 synchronized (experimentIds) { @@ -57,7 +57,7 @@ public class ExperimentInstanceStatusTask { } updateList.add(experimentIns); - } +// } // experimentInsDao.update(experimentIns); } @@ -105,7 +105,7 @@ public class ExperimentInstanceStatusTask { } } - @Scheduled(cron = "0/30 * * * * ?") // / 每30S执行一次 + @Scheduled(cron = "0/17 * * * * ?") // / 每30S执行一次 public void executeExperimentStatus() throws IOException { if (experimentIds.size()==0){ return; From d43a31e69f1f90d7a5df60b45cf2f55cbfeaf25a Mon Sep 17 00:00:00 2001 From: cp3hnu Date: Fri, 14 Jun 2024 16:40:03 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E8=BF=9E=E7=BA=BF=E6=97=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=94=9A=E7=82=B9=E7=9A=84=E5=9C=86=E5=9C=88=E7=9A=84?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-ui/src/pages/Pipeline/editPipeline/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/react-ui/src/pages/Pipeline/editPipeline/index.jsx b/react-ui/src/pages/Pipeline/editPipeline/index.jsx index 01bec32f..4cfdcacb 100644 --- a/react-ui/src/pages/Pipeline/editPipeline/index.jsx +++ b/react-ui/src/pages/Pipeline/editPipeline/index.jsx @@ -370,6 +370,7 @@ const EditPipeline = () => { fill: '#fff', stroke: '#a4a4a5', cursor: 'crosshair', + lineWidth: 1, }, name: `anchor-point`, // the name, for searching by group.find(ele => ele.get('name') === 'anchor-point') anchorPointIdx: i, // flag the idx of the anchor-point circle @@ -409,11 +410,13 @@ const EditPipeline = () => { if (sourceAnchorIdx !== null && sourceAnchorIdx !== undefined) { const anchorPoint = anchorPoints[sourceAnchorIdx]; anchorPoint.attr('stroke', value ? themes['primaryColor'] : '#a4a4a5'); + anchorPoint.attr('lineWidth', value ? 2 : 1); } } else if (name === 'drop') { if (dropAnchorIdx !== null && dropAnchorIdx !== undefined) { const anchorPoint = anchorPoints[dropAnchorIdx]; anchorPoint.attr('stroke', value ? themes['primaryColor'] : '#a4a4a5'); + anchorPoint.attr('lineWidth', value ? 2 : 1); } } },