From 96bf3351dbffc12c26adcadf3d1cf49bd4a050b6 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Fri, 23 May 2025 17:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A7=AF=E5=88=86=E6=89=A3?= =?UTF-8?q?=E9=99=A4=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/scheduling/ActiveLearnInsStatusTask.java | 8 ++++---- .../java/com/ruoyi/platform/scheduling/MLStatusTask.java | 8 ++++---- .../com/ruoyi/platform/scheduling/RayInsStatusTask.java | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ActiveLearnInsStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ActiveLearnInsStatusTask.java index 5c1598ee..206d262a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ActiveLearnInsStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ActiveLearnInsStatusTask.java @@ -54,10 +54,10 @@ public class ActiveLearnInsStatusTask { if (Constant.Running.equals(activeLearnIns.getStatus())) { resourceOccupyService.deducing(Constant.TaskType_ActiveLearn, null, activeLearnIns.getId(), null, null); } -// else if (Constant.Failed.equals(activeLearnIns.getStatus()) || Constant.Terminated.equals(activeLearnIns.getStatus()) -// || Constant.Succeeded.equals(activeLearnIns.getStatus())) { -// resourceOccupyService.endDeduce(Constant.TaskType_ActiveLearn, null, activeLearnIns.getId(), null, null); -// } + else if (Constant.Failed.equals(activeLearnIns.getStatus()) || Constant.Terminated.equals(activeLearnIns.getStatus()) + || Constant.Succeeded.equals(activeLearnIns.getStatus())) { + resourceOccupyService.endDeduce(Constant.TaskType_ActiveLearn, null, activeLearnIns.getId(), null, null); + } } } catch (Exception e) { activeLearnIns.setStatus(Constant.Failed); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/MLStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/MLStatusTask.java index 3e03454f..e10916c8 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/MLStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/MLStatusTask.java @@ -55,10 +55,10 @@ public class MLStatusTask { if (Constant.Running.equals(ins.getStatus())) { resourceOccupyService.deducing(Constant.TaskType_ML, null, ins.getId(), null, null); } -// else if (Constant.Failed.equals(ins.getStatus()) || Constant.Terminated.equals(ins.getStatus()) -// || Constant.Succeeded.equals(ins.getStatus())) { -// resourceOccupyService.endDeduce(Constant.TaskType_ML, null, ins.getId(), null, null); -// } + else if (Constant.Failed.equals(ins.getStatus()) || Constant.Terminated.equals(ins.getStatus()) + || Constant.Succeeded.equals(ins.getStatus())) { + resourceOccupyService.endDeduce(Constant.TaskType_ML, null, ins.getId(), null, null); + } } } else { ins = machineLearnInsService.queryStatusFromArgo(ins); diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java index bc10dcf6..9fa8eb2a 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java @@ -54,10 +54,10 @@ public class RayInsStatusTask { if (Constant.Running.equals(rayIns.getStatus())) { resourceOccupyService.deducing(Constant.TaskType_Ray, null, rayIns.getId(), null, null); } -// else if (Constant.Failed.equals(rayIns.getStatus()) || Constant.Terminated.equals(rayIns.getStatus()) -// || Constant.Succeeded.equals(rayIns.getStatus())) { -// resourceOccupyService.endDeduce(Constant.TaskType_Ray, null, rayIns.getId(), null, null); -// } + else if (Constant.Failed.equals(rayIns.getStatus()) || Constant.Terminated.equals(rayIns.getStatus()) + || Constant.Succeeded.equals(rayIns.getStatus())) { + resourceOccupyService.endDeduce(Constant.TaskType_Ray, null, rayIns.getId(), null, null); + } } } catch (Exception e) { rayIns.setStatus(Constant.Failed);