From 46eff25e0138709d00df0dc65be347af0c637c06 Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Thu, 22 May 2025 10:18:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/scheduling/ActiveLearnInsStatusTask.java | 7 ++++--- .../com/ruoyi/platform/scheduling/RayInsStatusTask.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 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 fbf8bd6c..5c1598ee 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 @@ -53,10 +53,11 @@ 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/RayInsStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java index 70a78203..bc10dcf6 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 @@ -53,10 +53,11 @@ 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);