积分功能开发

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/RayInsStatusTask.java

@@ -44,6 +44,8 @@ public class RayInsStatusTask {
                     rayIns = rayInsService.queryStatusFromArgo(rayIns);
                     if (Constant.Running.equals(rayIns.getStatus())) {
                         resourceOccupyService.deducing(Constant.TaskType_Ray, rayIns.getId());
+                    } else {
+                        resourceOccupyService.endDeduce(Constant.TaskType_Ray, rayIns.getId());
                     }
                 } catch (Exception e) {
                     rayIns.setStatus(Constant.Failed);

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/DevEnvironmentServiceImpl.java

@@ -6,7 +6,6 @@ import com.ruoyi.platform.domain.PodStatus;
 import com.ruoyi.platform.mapper.DevEnvironmentDao;
 import com.ruoyi.platform.service.DevEnvironmentService;
 import com.ruoyi.platform.service.JupyterService;
-import com.ruoyi.platform.service.ResourceOccupyService;
 import com.ruoyi.platform.utils.JacksonUtil;
 import com.ruoyi.platform.vo.DevEnvironmentVo;
 import com.ruoyi.platform.vo.PodStatusVo;
@@ -36,10 +35,6 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService {
     @Resource
     @Lazy
     private JupyterService jupyterService;
-
-    @Resource
-    private ResourceOccupyService resourceOccupyService;
-
     /**
      * 通过ID查询单条数据
      *
@@ -91,9 +86,6 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService {
      */
     @Override
     public DevEnvironment insert(DevEnvironmentVo devEnvironmentVo) throws Exception {
-        // 判断是否有资源
-        resourceOccupyService.haveResource(devEnvironmentVo.getComputingResourceId());
-
         //插入预备，此时不需要判断版本重复
         DevEnvironment devEnvironment = new DevEnvironment();
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -127,9 +119,6 @@ public class DevEnvironmentServiceImpl implements DevEnvironmentService {
      */
     @Override
     public DevEnvironment update(DevEnvironment devEnvironment) throws Exception {
-        // 判断是否有资源
-        resourceOccupyService.haveResource(devEnvironment.getComputingResourceId());
-
         LoginUser loginUser = SecurityUtils.getLoginUser();
         devEnvironment.setUpdateBy(loginUser.getUsername());
         devEnvironment.setUpdateTime(new Date());

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java

@@ -5,7 +5,6 @@ import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.platform.constant.Constant;
 import com.ruoyi.platform.domain.DevEnvironment;
 import com.ruoyi.platform.domain.PodStatus;
-import com.ruoyi.platform.mapper.ComputingResourceDao;
 import com.ruoyi.platform.mapper.DevEnvironmentDao;
 import com.ruoyi.platform.service.DevEnvironmentService;
 import com.ruoyi.platform.service.JupyterService;

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/RayServiceImpl.java

@@ -66,10 +66,6 @@ public class RayServiceImpl implements RayService {
         if (rayByName != null) {
             throw new RuntimeException("实验名称已存在");
         }
-
-        // 判断是否有资源
-        resourceOccupyService.haveResource(rayVo.getComputingResourceId());
-
         Ray ray = new Ray();
         BeanUtils.copyProperties(rayVo, ray);
         String username = SecurityUtils.getLoginUser().getUsername();
@@ -91,10 +87,6 @@ public class RayServiceImpl implements RayService {
         if (oldRay != null && !oldRay.getId().equals(rayVo.getId())) {
             throw new RuntimeException("实验名称已存在");
         }
-
-        // 判断是否有资源
-        resourceOccupyService.haveResource(rayVo.getComputingResourceId());
-
         Ray ray = new Ray();
         BeanUtils.copyProperties(rayVo, ray);
         ray.setUpdateBy(SecurityUtils.getLoginUser().getUsername());

ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ServiceServiceImpl.java

@@ -119,10 +119,6 @@ public class ServiceServiceImpl implements ServiceService {
         if (svByVersion != null) {
             throw new RuntimeException("服务版本已存在，无法新增");
         }
-
-        // 判断是否有资源
-        resourceOccupyService.haveResource(serviceVersionVo.getComputingResourceId());
-
         ServiceVersion serviceVersion = getServiceVersion(serviceVersionVo);
         LoginUser loginUser = SecurityUtils.getLoginUser();
         serviceVersion.setCreateBy(loginUser.getUsername());
@@ -143,11 +139,7 @@ public class ServiceServiceImpl implements ServiceService {
 
     @Override
     public String editServiceVersion(ServiceVersionVo serviceVersionVo) throws Exception {
-        // 判断是否有资源
-        resourceOccupyService.haveResource(serviceVersionVo.getComputingResourceId());
-
         ServiceVersion serviceVersion = getServiceVersion(serviceVersionVo);
-
         ServiceVersion oldServiceVersion = serviceDao.getServiceVersionById(serviceVersionVo.getId());
         if (!oldServiceVersion.getReplicas().equals(serviceVersionVo.getReplicas()) || !oldServiceVersion.getResource().equals(serviceVersionVo.getResource())
                 || serviceVersionVo.getRerun()) {