优化积分扣除结束

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);

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);

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);