Browse Source

优化

pull/268/head
chenzhihang 8 months ago
parent
commit
46eff25e01
2 changed files with 8 additions and 6 deletions
  1. +4
    -3
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ActiveLearnInsStatusTask.java
  2. +4
    -3
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java

+ 4
- 3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ActiveLearnInsStatusTask.java View File

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


+ 4
- 3
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java View File

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


Loading…
Cancel
Save